Explorar el Código

Restore MS version of hvec*

Christophe Riccio hace 14 años
padre
commit
c998734914

+ 1 - 1
glm/core/type_vec2.hpp

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

+ 1 - 1
glm/core/type_vec3.hpp

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

+ 1 - 1
glm/core/type_vec4.hpp

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

+ 1 - 1
glm/gtc/half_float.hpp

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

+ 1 - 1
glm/gtc/half_float.inl

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