mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed issues with ref types for l-value swizzle operators

Browse Source
This commit is contained in:
Christophe Riccio
2013-08-27 13:50:55 +02:00
parent b3d70c635b
commit 4b7862b314
6 changed files with 204 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
glm/core/type_vec2.hpp
View File

@@ -51,24 +51,22 @@ namespace detail
//////////////////////////////////////
// Data
# if(GLM_LANG & GLM_LANG_CXXMS_FLAG)
# if((GLM_LANG & GLM_LANG_CXXMS_FLAG) && defined(GLM_SWIZZLE))
union
{
struct{ value_type x, y; };
struct{ value_type r, g; };
struct{ value_type s, t; };
# 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))
_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)
};
# else
union {value_type x, r, s;};

22
glm/core/type_vec3.hpp
View File

@@ -51,24 +51,22 @@ namespace detail
//////////////////////////////////////
// Data
# if(GLM_LANG & GLM_LANG_CXXMS_FLAG)
# if((GLM_LANG & GLM_LANG_CXXMS_FLAG) && defined(GLM_SWIZZLE))
union
{
struct{ value_type x, y, z; };
struct{ value_type r, g, b; };
struct{ value_type s, t, p; };
# 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))
_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)
};
# else
union { value_type x, r, s; };

22
glm/core/type_vec4.hpp
View File

@@ -51,24 +51,22 @@ namespace detail
//////////////////////////////////////
// Data
# if(GLM_LANG & GLM_LANG_CXXMS_FLAG)
# if((GLM_LANG & GLM_LANG_CXXMS_FLAG) && defined(GLM_SWIZZLE))
union
{
struct { value_type r, g, b, a; };
struct { value_type s, t, p, q; };
struct { value_type x, y, z, w;};
# if(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))
_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)
};
# else
union { value_type x, r, s; };

103
glm/gtc/swizzle.hpp
View File

@@ -91,16 +91,26 @@ namespace glm
vecType<T, P> & v,
comp x, comp y, comp z, comp w);
# define static_swizzle1_const(TYPE, SIZE) \
# define static_swizzle1_const_precision(TYPE, SIZE, PRECISION) \
template <comp x> \
GLM_FUNC_QUALIFIER TYPE swizzle(detail::tvec##SIZE<TYPE, defaultp> const & v) \
GLM_FUNC_QUALIFIER TYPE swizzle(detail::tvec##SIZE<TYPE, PRECISION> const & v) \
{return v[x];}
# define static_swizzle1_ref(TYPE, SIZE) \
# define static_swizzle1_ref_precision(TYPE, SIZE, PRECISION) \
template <comp x> \
GLM_FUNC_QUALIFIER TYPE& swizzle(detail::tvec##SIZE<TYPE, defaultp> & v) \
GLM_FUNC_QUALIFIER TYPE& swizzle(detail::tvec##SIZE<TYPE, PRECISION> & v) \
{return v[x];}
# define static_swizzle1_const(TYPE, SIZE) \
static_swizzle1_const_precision(TYPE, SIZE, glm::highp) \
static_swizzle1_const_precision(TYPE, SIZE, glm::mediump) \
static_swizzle1_const_precision(TYPE, SIZE, glm::lowp)
# define static_swizzle1_ref(TYPE, SIZE) \
static_swizzle1_ref_precision(TYPE, SIZE, glm::highp) \
static_swizzle1_ref_precision(TYPE, SIZE, glm::mediump) \
static_swizzle1_ref_precision(TYPE, SIZE, glm::lowp)
static_swizzle1_ref(detail::float32, 2)
static_swizzle1_ref(detail::float32, 3)
static_swizzle1_ref(detail::float32, 4)
@@ -150,24 +160,38 @@ namespace glm
{return TYPE(v[x], v[y], v[z], v[w]);}
*/
# define static_swizzle2_const(TYPE, SIZE) \
# define static_swizzle2_const_precision(TYPE, SIZE, PRECISION) \
template <comp x, comp y> \
GLM_FUNC_QUALIFIER detail::tvec2<TYPE, defaultp> swizzle( \
detail::tvec##SIZE<TYPE, defaultp> const & v) \
{return detail::tvec2<TYPE, defaultp>(v[x], v[y]);}
GLM_FUNC_QUALIFIER detail::tvec2<TYPE, PRECISION> swizzle( \
detail::tvec##SIZE<TYPE, PRECISION> const & v) \
{return detail::tvec2<TYPE, PRECISION>(v[x], v[y]); }
# define static_swizzle3_const_precision(TYPE, SIZE, PRECISION) \
template <comp x, comp y, comp z> \
GLM_FUNC_QUALIFIER detail::tvec3<TYPE, PRECISION> swizzle( \
detail::tvec##SIZE<TYPE, PRECISION> const & v) \
{return detail::tvec3<TYPE, PRECISION>(v[x], v[y], v[z]); }
# define static_swizzle4_const_precision(TYPE, SIZE, PRECISION) \
template <comp x, comp y, comp z, comp w> \
GLM_FUNC_QUALIFIER detail::tvec4<TYPE, PRECISION> swizzle( \
detail::tvec##SIZE<TYPE, PRECISION> const & v) \
{return detail::tvec4<TYPE, PRECISION>(v[x], v[y], v[z], v[w]); }
# define static_swizzle2_const(TYPE, SIZE) \
static_swizzle2_const_precision(TYPE, SIZE, glm::highp) \
static_swizzle2_const_precision(TYPE, SIZE, glm::mediump) \
static_swizzle2_const_precision(TYPE, SIZE, glm::lowp)
# define static_swizzle3_const(TYPE, SIZE) \
template <comp x, comp y, comp z> \
GLM_FUNC_QUALIFIER detail::tvec3<TYPE, defaultp> swizzle( \
detail::tvec##SIZE<TYPE, defaultp> const & v) \
{return detail::tvec3<TYPE, defaultp>(v[x], v[y], v[z]);}
static_swizzle3_const_precision(TYPE, SIZE, glm::highp) \
static_swizzle3_const_precision(TYPE, SIZE, glm::mediump) \
static_swizzle3_const_precision(TYPE, SIZE, glm::lowp)
# define static_swizzle4_const(TYPE, SIZE) \
template <comp x, comp y, comp z, comp w> \
GLM_FUNC_QUALIFIER detail::tvec4<TYPE, defaultp> swizzle( \
detail::tvec##SIZE<TYPE, defaultp> const & v) \
{return detail::tvec4<TYPE, defaultp>(v[x], v[y], v[z], v[w]);}
static_swizzle4_const_precision(TYPE, SIZE, glm::highp) \
static_swizzle4_const_precision(TYPE, SIZE, glm::mediump) \
static_swizzle4_const_precision(TYPE, SIZE, glm::lowp)
static_swizzle2_const(glm::f32, 2)
static_swizzle2_const(glm::f32, 3)
@@ -268,23 +292,38 @@ namespace glm
static_swizzle4_const(glm::u64, 3)
static_swizzle4_const(glm::u64, 4)
# define static_swizzle2_ref(TYPE, SIZE) \
template <glm::comp x, glm::comp y> \
GLM_FUNC_QUALIFIER glm::detail::tref2<TYPE, defaultp> swizzle( \
detail::tvec##SIZE<TYPE, defaultp> & v) \
{return glm::detail::tref2<TYPE, defaultp>(v[x], v[y]);}
# define static_swizzle2_ref_precision(TYPE, SIZE, PRECISION) \
template <glm::comp x, glm::comp y> \
GLM_FUNC_QUALIFIER glm::detail::tref2<TYPE, PRECISION> swizzle( \
detail::tvec##SIZE<TYPE, PRECISION> & v) \
{return glm::detail::tref2<TYPE, PRECISION>(v[x], v[y]); }
# define static_swizzle3_ref(TYPE, SIZE) \
template <glm::comp x, glm::comp y, glm::comp z> \
GLM_FUNC_QUALIFIER glm::detail::tref3<TYPE, defaultp> swizzle( \
detail::tvec##SIZE<TYPE, defaultp> & v) \
{return glm::detail::tref3<TYPE, defaultp>(v[x], v[y], v[z]);}
# define static_swizzle3_ref_precision(TYPE, SIZE, PRECISION) \
template <glm::comp x, glm::comp y, glm::comp z> \
GLM_FUNC_QUALIFIER glm::detail::tref3<TYPE, PRECISION> swizzle( \
detail::tvec##SIZE<TYPE, PRECISION> & v) \
{return glm::detail::tref3<TYPE, PRECISION>(v[x], v[y], v[z]); }
# define static_swizzle4_ref(TYPE, SIZE) \
template <glm::comp x, glm::comp y, glm::comp z, glm::comp w> \
GLM_FUNC_QUALIFIER glm::detail::tref4<TYPE, defaultp> swizzle( \
detail::tvec##SIZE<TYPE, defaultp> & v) \
{return glm::detail::tref4<TYPE, defaultp>(v[x], v[y], v[z], v[w]);}
# define static_swizzle4_ref_precision(TYPE, SIZE, PRECISION) \
template <glm::comp x, glm::comp y, glm::comp z, glm::comp w> \
GLM_FUNC_QUALIFIER glm::detail::tref4<TYPE, PRECISION> swizzle( \
detail::tvec##SIZE<TYPE, PRECISION> & v) \
{return glm::detail::tref4<TYPE, PRECISION>(v[x], v[y], v[z], v[w]); }
# define static_swizzle2_ref(TYPE, SIZE) \
static_swizzle2_ref_precision(TYPE, SIZE, glm::highp) \
static_swizzle2_ref_precision(TYPE, SIZE, glm::mediump) \
static_swizzle2_ref_precision(TYPE, SIZE, glm::lowp)
# define static_swizzle3_ref(TYPE, SIZE) \
static_swizzle3_ref_precision(TYPE, SIZE, glm::highp) \
static_swizzle3_ref_precision(TYPE, SIZE, glm::mediump) \
static_swizzle3_ref_precision(TYPE, SIZE, glm::lowp)
# define static_swizzle4_ref(TYPE, SIZE) \
static_swizzle4_ref_precision(TYPE, SIZE, glm::highp) \
static_swizzle4_ref_precision(TYPE, SIZE, glm::mediump) \
static_swizzle4_ref_precision(TYPE, SIZE, glm::lowp)
static_swizzle2_ref(glm::f32, 2)
static_swizzle2_ref(glm::f32, 3)