Browse Source

Fixed half vectors on VC + MS lang ext

Christophe Riccio 14 years ago
parent
commit
64453fd44e
3 changed files with 3 additions and 3 deletions
  1. 1 1
      glm/core/type_vec2.hpp
  2. 1 1
      glm/core/type_vec3.hpp
  3. 1 1
      glm/core/type_vec4.hpp

+ 1 - 1
glm/core/type_vec2.hpp

@@ -48,9 +48,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;};

+ 1 - 1
glm/core/type_vec3.hpp

@@ -48,9 +48,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;};

+ 1 - 1
glm/core/type_vec4.hpp

@@ -48,9 +48,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;};