Restore MS version of hvec*

master
Christophe Riccio ago%!(EXTRA string=14 years)
parent d668433c20
commit c998734914
  1. 2
      glm/core/type_vec2.hpp
  2. 2
      glm/core/type_vec3.hpp
  3. 2
      glm/core/type_vec4.hpp
  4. 2
      glm/gtc/half_float.hpp
  5. 2
      glm/gtc/half_float.inl

@ -67,9 +67,9 @@ namespace detail
# elif(GLM_COMPONENT == GLM_COMPONENT_MS_EXT) # elif(GLM_COMPONENT == GLM_COMPONENT_MS_EXT)
union union
{ {
struct{value_type x, y;};
struct{value_type r, g;}; struct{value_type r, g;};
struct{value_type s, t;}; struct{value_type s, t;};
struct{value_type x, y;};
}; };
# else//(GLM_COMPONENT == GLM_COMPONENT_GLSL_NAMES) # else//(GLM_COMPONENT == GLM_COMPONENT_GLSL_NAMES)
union {value_type x, r, s;}; union {value_type x, r, s;};

@ -67,9 +67,9 @@ namespace detail
# elif(GLM_COMPONENT == GLM_COMPONENT_MS_EXT) # elif(GLM_COMPONENT == GLM_COMPONENT_MS_EXT)
union union
{ {
struct{value_type x, y, z;};
struct{value_type r, g, b;}; struct{value_type r, g, b;};
struct{value_type s, t, p;}; struct{value_type s, t, p;};
struct{value_type x, y, z;};
}; };
# else//(GLM_COMPONENT == GLM_COMPONENT_GLSL_NAMES) # else//(GLM_COMPONENT == GLM_COMPONENT_GLSL_NAMES)
union {value_type x, r, s;}; union {value_type x, r, s;};

@ -67,9 +67,9 @@ namespace detail
# elif(GLM_COMPONENT == GLM_COMPONENT_MS_EXT) # elif(GLM_COMPONENT == GLM_COMPONENT_MS_EXT)
union union
{ {
struct{value_type x, y, z, w;};
struct{value_type r, g, b, a;}; struct{value_type r, g, b, a;};
struct{value_type s, t, p, q;}; struct{value_type s, t, p, q;};
struct{value_type x, y, z, w;};
}; };
# else//(GLM_COMPONENT == GLM_COMPONENT_GLSL_NAMES) # else//(GLM_COMPONENT == GLM_COMPONENT_GLSL_NAMES)
union {value_type x, r, s;}; union {value_type x, r, s;};

@ -47,7 +47,7 @@
namespace glm{ namespace glm{
namespace detail namespace detail
{ {
#if 1 //ndef _MSC_EXTENSIONS #ifndef _MSC_EXTENSIONS
template <> template <>
struct tvec2<thalf> struct tvec2<thalf>
{ {

@ -29,7 +29,7 @@
namespace glm{ namespace glm{
namespace detail{ namespace detail{
#if 1 //ndef _MSC_EXTENSIONS #ifndef _MSC_EXTENSIONS
////////////////////////////////////// //////////////////////////////////////
// hvec2 // hvec2

Loading…
Cancel
Save