From f327d8e9d43c0696ca75406905d9bb7b3d974c53 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 16 Aug 2017 02:17:25 +0200 Subject: [PATCH] Fixed swizzle operators build --- glm/detail/type_vec1.hpp | 18 +++++++++--------- glm/detail/type_vec2.hpp | 18 +++++++++--------- glm/detail/type_vec3.hpp | 18 +++++++++--------- glm/detail/type_vec4.hpp | 18 +++++++++--------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp index 8c7566a1..73169de8 100644 --- a/glm/detail/type_vec1.hpp +++ b/glm/detail/type_vec1.hpp @@ -48,15 +48,15 @@ namespace glm T s; /* # 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*/ }; diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp index bcfff3b6..78e70019 100644 --- a/glm/detail/type_vec2.hpp +++ b/glm/detail/type_vec2.hpp @@ -47,15 +47,15 @@ namespace glm struct{ T s, t; }; # 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 }; diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp index f25e61e2..3669ccde 100644 --- a/glm/detail/type_vec3.hpp +++ b/glm/detail/type_vec3.hpp @@ -47,15 +47,15 @@ namespace glm struct{ T s, t, p; }; # 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 }; diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index dadb8415..3e338bc4 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -49,15 +49,15 @@ namespace glm typename detail::storage::value>::type data; # 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 };