anulax
/
glm
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Bring back CXXMS and CXX98 code pass for swizzle operators

Browse Source
master
Christophe Riccio ago%!(EXTRA string=12 years)
parent bc72fafdd9
commit b3d70c635b
3 changed files with 87 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      glm/core/type_vec2.hpp
  2. 37
      glm/core/type_vec3.hpp
  3. 39
      glm/core/type_vec4.hpp

35
glm/core/type_vec2.hpp
Unescape View File

@ -51,13 +51,34 @@ namespace detail
////////////////////////////////////// //////////////////////////////////////
// Data // Data
union {value_type x, r, s;}; # if(GLM_LANG & GLM_LANG_CXXMS_FLAG)
union {value_type y, g, t;}; union
{
# ifdef GLM_SWIZZLE struct{ value_type x, y; };
GLM_SWIZZLE_GEN_REF_FROM_VEC2(value_type, P, detail::tvec2, detail::tref2) struct{ value_type r, g; };
GLM_SWIZZLE_GEN_VEC_FROM_VEC2(value_type, P, detail::tvec2, detail::tvec2, detail::tvec3, detail::tvec4) struct{ value_type s, t; };
# endif//GLM_SWIZZLE
# if(defined(GLM_SWIZZLE))
_GLM_SWIZZLE2_2_MEMBERS(T, P, tvec2, x, y)
_GLM_SWIZZLE2_2_MEMBERS(T, P, tvec2, r, g)
_GLM_SWIZZLE2_2_MEMBERS(T, P, tvec2, s, t)
_GLM_SWIZZLE2_3_MEMBERS(T, P, tvec3, x, y)
_GLM_SWIZZLE2_3_MEMBERS(T, P, tvec3, r, g)
_GLM_SWIZZLE2_3_MEMBERS(T, P, tvec3, s, t)
_GLM_SWIZZLE2_4_MEMBERS(T, P, tvec4, x, y)
_GLM_SWIZZLE2_4_MEMBERS(T, P, tvec4, r, g)
_GLM_SWIZZLE2_4_MEMBERS(T, P, tvec4, s, t)
# endif//(defined(GLM_SWIZZLE))
};
# else
union {value_type x, r, s;};
union {value_type y, g, t;};
# if(defined(GLM_SWIZZLE))
GLM_SWIZZLE_GEN_REF_FROM_VEC2(value_type, P, detail::tvec2, detail::tref2)
GLM_SWIZZLE_GEN_VEC_FROM_VEC2(value_type, P, detail::tvec2, detail::tvec2, detail::tvec3, detail::tvec4)
# endif//(defined(GLM_SWIZZLE))
# endif//GLM_LANG
////////////////////////////////////// //////////////////////////////////////
// Accesses // Accesses

37
glm/core/type_vec3.hpp
Unescape View File

@ -51,14 +51,35 @@ namespace detail
////////////////////////////////////// //////////////////////////////////////
// Data // Data
union {value_type x, r, s;}; # if(GLM_LANG & GLM_LANG_CXXMS_FLAG)
union {value_type y, g, t;}; union
union {value_type z, b, p;}; {
struct{ value_type x, y, z; };
# if(defined(GLM_SWIZZLE)) struct{ value_type r, g, b; };
GLM_SWIZZLE_GEN_REF_FROM_VEC3(T, P, detail::tvec3, detail::tref2, detail::tref3) struct{ value_type s, t, p; };
GLM_SWIZZLE_GEN_VEC_FROM_VEC3(T, P, detail::tvec3, detail::tvec2, detail::tvec3, detail::tvec4)
# endif//(defined(GLM_SWIZZLE)) # if(defined(GLM_SWIZZLE))
_GLM_SWIZZLE3_2_MEMBERS(T, P, tvec2, x, y, z)
_GLM_SWIZZLE3_2_MEMBERS(T, P, tvec2, r, g, b)
_GLM_SWIZZLE3_2_MEMBERS(T, P, tvec2, s, t, p)
_GLM_SWIZZLE3_3_MEMBERS(T, P, tvec3, x, y, z)
_GLM_SWIZZLE3_3_MEMBERS(T, P, tvec3, r, g, b)
_GLM_SWIZZLE3_3_MEMBERS(T, P, tvec3, s, t, p)
_GLM_SWIZZLE3_4_MEMBERS(T, P, tvec4, x, y, z)
_GLM_SWIZZLE3_4_MEMBERS(T, P, tvec4, r, g, b)
_GLM_SWIZZLE3_4_MEMBERS(T, P, tvec4, s, t, p)
# endif//(defined(GLM_SWIZZLE))
};
# else
union { value_type x, r, s; };
union { value_type y, g, t; };
union { value_type z, b, p; };
# if(defined(GLM_SWIZZLE))
GLM_SWIZZLE_GEN_REF_FROM_VEC3(T, P, detail::tvec3, detail::tref2, detail::tref3)
GLM_SWIZZLE_GEN_VEC_FROM_VEC3(T, P, detail::tvec3, detail::tvec2, detail::tvec3, detail::tvec4)
# endif//(defined(GLM_SWIZZLE))
# endif//GLM_LANG
////////////////////////////////////// //////////////////////////////////////
// Accesses // Accesses

39
glm/core/type_vec4.hpp
Unescape View File

@ -51,15 +51,36 @@ namespace detail
////////////////////////////////////// //////////////////////////////////////
// Data // Data
union {value_type x, r, s;}; # if(GLM_LANG & GLM_LANG_CXXMS_FLAG)
union {value_type y, g, t;}; union
union {value_type z, b, p;}; {
union {value_type w, a, q;}; struct { value_type r, g, b, a; };
struct { value_type s, t, p, q; };
# if(defined(GLM_SWIZZLE)) struct { value_type x, y, z, w;};
GLM_SWIZZLE_GEN_REF_FROM_VEC4(T, P, detail::tvec4, detail::tref2, detail::tref3, detail::tref4)
GLM_SWIZZLE_GEN_VEC_FROM_VEC4(T, P, detail::tvec4, detail::tvec2, detail::tvec3, detail::tvec4) # if(defined(GLM_SWIZZLE))
# endif//(defined(GLM_SWIZZLE)) _GLM_SWIZZLE4_2_MEMBERS(T, P, tvec2, x, y, z, w)
_GLM_SWIZZLE4_2_MEMBERS(T, P, tvec2, r, g, b, a)
_GLM_SWIZZLE4_2_MEMBERS(T, P, tvec2, s, t, p, q)
_GLM_SWIZZLE4_3_MEMBERS(T, P, tvec3, x, y, z, w)
_GLM_SWIZZLE4_3_MEMBERS(T, P, tvec3, r, g, b, a)
_GLM_SWIZZLE4_3_MEMBERS(T, P, tvec3, s, t, p, q)
_GLM_SWIZZLE4_4_MEMBERS(T, P, tvec4, x, y, z, w)
_GLM_SWIZZLE4_4_MEMBERS(T, P, tvec4, r, g, b, a)
_GLM_SWIZZLE4_4_MEMBERS(T, P, tvec4, s, t, p, q)
# endif//(defined(GLM_SWIZZLE))
};
# else
union { value_type x, r, s; };
union { value_type y, g, t; };
union { value_type z, b, p; };
union { value_type w, a, q; };
# if(defined(GLM_SWIZZLE))
GLM_SWIZZLE_GEN_REF_FROM_VEC4(T, P, detail::tvec4, detail::tref2, detail::tref3, detail::tref4)
GLM_SWIZZLE_GEN_VEC_FROM_VEC4(T, P, detail::tvec4, detail::tvec2, detail::tvec3, detail::tvec4)
# endif//(defined(GLM_SWIZZLE))
# endif//GLM_LANG
////////////////////////////////////// //////////////////////////////////////
// Accesses // Accesses

Write Preview
Loading…
Cancel
Save