2
0
Эх сурвалжийг харах

Fixed swizzle operators build

Christophe Riccio 8 жил өмнө
parent
commit
f327d8e9d4

+ 9 - 9
glm/detail/type_vec1.hpp

@@ -48,15 +48,15 @@ namespace glm
 				T s;
 				T s;
 /*
 /*
 #				if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
 #				if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
-					_GLM_SWIZZLE1_2_MEMBERS(T, P, tvec2, x)
-					_GLM_SWIZZLE1_2_MEMBERS(T, P, tvec2, r)
-					_GLM_SWIZZLE1_2_MEMBERS(T, P, tvec2, s)
-					_GLM_SWIZZLE1_3_MEMBERS(T, P, tvec3, x)
-					_GLM_SWIZZLE1_3_MEMBERS(T, P, tvec3, r)
-					_GLM_SWIZZLE1_3_MEMBERS(T, P, tvec3, s)
-					_GLM_SWIZZLE1_4_MEMBERS(T, P, tvec4, x)
-					_GLM_SWIZZLE1_4_MEMBERS(T, P, tvec4, r)
-					_GLM_SWIZZLE1_4_MEMBERS(T, P, tvec4, s)
+					_GLM_SWIZZLE1_2_MEMBERS(T, Q, tvec2, x)
+					_GLM_SWIZZLE1_2_MEMBERS(T, Q, tvec2, r)
+					_GLM_SWIZZLE1_2_MEMBERS(T, Q, tvec2, s)
+					_GLM_SWIZZLE1_3_MEMBERS(T, Q, tvec3, x)
+					_GLM_SWIZZLE1_3_MEMBERS(T, Q, tvec3, r)
+					_GLM_SWIZZLE1_3_MEMBERS(T, Q, tvec3, s)
+					_GLM_SWIZZLE1_4_MEMBERS(T, Q, tvec4, x)
+					_GLM_SWIZZLE1_4_MEMBERS(T, Q, tvec4, r)
+					_GLM_SWIZZLE1_4_MEMBERS(T, Q, tvec4, s)
 #				endif//GLM_SWIZZLE*/
 #				endif//GLM_SWIZZLE*/
 			};
 			};
 		
 		

+ 9 - 9
glm/detail/type_vec2.hpp

@@ -47,15 +47,15 @@ namespace glm
 				struct{ T s, t; };
 				struct{ T s, t; };
 
 
 #				if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
 #				if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
-					GLM_SWIZZLE2_2_MEMBERS(T, P, x, y)
-					GLM_SWIZZLE2_2_MEMBERS(T, P, r, g)
-					GLM_SWIZZLE2_2_MEMBERS(T, P, s, t)
-					GLM_SWIZZLE2_3_MEMBERS(T, P, x, y)
-					GLM_SWIZZLE2_3_MEMBERS(T, P, r, g)
-					GLM_SWIZZLE2_3_MEMBERS(T, P, s, t)
-					GLM_SWIZZLE2_4_MEMBERS(T, P, x, y)
-					GLM_SWIZZLE2_4_MEMBERS(T, P, r, g)
-					GLM_SWIZZLE2_4_MEMBERS(T, P, s, t)
+					GLM_SWIZZLE2_2_MEMBERS(T, Q, x, y)
+					GLM_SWIZZLE2_2_MEMBERS(T, Q, r, g)
+					GLM_SWIZZLE2_2_MEMBERS(T, Q, s, t)
+					GLM_SWIZZLE2_3_MEMBERS(T, Q, x, y)
+					GLM_SWIZZLE2_3_MEMBERS(T, Q, r, g)
+					GLM_SWIZZLE2_3_MEMBERS(T, Q, s, t)
+					GLM_SWIZZLE2_4_MEMBERS(T, Q, x, y)
+					GLM_SWIZZLE2_4_MEMBERS(T, Q, r, g)
+					GLM_SWIZZLE2_4_MEMBERS(T, Q, s, t)
 #				endif//GLM_SWIZZLE
 #				endif//GLM_SWIZZLE
 
 
 			};
 			};

+ 9 - 9
glm/detail/type_vec3.hpp

@@ -47,15 +47,15 @@ namespace glm
 				struct{ T s, t, p; };
 				struct{ T s, t, p; };
 
 
 #				if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
 #				if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
-					GLM_SWIZZLE3_2_MEMBERS(T, P, x, y, z)
-					GLM_SWIZZLE3_2_MEMBERS(T, P, r, g, b)
-					GLM_SWIZZLE3_2_MEMBERS(T, P, s, t, p)
-					GLM_SWIZZLE3_3_MEMBERS(T, P, x, y, z)
-					GLM_SWIZZLE3_3_MEMBERS(T, P, r, g, b)
-					GLM_SWIZZLE3_3_MEMBERS(T, P, s, t, p)
-					GLM_SWIZZLE3_4_MEMBERS(T, P, x, y, z)
-					GLM_SWIZZLE3_4_MEMBERS(T, P, r, g, b)
-					GLM_SWIZZLE3_4_MEMBERS(T, P, s, t, p)
+					GLM_SWIZZLE3_2_MEMBERS(T, Q, x, y, z)
+					GLM_SWIZZLE3_2_MEMBERS(T, Q, r, g, b)
+					GLM_SWIZZLE3_2_MEMBERS(T, Q, s, t, p)
+					GLM_SWIZZLE3_3_MEMBERS(T, Q, x, y, z)
+					GLM_SWIZZLE3_3_MEMBERS(T, Q, r, g, b)
+					GLM_SWIZZLE3_3_MEMBERS(T, Q, s, t, p)
+					GLM_SWIZZLE3_4_MEMBERS(T, Q, x, y, z)
+					GLM_SWIZZLE3_4_MEMBERS(T, Q, r, g, b)
+					GLM_SWIZZLE3_4_MEMBERS(T, Q, s, t, p)
 #				endif//GLM_SWIZZLE
 #				endif//GLM_SWIZZLE
 			};
 			};
 		
 		

+ 9 - 9
glm/detail/type_vec4.hpp

@@ -49,15 +49,15 @@ namespace glm
 				typename detail::storage<T, sizeof(T) * 4, detail::is_aligned<Q>::value>::type data;
 				typename detail::storage<T, sizeof(T) * 4, detail::is_aligned<Q>::value>::type data;
 
 
 #				if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
 #				if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
-					GLM_SWIZZLE4_2_MEMBERS(T, P, x, y, z, w)
-					GLM_SWIZZLE4_2_MEMBERS(T, P, r, g, b, a)
-					GLM_SWIZZLE4_2_MEMBERS(T, P, s, t, p, q)
-					GLM_SWIZZLE4_3_MEMBERS(T, P, x, y, z, w)
-					GLM_SWIZZLE4_3_MEMBERS(T, P, r, g, b, a)
-					GLM_SWIZZLE4_3_MEMBERS(T, P, s, t, p, q)
-					GLM_SWIZZLE4_4_MEMBERS(T, P, x, y, z, w)
-					GLM_SWIZZLE4_4_MEMBERS(T, P, r, g, b, a)
-					GLM_SWIZZLE4_4_MEMBERS(T, P, s, t, p, q)
+					GLM_SWIZZLE4_2_MEMBERS(T, Q, x, y, z, w)
+					GLM_SWIZZLE4_2_MEMBERS(T, Q, r, g, b, a)
+					GLM_SWIZZLE4_2_MEMBERS(T, Q, s, t, p, q)
+					GLM_SWIZZLE4_3_MEMBERS(T, Q, x, y, z, w)
+					GLM_SWIZZLE4_3_MEMBERS(T, Q, r, g, b, a)
+					GLM_SWIZZLE4_3_MEMBERS(T, Q, s, t, p, q)
+					GLM_SWIZZLE4_4_MEMBERS(T, Q, x, y, z, w)
+					GLM_SWIZZLE4_4_MEMBERS(T, Q, r, g, b, a)
+					GLM_SWIZZLE4_4_MEMBERS(T, Q, s, t, p, q)
 #				endif//GLM_SWIZZLE
 #				endif//GLM_SWIZZLE
 			};
 			};