Simplify the static const definitions for vectors and quaternions

- DRY, baby!

glm/detail/type_vec1.inl

@@ -34,10 +34,10 @@ namespace glm
 {
 #	ifdef GLM_STATIC_CONST_MEMBERS
 	template<typename T, precision P>
-	const tvec1<T, P> tvec1<T, P>::X = tvec1<T, P>(static_cast<T>(1));
+	const tvec1<T, P> tvec1<T, P>::X(static_cast<T>(1));
 
 	template<typename T, precision P>
-	const tvec1<T, P> tvec1<T, P>::ZERO = tvec1<T, P>(static_cast<T>(0));
+	const tvec1<T, P> tvec1<T, P>::ZERO(static_cast<T>(0));
 #	endif
 	// -- Implicit basic constructors --
 

glm/detail/type_vec2.inl

@@ -30,16 +30,16 @@ namespace glm
 {
 #	ifdef GLM_STATIC_CONST_MEMBERS
 	template <typename T, precision P>
-	const tvec2<T, P> tvec2<T, P>::ZERO = tvec2<T, P>(static_cast<T>(0), static_cast<T>(0));
+	const tvec2<T, P> tvec2<T, P>::ZERO(static_cast<T>(0), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tvec2<T, P> tvec2<T, P>::X = tvec2<T, P>(static_cast<T>(1), static_cast<T>(0));
+	const tvec2<T, P> tvec2<T, P>::X(static_cast<T>(1), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tvec2<T, P> tvec2<T, P>::Y = tvec2<T, P>(static_cast<T>(0), static_cast<T>(1));
+	const tvec2<T, P> tvec2<T, P>::Y(static_cast<T>(0), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tvec2<T, P> tvec2<T, P>::XY = tvec2<T, P>(static_cast<T>(1), static_cast<T>(1));
+	const tvec2<T, P> tvec2<T, P>::XY(static_cast<T>(1), static_cast<T>(1));
 #	endif
 	// -- Implicit basic constructors --
 

glm/detail/type_vec3.inl

@@ -35,28 +35,28 @@ namespace glm
 
 #	ifdef GLM_STATIC_CONST_MEMBERS
 	template <typename T, precision P>
-	const tvec3<T, P> tvec3<T, P>::ZERO = tvec3<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
+	const tvec3<T, P> tvec3<T, P>::ZERO(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tvec3<T, P> tvec3<T, P>::X = tvec3<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0));
+	const tvec3<T, P> tvec3<T, P>::X(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tvec3<T, P> tvec3<T, P>::Y = tvec3<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(0));
+	const tvec3<T, P> tvec3<T, P>::Y(static_cast<T>(0), static_cast<T>(1), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tvec3<T, P> tvec3<T, P>::Z = tvec3<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(1));
+	const tvec3<T, P> tvec3<T, P>::Z(static_cast<T>(0), static_cast<T>(0), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tvec3<T, P> tvec3<T, P>::XY = tvec3<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(0));
+	const tvec3<T, P> tvec3<T, P>::XY(static_cast<T>(1), static_cast<T>(1), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tvec3<T, P> tvec3<T, P>::XZ = tvec3<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(1));
+	const tvec3<T, P> tvec3<T, P>::XZ(static_cast<T>(1), static_cast<T>(0), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tvec3<T, P> tvec3<T, P>::YZ = tvec3<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(1));
+	const tvec3<T, P> tvec3<T, P>::YZ(static_cast<T>(0), static_cast<T>(1), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tvec3<T, P> tvec3<T, P>::XYZ = tvec3<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(1));
+	const tvec3<T, P> tvec3<T, P>::XYZ(static_cast<T>(1), static_cast<T>(1), static_cast<T>(1));
 #	endif
 	// -- Implicit basic constructors --
 

glm/detail/type_vec4.inl

@@ -35,68 +35,68 @@ namespace glm
 
 #	ifdef GLM_STATIC_CONST_MEMBERS
 	template <typename T, precision P>
-	const tvec4<T, P> tvec4<T, P>::ZERO =
-			tvec4<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
+	const tvec4<T, P> tvec4<T, P>::ZERO
+			(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tvec4<T, P> tvec4<T, P>::X =
-			tvec4<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
+	const tvec4<T, P> tvec4<T, P>::X
+			(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tvec4<T, P> tvec4<T, P>::Y =
-			tvec4<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(0), static_cast<T>(0));
+	const tvec4<T, P> tvec4<T, P>::Y
+			(static_cast<T>(0), static_cast<T>(1), static_cast<T>(0), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tvec4<T, P> tvec4<T, P>::Z =
-			tvec4<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(1), static_cast<T>(0));
+	const tvec4<T, P> tvec4<T, P>::Z
+			(static_cast<T>(0), static_cast<T>(0), static_cast<T>(1), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tvec4<T, P> tvec4<T, P>::W =
-			tvec4<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0), static_cast<T>(1));
+	const tvec4<T, P> tvec4<T, P>::W
+			(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tvec4<T, P> tvec4<T, P>::XY =
-			tvec4<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(0), static_cast<T>(0));
+	const tvec4<T, P> tvec4<T, P>::XY
+			(static_cast<T>(1), static_cast<T>(1), static_cast<T>(0), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tvec4<T, P> tvec4<T, P>::XZ =
-			tvec4<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(1), static_cast<T>(0));
+	const tvec4<T, P> tvec4<T, P>::XZ
+			(static_cast<T>(1), static_cast<T>(0), static_cast<T>(1), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tvec4<T, P> tvec4<T, P>::XW =
-			tvec4<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0), static_cast<T>(1));
+	const tvec4<T, P> tvec4<T, P>::XW
+			(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tvec4<T, P> tvec4<T, P>::YZ =
-			tvec4<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(1), static_cast<T>(0));
+	const tvec4<T, P> tvec4<T, P>::YZ
+			(static_cast<T>(0), static_cast<T>(1), static_cast<T>(1), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tvec4<T, P> tvec4<T, P>::YW =
-			tvec4<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(0), static_cast<T>(1));
+	const tvec4<T, P> tvec4<T, P>::YW
+			(static_cast<T>(0), static_cast<T>(1), static_cast<T>(0), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tvec4<T, P> tvec4<T, P>::ZW =
-			tvec4<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(1), static_cast<T>(1));
+	const tvec4<T, P> tvec4<T, P>::ZW
+			(static_cast<T>(0), static_cast<T>(0), static_cast<T>(1), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tvec4<T, P> tvec4<T, P>::XYZ =
-			tvec4<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(1), static_cast<T>(0));
+	const tvec4<T, P> tvec4<T, P>::XYZ
+			(static_cast<T>(1), static_cast<T>(1), static_cast<T>(1), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tvec4<T, P> tvec4<T, P>::XYW =
-			tvec4<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(0), static_cast<T>(1));
+	const tvec4<T, P> tvec4<T, P>::XYW
+			(static_cast<T>(1), static_cast<T>(1), static_cast<T>(0), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tvec4<T, P> tvec4<T, P>::XZW =
-			tvec4<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(1), static_cast<T>(1));
+	const tvec4<T, P> tvec4<T, P>::XZW
+			(static_cast<T>(1), static_cast<T>(0), static_cast<T>(1), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tvec4<T, P> tvec4<T, P>::YZW =
-			tvec4<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(1), static_cast<T>(1));
+	const tvec4<T, P> tvec4<T, P>::YZW
+			(static_cast<T>(0), static_cast<T>(1), static_cast<T>(1), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tvec4<T, P> tvec4<T, P>::XYZW =
-			tvec4<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(1), static_cast<T>(1));
+	const tvec4<T, P> tvec4<T, P>::XYZW
+			(static_cast<T>(1), static_cast<T>(1), static_cast<T>(1), static_cast<T>(1));
 #	endif
 	// -- Implicit basic constructors --
 

glm/gtc/quaternion.inl

@@ -51,68 +51,68 @@ namespace detail
 
 #	ifdef GLM_STATIC_CONST_MEMBERS
 	template <typename T, precision P>
-	const tquat<T, P> tquat<T, P>::ZERO =
-			tquat<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
+	const tquat<T, P> tquat<T, P>::ZERO
+			(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tquat<T, P> tquat<T, P>::X =
-			tquat<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(0), static_cast<T>(0));
+	const tquat<T, P> tquat<T, P>::X
+			(static_cast<T>(0), static_cast<T>(1), static_cast<T>(0), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tquat<T, P> tquat<T, P>::Y =
-			tquat<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(1), static_cast<T>(0));
+	const tquat<T, P> tquat<T, P>::Y
+			(static_cast<T>(0), static_cast<T>(0), static_cast<T>(1), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tquat<T, P> tquat<T, P>::Z =
-			tquat<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0), static_cast<T>(1));
+	const tquat<T, P> tquat<T, P>::Z
+			(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tquat<T, P> tquat<T, P>::W =
-			tquat<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
+	const tquat<T, P> tquat<T, P>::W
+			(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tquat<T, P> tquat<T, P>::XY =
-			tquat<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(1), static_cast<T>(0));
+	const tquat<T, P> tquat<T, P>::XY
+			(static_cast<T>(0), static_cast<T>(1), static_cast<T>(1), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tquat<T, P> tquat<T, P>::XZ =
-			tquat<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(1), static_cast<T>(1));
+	const tquat<T, P> tquat<T, P>::XZ
+			(static_cast<T>(0), static_cast<T>(0), static_cast<T>(1), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tquat<T, P> tquat<T, P>::XW =
-			tquat<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(0), static_cast<T>(0));
+	const tquat<T, P> tquat<T, P>::XW
+			(static_cast<T>(1), static_cast<T>(1), static_cast<T>(0), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tquat<T, P> tquat<T, P>::YZ =
-			tquat<T, P>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(1), static_cast<T>(1));
+	const tquat<T, P> tquat<T, P>::YZ
+			(static_cast<T>(0), static_cast<T>(0), static_cast<T>(1), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tquat<T, P> tquat<T, P>::YW =
-			tquat<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(1), static_cast<T>(0));
+	const tquat<T, P> tquat<T, P>::YW
+			(static_cast<T>(1), static_cast<T>(0), static_cast<T>(1), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tquat<T, P> tquat<T, P>::ZW =
-			tquat<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0), static_cast<T>(1));
+	const tquat<T, P> tquat<T, P>::ZW
+			(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tquat<T, P> tquat<T, P>::XYZ =
-			tquat<T, P>(static_cast<T>(0), static_cast<T>(1), static_cast<T>(1), static_cast<T>(1));
+	const tquat<T, P> tquat<T, P>::XYZ
+			(static_cast<T>(0), static_cast<T>(1), static_cast<T>(1), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tquat<T, P> tquat<T, P>::XYW =
-			tquat<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(1), static_cast<T>(0));
+	const tquat<T, P> tquat<T, P>::XYW
+			(static_cast<T>(1), static_cast<T>(1), static_cast<T>(1), static_cast<T>(0));
 
 	template <typename T, precision P>
-	const tquat<T, P> tquat<T, P>::XZW =
-			tquat<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(0), static_cast<T>(1));
+	const tquat<T, P> tquat<T, P>::XZW
+			(static_cast<T>(1), static_cast<T>(1), static_cast<T>(0), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tquat<T, P> tquat<T, P>::YZW =
-			tquat<T, P>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(1), static_cast<T>(1));
+	const tquat<T, P> tquat<T, P>::YZW
+			(static_cast<T>(1), static_cast<T>(0), static_cast<T>(1), static_cast<T>(1));
 
 	template <typename T, precision P>
-	const tquat<T, P> tquat<T, P>::XYZW =
-			tquat<T, P>(static_cast<T>(1), static_cast<T>(1), static_cast<T>(1), static_cast<T>(1));
+	const tquat<T, P> tquat<T, P>::XYZW
+			(static_cast<T>(1), static_cast<T>(1), static_cast<T>(1), static_cast<T>(1));
 #	endif
 	// -- Component accesses --
 

glm/gtx/simd_quat.inl

@@ -52,22 +52,22 @@ void print(const fvec4SIMD &v)
 #endif
 
 #	ifdef GLM_STATIC_CONST_MEMBERS
-	const fquatSIMD fquatSIMD::ZERO = fquatSIMD(0, 0, 0, 0);
-	const fquatSIMD fquatSIMD::X = fquatSIMD(0, 1, 0, 0);
-	const fquatSIMD fquatSIMD::Y = fquatSIMD(0, 0, 1, 0);
-	const fquatSIMD fquatSIMD::Z = fquatSIMD(0, 0, 0, 1);
-	const fquatSIMD fquatSIMD::W = fquatSIMD(1, 0, 0, 0);
-	const fquatSIMD fquatSIMD::XY = fquatSIMD(0, 1, 1, 0);
-	const fquatSIMD fquatSIMD::XZ = fquatSIMD(0, 1, 0, 1);
-	const fquatSIMD fquatSIMD::XW = fquatSIMD(1, 1, 0, 0);
-	const fquatSIMD fquatSIMD::YZ = fquatSIMD(0, 0, 1, 1);
-	const fquatSIMD fquatSIMD::YW = fquatSIMD(1, 0, 1, 0);
-	const fquatSIMD fquatSIMD::ZW = fquatSIMD(1, 0, 0, 1);
-	const fquatSIMD fquatSIMD::XYZ = fquatSIMD(0, 1, 1, 1);
-	const fquatSIMD fquatSIMD::XYW = fquatSIMD(1, 1, 1, 0);
-	const fquatSIMD fquatSIMD::XZW = fquatSIMD(1, 1, 0, 1);
-	const fquatSIMD fquatSIMD::YZW = fquatSIMD(1, 0, 1, 1);
-	const fquatSIMD fquatSIMD::XYZW = fquatSIMD(1, 1, 1, 1);
+	const fquatSIMD fquatSIMD::ZERO(0, 0, 0, 0);
+	const fquatSIMD fquatSIMD::X(0, 1, 0, 0);
+	const fquatSIMD fquatSIMD::Y(0, 0, 1, 0);
+	const fquatSIMD fquatSIMD::Z(0, 0, 0, 1);
+	const fquatSIMD fquatSIMD::W(1, 0, 0, 0);
+	const fquatSIMD fquatSIMD::XY(0, 1, 1, 0);
+	const fquatSIMD fquatSIMD::XZ(0, 1, 0, 1);
+	const fquatSIMD fquatSIMD::XW(1, 1, 0, 0);
+	const fquatSIMD fquatSIMD::YZ(0, 0, 1, 1);
+	const fquatSIMD fquatSIMD::YW(1, 0, 1, 0);
+	const fquatSIMD fquatSIMD::ZW(1, 0, 0, 1);
+	const fquatSIMD fquatSIMD::XYZ(0, 1, 1, 1);
+	const fquatSIMD fquatSIMD::XYW(1, 1, 1, 0);
+	const fquatSIMD fquatSIMD::XZW(1, 1, 0, 1);
+	const fquatSIMD fquatSIMD::YZW(1, 0, 1, 1);
+	const fquatSIMD fquatSIMD::XYZW(1, 1, 1, 1);
 #	endif
 
 //////////////////////////////////////

glm/gtx/simd_vec4.inl

@@ -17,22 +17,22 @@ struct shuffle_mask
 };
 
 #	ifdef GLM_STATIC_CONST_MEMBERS
-	const fvec4SIMD fvec4SIMD::ZERO = fvec4SIMD(0, 0, 0, 0);
-	const fvec4SIMD fvec4SIMD::X = fvec4SIMD(1, 0, 0, 0);
-	const fvec4SIMD fvec4SIMD::Y = fvec4SIMD(0, 1, 0, 0);
-	const fvec4SIMD fvec4SIMD::Z = fvec4SIMD(0, 0, 1, 0);
-	const fvec4SIMD fvec4SIMD::W = fvec4SIMD(0, 0, 0, 1);
-	const fvec4SIMD fvec4SIMD::XY = fvec4SIMD(1, 1, 0, 0);
-	const fvec4SIMD fvec4SIMD::XZ = fvec4SIMD(1, 0, 1, 0);
-	const fvec4SIMD fvec4SIMD::XW = fvec4SIMD(1, 0, 0, 1);
-	const fvec4SIMD fvec4SIMD::YZ = fvec4SIMD(0, 1, 1, 0);
-	const fvec4SIMD fvec4SIMD::YW = fvec4SIMD(0, 1, 0, 1);
-	const fvec4SIMD fvec4SIMD::ZW = fvec4SIMD(0, 0, 1, 1);
-	const fvec4SIMD fvec4SIMD::XYZ = fvec4SIMD(1, 1, 1, 0);
-	const fvec4SIMD fvec4SIMD::XYW = fvec4SIMD(1, 1, 0, 1);
-	const fvec4SIMD fvec4SIMD::XZW = fvec4SIMD(1, 0, 1, 1);
-	const fvec4SIMD fvec4SIMD::YZW = fvec4SIMD(0, 1, 1, 1);
-	const fvec4SIMD fvec4SIMD::XYZW = fvec4SIMD(1, 1, 1, 1);
+	const fvec4SIMD fvec4SIMD::ZERO(0, 0, 0, 0);
+	const fvec4SIMD fvec4SIMD::X(1, 0, 0, 0);
+	const fvec4SIMD fvec4SIMD::Y(0, 1, 0, 0);
+	const fvec4SIMD fvec4SIMD::Z(0, 0, 1, 0);
+	const fvec4SIMD fvec4SIMD::W(0, 0, 0, 1);
+	const fvec4SIMD fvec4SIMD::XY(1, 1, 0, 0);
+	const fvec4SIMD fvec4SIMD::XZ(1, 0, 1, 0);
+	const fvec4SIMD fvec4SIMD::XW(1, 0, 0, 1);
+	const fvec4SIMD fvec4SIMD::YZ(0, 1, 1, 0);
+	const fvec4SIMD fvec4SIMD::YW(0, 1, 0, 1);
+	const fvec4SIMD fvec4SIMD::ZW(0, 0, 1, 1);
+	const fvec4SIMD fvec4SIMD::XYZ(1, 1, 1, 0);
+	const fvec4SIMD fvec4SIMD::XYW(1, 1, 0, 1);
+	const fvec4SIMD fvec4SIMD::XZW(1, 0, 1, 1);
+	const fvec4SIMD fvec4SIMD::YZW(0, 1, 1, 1);
+	const fvec4SIMD fvec4SIMD::XYZW(1, 1, 1, 1);
 #	endif
 
 //////////////////////////////////////