diff --git a/glm/detail/type_vec1.inl b/glm/detail/type_vec1.inl index 5dfc2556..0da79982 100644 --- a/glm/detail/type_vec1.inl +++ b/glm/detail/type_vec1.inl @@ -34,10 +34,10 @@ namespace glm { # ifdef GLM_STATIC_CONST_MEMBERS template - const tvec1 tvec1::X = tvec1(static_cast(1)); + const tvec1 tvec1::X(static_cast(1)); template - const tvec1 tvec1::ZERO = tvec1(static_cast(0)); + const tvec1 tvec1::ZERO(static_cast(0)); # endif // -- Implicit basic constructors -- diff --git a/glm/detail/type_vec2.inl b/glm/detail/type_vec2.inl index f3bc76fa..1bcaf772 100644 --- a/glm/detail/type_vec2.inl +++ b/glm/detail/type_vec2.inl @@ -30,16 +30,16 @@ namespace glm { # ifdef GLM_STATIC_CONST_MEMBERS template - const tvec2 tvec2::ZERO = tvec2(static_cast(0), static_cast(0)); + const tvec2 tvec2::ZERO(static_cast(0), static_cast(0)); template - const tvec2 tvec2::X = tvec2(static_cast(1), static_cast(0)); + const tvec2 tvec2::X(static_cast(1), static_cast(0)); template - const tvec2 tvec2::Y = tvec2(static_cast(0), static_cast(1)); + const tvec2 tvec2::Y(static_cast(0), static_cast(1)); template - const tvec2 tvec2::XY = tvec2(static_cast(1), static_cast(1)); + const tvec2 tvec2::XY(static_cast(1), static_cast(1)); # endif // -- Implicit basic constructors -- diff --git a/glm/detail/type_vec3.inl b/glm/detail/type_vec3.inl index 1db51ffb..f231a682 100644 --- a/glm/detail/type_vec3.inl +++ b/glm/detail/type_vec3.inl @@ -35,28 +35,28 @@ namespace glm # ifdef GLM_STATIC_CONST_MEMBERS template - const tvec3 tvec3::ZERO = tvec3(static_cast(0), static_cast(0), static_cast(0)); + const tvec3 tvec3::ZERO(static_cast(0), static_cast(0), static_cast(0)); template - const tvec3 tvec3::X = tvec3(static_cast(1), static_cast(0), static_cast(0)); + const tvec3 tvec3::X(static_cast(1), static_cast(0), static_cast(0)); template - const tvec3 tvec3::Y = tvec3(static_cast(0), static_cast(1), static_cast(0)); + const tvec3 tvec3::Y(static_cast(0), static_cast(1), static_cast(0)); template - const tvec3 tvec3::Z = tvec3(static_cast(0), static_cast(0), static_cast(1)); + const tvec3 tvec3::Z(static_cast(0), static_cast(0), static_cast(1)); template - const tvec3 tvec3::XY = tvec3(static_cast(1), static_cast(1), static_cast(0)); + const tvec3 tvec3::XY(static_cast(1), static_cast(1), static_cast(0)); template - const tvec3 tvec3::XZ = tvec3(static_cast(1), static_cast(0), static_cast(1)); + const tvec3 tvec3::XZ(static_cast(1), static_cast(0), static_cast(1)); template - const tvec3 tvec3::YZ = tvec3(static_cast(0), static_cast(1), static_cast(1)); + const tvec3 tvec3::YZ(static_cast(0), static_cast(1), static_cast(1)); template - const tvec3 tvec3::XYZ = tvec3(static_cast(1), static_cast(1), static_cast(1)); + const tvec3 tvec3::XYZ(static_cast(1), static_cast(1), static_cast(1)); # endif // -- Implicit basic constructors -- diff --git a/glm/detail/type_vec4.inl b/glm/detail/type_vec4.inl index 0189c2ce..23b8c8b3 100644 --- a/glm/detail/type_vec4.inl +++ b/glm/detail/type_vec4.inl @@ -35,68 +35,68 @@ namespace glm # ifdef GLM_STATIC_CONST_MEMBERS template - const tvec4 tvec4::ZERO = - tvec4(static_cast(0), static_cast(0), static_cast(0), static_cast(0)); + const tvec4 tvec4::ZERO + (static_cast(0), static_cast(0), static_cast(0), static_cast(0)); template - const tvec4 tvec4::X = - tvec4(static_cast(1), static_cast(0), static_cast(0), static_cast(0)); + const tvec4 tvec4::X + (static_cast(1), static_cast(0), static_cast(0), static_cast(0)); template - const tvec4 tvec4::Y = - tvec4(static_cast(0), static_cast(1), static_cast(0), static_cast(0)); + const tvec4 tvec4::Y + (static_cast(0), static_cast(1), static_cast(0), static_cast(0)); template - const tvec4 tvec4::Z = - tvec4(static_cast(0), static_cast(0), static_cast(1), static_cast(0)); + const tvec4 tvec4::Z + (static_cast(0), static_cast(0), static_cast(1), static_cast(0)); template - const tvec4 tvec4::W = - tvec4(static_cast(0), static_cast(0), static_cast(0), static_cast(1)); + const tvec4 tvec4::W + (static_cast(0), static_cast(0), static_cast(0), static_cast(1)); template - const tvec4 tvec4::XY = - tvec4(static_cast(1), static_cast(1), static_cast(0), static_cast(0)); + const tvec4 tvec4::XY + (static_cast(1), static_cast(1), static_cast(0), static_cast(0)); template - const tvec4 tvec4::XZ = - tvec4(static_cast(1), static_cast(0), static_cast(1), static_cast(0)); + const tvec4 tvec4::XZ + (static_cast(1), static_cast(0), static_cast(1), static_cast(0)); template - const tvec4 tvec4::XW = - tvec4(static_cast(1), static_cast(0), static_cast(0), static_cast(1)); + const tvec4 tvec4::XW + (static_cast(1), static_cast(0), static_cast(0), static_cast(1)); template - const tvec4 tvec4::YZ = - tvec4(static_cast(0), static_cast(1), static_cast(1), static_cast(0)); + const tvec4 tvec4::YZ + (static_cast(0), static_cast(1), static_cast(1), static_cast(0)); template - const tvec4 tvec4::YW = - tvec4(static_cast(0), static_cast(1), static_cast(0), static_cast(1)); + const tvec4 tvec4::YW + (static_cast(0), static_cast(1), static_cast(0), static_cast(1)); template - const tvec4 tvec4::ZW = - tvec4(static_cast(0), static_cast(0), static_cast(1), static_cast(1)); + const tvec4 tvec4::ZW + (static_cast(0), static_cast(0), static_cast(1), static_cast(1)); template - const tvec4 tvec4::XYZ = - tvec4(static_cast(1), static_cast(1), static_cast(1), static_cast(0)); + const tvec4 tvec4::XYZ + (static_cast(1), static_cast(1), static_cast(1), static_cast(0)); template - const tvec4 tvec4::XYW = - tvec4(static_cast(1), static_cast(1), static_cast(0), static_cast(1)); + const tvec4 tvec4::XYW + (static_cast(1), static_cast(1), static_cast(0), static_cast(1)); template - const tvec4 tvec4::XZW = - tvec4(static_cast(1), static_cast(0), static_cast(1), static_cast(1)); + const tvec4 tvec4::XZW + (static_cast(1), static_cast(0), static_cast(1), static_cast(1)); template - const tvec4 tvec4::YZW = - tvec4(static_cast(0), static_cast(1), static_cast(1), static_cast(1)); + const tvec4 tvec4::YZW + (static_cast(0), static_cast(1), static_cast(1), static_cast(1)); template - const tvec4 tvec4::XYZW = - tvec4(static_cast(1), static_cast(1), static_cast(1), static_cast(1)); + const tvec4 tvec4::XYZW + (static_cast(1), static_cast(1), static_cast(1), static_cast(1)); # endif // -- Implicit basic constructors -- diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index a50f1f26..a6ea6432 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -51,68 +51,68 @@ namespace detail # ifdef GLM_STATIC_CONST_MEMBERS template - const tquat tquat::ZERO = - tquat(static_cast(0), static_cast(0), static_cast(0), static_cast(0)); + const tquat tquat::ZERO + (static_cast(0), static_cast(0), static_cast(0), static_cast(0)); template - const tquat tquat::X = - tquat(static_cast(0), static_cast(1), static_cast(0), static_cast(0)); + const tquat tquat::X + (static_cast(0), static_cast(1), static_cast(0), static_cast(0)); template - const tquat tquat::Y = - tquat(static_cast(0), static_cast(0), static_cast(1), static_cast(0)); + const tquat tquat::Y + (static_cast(0), static_cast(0), static_cast(1), static_cast(0)); template - const tquat tquat::Z = - tquat(static_cast(0), static_cast(0), static_cast(0), static_cast(1)); + const tquat tquat::Z + (static_cast(0), static_cast(0), static_cast(0), static_cast(1)); template - const tquat tquat::W = - tquat(static_cast(1), static_cast(0), static_cast(0), static_cast(0)); + const tquat tquat::W + (static_cast(1), static_cast(0), static_cast(0), static_cast(0)); template - const tquat tquat::XY = - tquat(static_cast(0), static_cast(1), static_cast(1), static_cast(0)); + const tquat tquat::XY + (static_cast(0), static_cast(1), static_cast(1), static_cast(0)); template - const tquat tquat::XZ = - tquat(static_cast(0), static_cast(0), static_cast(1), static_cast(1)); + const tquat tquat::XZ + (static_cast(0), static_cast(0), static_cast(1), static_cast(1)); template - const tquat tquat::XW = - tquat(static_cast(1), static_cast(1), static_cast(0), static_cast(0)); + const tquat tquat::XW + (static_cast(1), static_cast(1), static_cast(0), static_cast(0)); template - const tquat tquat::YZ = - tquat(static_cast(0), static_cast(0), static_cast(1), static_cast(1)); + const tquat tquat::YZ + (static_cast(0), static_cast(0), static_cast(1), static_cast(1)); template - const tquat tquat::YW = - tquat(static_cast(1), static_cast(0), static_cast(1), static_cast(0)); + const tquat tquat::YW + (static_cast(1), static_cast(0), static_cast(1), static_cast(0)); template - const tquat tquat::ZW = - tquat(static_cast(1), static_cast(0), static_cast(0), static_cast(1)); + const tquat tquat::ZW + (static_cast(1), static_cast(0), static_cast(0), static_cast(1)); template - const tquat tquat::XYZ = - tquat(static_cast(0), static_cast(1), static_cast(1), static_cast(1)); + const tquat tquat::XYZ + (static_cast(0), static_cast(1), static_cast(1), static_cast(1)); template - const tquat tquat::XYW = - tquat(static_cast(1), static_cast(1), static_cast(1), static_cast(0)); + const tquat tquat::XYW + (static_cast(1), static_cast(1), static_cast(1), static_cast(0)); template - const tquat tquat::XZW = - tquat(static_cast(1), static_cast(1), static_cast(0), static_cast(1)); + const tquat tquat::XZW + (static_cast(1), static_cast(1), static_cast(0), static_cast(1)); template - const tquat tquat::YZW = - tquat(static_cast(1), static_cast(0), static_cast(1), static_cast(1)); + const tquat tquat::YZW + (static_cast(1), static_cast(0), static_cast(1), static_cast(1)); template - const tquat tquat::XYZW = - tquat(static_cast(1), static_cast(1), static_cast(1), static_cast(1)); + const tquat tquat::XYZW + (static_cast(1), static_cast(1), static_cast(1), static_cast(1)); # endif // -- Component accesses -- diff --git a/glm/gtx/simd_quat.inl b/glm/gtx/simd_quat.inl index 422f3c85..dfa5b3c1 100644 --- a/glm/gtx/simd_quat.inl +++ b/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 ////////////////////////////////////// diff --git a/glm/gtx/simd_vec4.inl b/glm/gtx/simd_vec4.inl index ea327798..08ca10f9 100644 --- a/glm/gtx/simd_vec4.inl +++ b/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 //////////////////////////////////////