From f0164ad7ceda986a35b13dce839aff5c875b71b3 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 23 May 2011 02:36:19 +0100 Subject: [PATCH 1/8] More fixing for the swizzle operators --- glm/gtc/swizzle.hpp | 421 ++++++++++++++++++++++---------------------- 1 file changed, 211 insertions(+), 210 deletions(-) diff --git a/glm/gtc/swizzle.hpp b/glm/gtc/swizzle.hpp index b2e46b89..24d36970 100644 --- a/glm/gtc/swizzle.hpp +++ b/glm/gtc/swizzle.hpp @@ -67,62 +67,63 @@ namespace swizzle ///< GLM_GTC_swizzle extension vecType & v, comp x, comp y, comp z, comp w); -# define static_swizzle1(TYPE, SIZE) \ +# define static_swizzle1_const(TYPE, SIZE) \ template \ GLM_FUNC_QUALIFIER TYPE swizzle(detail::tvec##SIZE const & v) \ - {return v[x];} \ - \ - template \ + {return v[x];} + +# define static_swizzle1_ref(TYPE, SIZE) \ + template \ GLM_FUNC_QUALIFIER TYPE& swizzle(detail::tvec##SIZE & v) \ {return v[x];} + + static_swizzle1_ref(detail::float16, 2) + static_swizzle1_ref(detail::float16, 3) + static_swizzle1_ref(detail::float16, 4) + static_swizzle1_ref(detail::float32, 2) + static_swizzle1_ref(detail::float32, 3) + static_swizzle1_ref(detail::float32, 4) + static_swizzle1_ref(detail::float64, 2) + static_swizzle1_ref(detail::float64, 3) + static_swizzle1_ref(detail::float64, 4) + + static_swizzle1_ref(detail::int8, 2) + static_swizzle1_ref(detail::int8, 3) + static_swizzle1_ref(detail::int8, 4) + static_swizzle1_ref(detail::int16, 2) + static_swizzle1_ref(detail::int16, 3) + static_swizzle1_ref(detail::int16, 4) + static_swizzle1_ref(detail::int32, 2) + static_swizzle1_ref(detail::int32, 3) + static_swizzle1_ref(detail::int32, 4) + static_swizzle1_ref(detail::int64, 2) + static_swizzle1_ref(detail::int64, 3) + static_swizzle1_ref(detail::int64, 4) + + static_swizzle1_ref(detail::uint8, 2) + static_swizzle1_ref(detail::uint8, 3) + static_swizzle1_ref(detail::uint8, 4) + static_swizzle1_ref(detail::uint16, 2) + static_swizzle1_ref(detail::uint16, 3) + static_swizzle1_ref(detail::uint16, 4) + static_swizzle1_ref(detail::uint32, 2) + static_swizzle1_ref(detail::uint32, 3) + static_swizzle1_ref(detail::uint32, 4) + static_swizzle1_ref(detail::uint64, 2) + static_swizzle1_ref(detail::uint64, 3) + static_swizzle1_ref(detail::uint64, 4) /* - static_swizzle1(detail::float16, 2) - static_swizzle1(detail::float16, 3) - static_swizzle1(detail::float16, 4) - static_swizzle1(detail::float32, 2) - static_swizzle1(detail::float32, 3) - static_swizzle1(detail::float32, 4) - static_swizzle1(detail::float64, 2) - static_swizzle1(detail::float64, 3) - static_swizzle1(detail::float64, 4) - - static_swizzle1(detail::int8, 2) - static_swizzle1(detail::int8, 3) - static_swizzle1(detail::int8, 4) - static_swizzle1(detail::int16, 2) - static_swizzle1(detail::int16, 3) - static_swizzle1(detail::int16, 4) - static_swizzle1(detail::int32, 2) - static_swizzle1(detail::int32, 3) - static_swizzle1(detail::int32, 4) - static_swizzle1(detail::int64, 2) - static_swizzle1(detail::int64, 3) - static_swizzle1(detail::int64, 4) - - static_swizzle1(detail::uint8, 2) - static_swizzle1(detail::uint8, 3) - static_swizzle1(detail::uint8, 4) - static_swizzle1(detail::uint16, 2) - static_swizzle1(detail::uint16, 3) - static_swizzle1(detail::uint16, 4) - static_swizzle1(detail::uint32, 2) - static_swizzle1(detail::uint32, 3) - static_swizzle1(detail::uint32, 4) - static_swizzle1(detail::uint64, 2) - static_swizzle1(detail::uint64, 3) - static_swizzle1(detail::uint64, 4) - -# define static_swizzle2_const(TYPE) \ +# define static_swizzle2_const(TYPE) \ template \ GLM_FUNC_QUALIFIER TYPE swizzle(TYPE const & v) \ {return TYPE(v[x], v[y]);} -# define static_swizzle3_const(TYPE) \ +# define static_swizzle3_const(TYPE) \ template \ GLM_FUNC_QUALIFIER TYPE swizzle(TYPE const & v) \ {return TYPE(v[x], v[y], v[z]);} -# define static_swizzle4_const(TYPE) \ +# define static_swizzle4_const(TYPE) \ template \ GLM_FUNC_QUALIFIER TYPE swizzle(TYPE const & v) \ {return TYPE(v[x], v[y], v[z], v[w]);} @@ -153,195 +154,195 @@ namespace swizzle ///< GLM_GTC_swizzle extension static_swizzle2_const(glm::f64vec2, 2) static_swizzle2_const(glm::f64vec3, 3) static_swizzle2_const(glm::f64vec4, 4) -/* - static_swizzle2_const(glm::i8vec2) - static_swizzle2_const(glm::i8vec3) - static_swizzle2_const(glm::i8vec4) - static_swizzle2_const(glm::i16vec2) - static_swizzle2_const(glm::i16vec3) - static_swizzle2_const(glm::i16vec4) - static_swizzle2_const(glm::i32vec2) - static_swizzle2_const(glm::i32vec3) - static_swizzle2_const(glm::i32vec4) - static_swizzle2_const(glm::i64vec2) - static_swizzle2_const(glm::i64vec3) - static_swizzle2_const(glm::i64vec4) - static_swizzle2_const(glm::u8vec2) - static_swizzle2_const(glm::u8vec3) - static_swizzle2_const(glm::u8vec4) - static_swizzle2_const(glm::u16vec2) - static_swizzle2_const(glm::u16vec3) - static_swizzle2_const(glm::u16vec4) - static_swizzle2_const(glm::u32vec2) - static_swizzle2_const(glm::u32vec3) - static_swizzle2_const(glm::u32vec4) - static_swizzle2_const(glm::u64vec2) - static_swizzle2_const(glm::u64vec3) - static_swizzle2_const(glm::u64vec4) + static_swizzle2_const(glm::i8vec2, 2) + static_swizzle2_const(glm::i8vec3, 3) + static_swizzle2_const(glm::i8vec4, 4) + static_swizzle2_const(glm::i16vec2, 2) + static_swizzle2_const(glm::i16vec3, 3) + static_swizzle2_const(glm::i16vec4, 4) + static_swizzle2_const(glm::i32vec2, 2) + static_swizzle2_const(glm::i32vec3, 3) + static_swizzle2_const(glm::i32vec4, 4) + static_swizzle2_const(glm::i64vec2, 2) + static_swizzle2_const(glm::i64vec3, 3) + static_swizzle2_const(glm::i64vec4, 4) - static_swizzle3_const(glm::f16vec2) - static_swizzle3_const(glm::f16vec3) - static_swizzle3_const(glm::f16vec4) - static_swizzle3_const(glm::f32vec2) - static_swizzle3_const(glm::f32vec3) - static_swizzle3_const(glm::f32vec4) - static_swizzle3_const(glm::f64vec2) - static_swizzle3_const(glm::f64vec3) - static_swizzle3_const(glm::f64vec4) + static_swizzle2_const(glm::u8vec2, 2) + static_swizzle2_const(glm::u8vec3, 3) + static_swizzle2_const(glm::u8vec4, 4) + static_swizzle2_const(glm::u16vec2, 2) + static_swizzle2_const(glm::u16vec3, 3) + static_swizzle2_const(glm::u16vec4, 4) + static_swizzle2_const(glm::u32vec2, 2) + static_swizzle2_const(glm::u32vec3, 3) + static_swizzle2_const(glm::u32vec4, 4) + static_swizzle2_const(glm::u64vec2, 2) + static_swizzle2_const(glm::u64vec3, 3) + static_swizzle2_const(glm::u64vec4, 4) - static_swizzle3_const(glm::i8vec2) - static_swizzle3_const(glm::i8vec3) - static_swizzle3_const(glm::i8vec4) - static_swizzle3_const(glm::i16vec2) - static_swizzle3_const(glm::i16vec3) - static_swizzle3_const(glm::i16vec4) - static_swizzle3_const(glm::i32vec2) - static_swizzle3_const(glm::i32vec3) - static_swizzle3_const(glm::i32vec4) - static_swizzle3_const(glm::i64vec2) - static_swizzle3_const(glm::i64vec3) - static_swizzle3_const(glm::i64vec4) + static_swizzle3_const(glm::f16vec2, 2) + static_swizzle3_const(glm::f16vec3, 3) + static_swizzle3_const(glm::f16vec4, 4) + static_swizzle3_const(glm::f32vec2, 2) + static_swizzle3_const(glm::f32vec3, 3) + static_swizzle3_const(glm::f32vec4, 4) + static_swizzle3_const(glm::f64vec2, 2) + static_swizzle3_const(glm::f64vec3, 3) + static_swizzle3_const(glm::f64vec4, 4) - static_swizzle3_const(glm::u8vec2) - static_swizzle3_const(glm::u8vec3) - static_swizzle3_const(glm::u8vec4) - static_swizzle3_const(glm::u16vec2) - static_swizzle3_const(glm::u16vec3) - static_swizzle3_const(glm::u16vec4) - static_swizzle3_const(glm::u32vec2) - static_swizzle3_const(glm::u32vec3) - static_swizzle3_const(glm::u32vec4) - static_swizzle3_const(glm::u64vec2) - static_swizzle3_const(glm::u64vec3) - static_swizzle3_const(glm::u64vec4) + static_swizzle3_const(glm::i8vec2, 2) + static_swizzle3_const(glm::i8vec3, 3) + static_swizzle3_const(glm::i8vec4, 4) + static_swizzle3_const(glm::i16vec2, 2) + static_swizzle3_const(glm::i16vec3, 3) + static_swizzle3_const(glm::i16vec4, 4) + static_swizzle3_const(glm::i32vec2, 2) + static_swizzle3_const(glm::i32vec3, 3) + static_swizzle3_const(glm::i32vec4, 4) + static_swizzle3_const(glm::i64vec2, 2) + static_swizzle3_const(glm::i64vec3, 3) + static_swizzle3_const(glm::i64vec4, 4) - static_swizzle4_const(glm::f16vec2) - static_swizzle4_const(glm::f16vec3) - static_swizzle4_const(glm::f16vec4) - static_swizzle4_const(glm::f32vec2) - static_swizzle4_const(glm::f32vec3) - static_swizzle4_const(glm::f32vec4) - static_swizzle4_const(glm::f64vec2) - static_swizzle4_const(glm::f64vec3) - static_swizzle4_const(glm::f64vec4) + static_swizzle3_const(glm::u8vec2, 2) + static_swizzle3_const(glm::u8vec3, 3) + static_swizzle3_const(glm::u8vec4, 4) + static_swizzle3_const(glm::u16vec2, 2) + static_swizzle3_const(glm::u16vec3, 3) + static_swizzle3_const(glm::u16vec4, 4) + static_swizzle3_const(glm::u32vec2, 2) + static_swizzle3_const(glm::u32vec3, 3) + static_swizzle3_const(glm::u32vec4, 4) + static_swizzle3_const(glm::u64vec2, 2) + static_swizzle3_const(glm::u64vec3, 3) + static_swizzle3_const(glm::u64vec4, 4) - static_swizzle4_const(glm::i8vec2) - static_swizzle4_const(glm::i8vec3) - static_swizzle4_const(glm::i8vec4) - static_swizzle4_const(glm::i16vec2) - static_swizzle4_const(glm::i16vec3) - static_swizzle4_const(glm::i16vec4) - static_swizzle4_const(glm::i32vec2) - static_swizzle4_const(glm::i32vec3) - static_swizzle4_const(glm::i32vec4) - static_swizzle4_const(glm::i64vec2) - static_swizzle4_const(glm::i64vec3) - static_swizzle4_const(glm::i64vec4) + static_swizzle4_const(glm::f16vec2, 2) + static_swizzle4_const(glm::f16vec3, 3) + static_swizzle4_const(glm::f16vec4, 4) + static_swizzle4_const(glm::f32vec2, 2) + static_swizzle4_const(glm::f32vec3, 3) + static_swizzle4_const(glm::f32vec4, 4) + static_swizzle4_const(glm::f64vec2, 2) + static_swizzle4_const(glm::f64vec3, 3) + static_swizzle4_const(glm::f64vec4, 4) - static_swizzle4_const(glm::u8vec2) - static_swizzle4_const(glm::u8vec3) - static_swizzle4_const(glm::u8vec4) - static_swizzle4_const(glm::u16vec2) - static_swizzle4_const(glm::u16vec3) - static_swizzle4_const(glm::u16vec4) - static_swizzle4_const(glm::u32vec2) - static_swizzle4_const(glm::u32vec3) - static_swizzle4_const(glm::u32vec4) - static_swizzle4_const(glm::u64vec2) - static_swizzle4_const(glm::u64vec3) - static_swizzle4_const(glm::u64vec4) + static_swizzle4_const(glm::i8vec2, 2) + static_swizzle4_const(glm::i8vec3, 3) + static_swizzle4_const(glm::i8vec4, 4) + static_swizzle4_const(glm::i16vec2, 2) + static_swizzle4_const(glm::i16vec3, 3) + static_swizzle4_const(glm::i16vec4, 4) + static_swizzle4_const(glm::i32vec2, 2) + static_swizzle4_const(glm::i32vec3, 3) + static_swizzle4_const(glm::i32vec4, 4) + static_swizzle4_const(glm::i64vec2, 2) + static_swizzle4_const(glm::i64vec3, 3) + static_swizzle4_const(glm::i64vec4, 4) -# define static_swizzle2_ref(TYPE) \ + static_swizzle4_const(glm::u8vec2, 2) + static_swizzle4_const(glm::u8vec3, 3) + static_swizzle4_const(glm::u8vec4, 4) + static_swizzle4_const(glm::u16vec2, 2) + static_swizzle4_const(glm::u16vec3, 3) + static_swizzle4_const(glm::u16vec4, 4) + static_swizzle4_const(glm::u32vec2, 2) + static_swizzle4_const(glm::u32vec3, 3) + static_swizzle4_const(glm::u32vec4, 4) + static_swizzle4_const(glm::u64vec2, 2) + static_swizzle4_const(glm::u64vec3, 3) + static_swizzle4_const(glm::u64vec4, 4) + +# define static_swizzle2_ref(TYPE, SIZE) \ template \ - GLM_FUNC_QUALIFIER glm::detail::tref2 swizzle(TYPE & v) \ - {return glm::detail::tref2(v[x], v[y]);} + GLM_FUNC_QUALIFIER glm::detail::tref2 swizzle(detail::tvec##SIZE & v) \ + {return glm::detail::tref2(v[x], v[y]);} -# define static_swizzle3_ref(TYPE) \ +# define static_swizzle3_ref(TYPE, SIZE) \ template \ - GLM_FUNC_QUALIFIER glm::detail::tref3 swizzle(TYPE & v) \ - {return glm::detail::tref3(v[x], v[y], v[z]);} + GLM_FUNC_QUALIFIER glm::detail::tref3 swizzle(detail::tvec##SIZE & v) \ + {return glm::detail::tref3(v[x], v[y], v[z]);} -# define static_swizzle4_ref(TYPE) \ +# define static_swizzle4_ref(TYPE, SIZE) \ template \ - GLM_FUNC_QUALIFIER glm::detail::tref4 swizzle(TYPE & v) \ - {return glm::detail::tref4(v[x], v[y], v[z], v[w]);} + GLM_FUNC_QUALIFIER glm::detail::tref4 swizzle(detail::tvec##SIZE & v) \ + {return glm::detail::tref4(v[x], v[y], v[z], v[w]);} - static_swizzle2_ref(glm::f16vec2) - static_swizzle2_ref(glm::f16vec3) - static_swizzle2_ref(glm::f16vec4) - static_swizzle2_ref(glm::f32vec2) - static_swizzle2_ref(glm::f32vec3) - static_swizzle2_ref(glm::f32vec4) - static_swizzle2_ref(glm::f64vec2) - static_swizzle2_ref(glm::f64vec3) - static_swizzle2_ref(glm::f64vec4) + static_swizzle2_ref(glm::f16vec2, 2) + static_swizzle2_ref(glm::f16vec3, 3) + static_swizzle2_ref(glm::f16vec4, 4) + static_swizzle2_ref(glm::f32vec2, 2) + static_swizzle2_ref(glm::f32vec3, 3) + static_swizzle2_ref(glm::f32vec4, 4) + static_swizzle2_ref(glm::f64vec2, 2) + static_swizzle2_ref(glm::f64vec3, 3) + static_swizzle2_ref(glm::f64vec4, 4) - static_swizzle2_ref(glm::i8vec2) - static_swizzle2_ref(glm::i8vec3) - static_swizzle2_ref(glm::i8vec4) - static_swizzle2_ref(glm::i16vec2) - static_swizzle2_ref(glm::i16vec3) - static_swizzle2_ref(glm::i16vec4) - static_swizzle2_ref(glm::i32vec2) - static_swizzle2_ref(glm::i32vec3) - static_swizzle2_ref(glm::i32vec4) - static_swizzle2_ref(glm::i64vec2) - static_swizzle2_ref(glm::i64vec3) - static_swizzle2_ref(glm::i64vec4) + static_swizzle2_ref(glm::i8vec2, 2) + static_swizzle2_ref(glm::i8vec3, 3) + static_swizzle2_ref(glm::i8vec4, 4) + static_swizzle2_ref(glm::i16vec2, 2) + static_swizzle2_ref(glm::i16vec3, 3) + static_swizzle2_ref(glm::i16vec4, 4) + static_swizzle2_ref(glm::i32vec2, 2) + static_swizzle2_ref(glm::i32vec3, 3) + static_swizzle2_ref(glm::i32vec4, 4) + static_swizzle2_ref(glm::i64vec2, 2) + static_swizzle2_ref(glm::i64vec3, 3) + static_swizzle2_ref(glm::i64vec4, 4) - static_swizzle2_ref(glm::u8vec2) - static_swizzle2_ref(glm::u8vec3) - static_swizzle2_ref(glm::u8vec4) - static_swizzle2_ref(glm::u16vec2) - static_swizzle2_ref(glm::u16vec3) - static_swizzle2_ref(glm::u16vec4) - static_swizzle2_ref(glm::u32vec2) - static_swizzle2_ref(glm::u32vec3) - static_swizzle2_ref(glm::u32vec4) - static_swizzle2_ref(glm::u64vec2) - static_swizzle2_ref(glm::u64vec3) - static_swizzle2_ref(glm::u64vec4) + static_swizzle2_ref(glm::u8vec2, 2) + static_swizzle2_ref(glm::u8vec3, 3) + static_swizzle2_ref(glm::u8vec4, 4) + static_swizzle2_ref(glm::u16vec2, 2) + static_swizzle2_ref(glm::u16vec3, 3) + static_swizzle2_ref(glm::u16vec4, 4) + static_swizzle2_ref(glm::u32vec2, 2) + static_swizzle2_ref(glm::u32vec3, 3) + static_swizzle2_ref(glm::u32vec4, 4) + static_swizzle2_ref(glm::u64vec2, 2) + static_swizzle2_ref(glm::u64vec3, 3) + static_swizzle2_ref(glm::u64vec4, 4) - static_swizzle3_ref(glm::f16vec3) - static_swizzle3_ref(glm::f16vec4) - static_swizzle3_ref(glm::f32vec3) - static_swizzle3_ref(glm::f32vec4) - static_swizzle3_ref(glm::f64vec3) - static_swizzle3_ref(glm::f64vec4) + static_swizzle3_ref(glm::f16vec3, 3) + static_swizzle3_ref(glm::f16vec4, 4) + static_swizzle3_ref(glm::f32vec3, 3) + static_swizzle3_ref(glm::f32vec4, 4) + static_swizzle3_ref(glm::f64vec3, 3) + static_swizzle3_ref(glm::f64vec4, 4) - static_swizzle3_ref(glm::i8vec3) - static_swizzle3_ref(glm::i8vec4) - static_swizzle3_ref(glm::i16vec3) - static_swizzle3_ref(glm::i16vec4) - static_swizzle3_ref(glm::i32vec3) - static_swizzle3_ref(glm::i32vec4) - static_swizzle3_ref(glm::i64vec3) - static_swizzle3_ref(glm::i64vec4) + static_swizzle3_ref(glm::i8vec3, 3) + static_swizzle3_ref(glm::i8vec4, 4) + static_swizzle3_ref(glm::i16vec3, 3) + static_swizzle3_ref(glm::i16vec4, 4) + static_swizzle3_ref(glm::i32vec3, 3) + static_swizzle3_ref(glm::i32vec4, 4) + static_swizzle3_ref(glm::i64vec3, 3) + static_swizzle3_ref(glm::i64vec4, 4) - static_swizzle3_ref(glm::u8vec3) - static_swizzle3_ref(glm::u8vec4) - static_swizzle3_ref(glm::u16vec3) - static_swizzle3_ref(glm::u16vec4) - static_swizzle3_ref(glm::u32vec3) - static_swizzle3_ref(glm::u32vec4) - static_swizzle3_ref(glm::u64vec3) - static_swizzle3_ref(glm::u64vec4) + static_swizzle3_ref(glm::u8vec3, 3) + static_swizzle3_ref(glm::u8vec4, 4) + static_swizzle3_ref(glm::u16vec3, 3) + static_swizzle3_ref(glm::u16vec4, 4) + static_swizzle3_ref(glm::u32vec3, 3) + static_swizzle3_ref(glm::u32vec4, 4) + static_swizzle3_ref(glm::u64vec3, 3) + static_swizzle3_ref(glm::u64vec4, 4) - static_swizzle4_ref(glm::f16vec4) - static_swizzle4_ref(glm::f32vec4) - static_swizzle4_ref(glm::f64vec4) + static_swizzle4_ref(glm::f16vec4, 4) + static_swizzle4_ref(glm::f32vec4, 4) + static_swizzle4_ref(glm::f64vec4, 4) - static_swizzle4_ref(glm::i8vec4) - static_swizzle4_ref(glm::i16vec4) - static_swizzle4_ref(glm::i32vec4) - static_swizzle4_ref(glm::i64vec4) + static_swizzle4_ref(glm::i8vec4, 4) + static_swizzle4_ref(glm::i16vec4, 4) + static_swizzle4_ref(glm::i32vec4, 4) + static_swizzle4_ref(glm::i64vec4, 4) + + static_swizzle4_ref(glm::u8vec4, 4) + static_swizzle4_ref(glm::u16vec4, 4) + static_swizzle4_ref(glm::u32vec4, 4) + static_swizzle4_ref(glm::u64vec4, 4) - static_swizzle4_ref(glm::u8vec4) - static_swizzle4_ref(glm::u16vec4) - static_swizzle4_ref(glm::u32vec4) - static_swizzle4_ref(glm::u64vec4) -*/ }//namespace swizzle }//namespace gtc }//namespace glm From 95889e3570a9a317f87202d611c0223a90c1d2f2 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 23 May 2011 10:16:52 +0100 Subject: [PATCH 2/8] Fixed last glitch in Clang support --- glm/gtc/swizzle.hpp | 330 ++++++++++++++++++++++---------------------- 1 file changed, 165 insertions(+), 165 deletions(-) diff --git a/glm/gtc/swizzle.hpp b/glm/gtc/swizzle.hpp index 24d36970..bd4cfb83 100644 --- a/glm/gtc/swizzle.hpp +++ b/glm/gtc/swizzle.hpp @@ -145,113 +145,113 @@ namespace swizzle ///< GLM_GTC_swizzle extension {return detail::tvec4(v[x], v[y], v[z], v[w]);} - static_swizzle2_const(glm::f16vec2, 2) - static_swizzle2_const(glm::f16vec3, 3) - static_swizzle2_const(glm::f16vec4, 4) - static_swizzle2_const(glm::f32vec2, 2) - static_swizzle2_const(glm::f32vec3, 3) - static_swizzle2_const(glm::f32vec4, 4) - static_swizzle2_const(glm::f64vec2, 2) - static_swizzle2_const(glm::f64vec3, 3) - static_swizzle2_const(glm::f64vec4, 4) + static_swizzle2_const(glm::f16, 2) + static_swizzle2_const(glm::f16, 3) + static_swizzle2_const(glm::f16, 4) + static_swizzle2_const(glm::f32, 2) + static_swizzle2_const(glm::f32, 3) + static_swizzle2_const(glm::f32, 4) + static_swizzle2_const(glm::f64, 2) + static_swizzle2_const(glm::f64, 3) + static_swizzle2_const(glm::f64, 4) - static_swizzle2_const(glm::i8vec2, 2) - static_swizzle2_const(glm::i8vec3, 3) - static_swizzle2_const(glm::i8vec4, 4) - static_swizzle2_const(glm::i16vec2, 2) - static_swizzle2_const(glm::i16vec3, 3) - static_swizzle2_const(glm::i16vec4, 4) - static_swizzle2_const(glm::i32vec2, 2) - static_swizzle2_const(glm::i32vec3, 3) - static_swizzle2_const(glm::i32vec4, 4) - static_swizzle2_const(glm::i64vec2, 2) - static_swizzle2_const(glm::i64vec3, 3) - static_swizzle2_const(glm::i64vec4, 4) + static_swizzle2_const(glm::i8, 2) + static_swizzle2_const(glm::i8, 3) + static_swizzle2_const(glm::i8, 4) + static_swizzle2_const(glm::i16, 2) + static_swizzle2_const(glm::i16, 3) + static_swizzle2_const(glm::i16, 4) + static_swizzle2_const(glm::i32, 2) + static_swizzle2_const(glm::i32, 3) + static_swizzle2_const(glm::i32, 4) + static_swizzle2_const(glm::i64, 2) + static_swizzle2_const(glm::i64, 3) + static_swizzle2_const(glm::i64, 4) - static_swizzle2_const(glm::u8vec2, 2) - static_swizzle2_const(glm::u8vec3, 3) - static_swizzle2_const(glm::u8vec4, 4) - static_swizzle2_const(glm::u16vec2, 2) - static_swizzle2_const(glm::u16vec3, 3) - static_swizzle2_const(glm::u16vec4, 4) - static_swizzle2_const(glm::u32vec2, 2) - static_swizzle2_const(glm::u32vec3, 3) - static_swizzle2_const(glm::u32vec4, 4) - static_swizzle2_const(glm::u64vec2, 2) - static_swizzle2_const(glm::u64vec3, 3) - static_swizzle2_const(glm::u64vec4, 4) + static_swizzle2_const(glm::u8, 2) + static_swizzle2_const(glm::u8, 3) + static_swizzle2_const(glm::u8, 4) + static_swizzle2_const(glm::u16, 2) + static_swizzle2_const(glm::u16, 3) + static_swizzle2_const(glm::u16, 4) + static_swizzle2_const(glm::u32, 2) + static_swizzle2_const(glm::u32, 3) + static_swizzle2_const(glm::u32, 4) + static_swizzle2_const(glm::u64, 2) + static_swizzle2_const(glm::u64, 3) + static_swizzle2_const(glm::u64, 4) - static_swizzle3_const(glm::f16vec2, 2) - static_swizzle3_const(glm::f16vec3, 3) - static_swizzle3_const(glm::f16vec4, 4) - static_swizzle3_const(glm::f32vec2, 2) - static_swizzle3_const(glm::f32vec3, 3) - static_swizzle3_const(glm::f32vec4, 4) - static_swizzle3_const(glm::f64vec2, 2) - static_swizzle3_const(glm::f64vec3, 3) - static_swizzle3_const(glm::f64vec4, 4) + static_swizzle3_const(glm::f16, 2) + static_swizzle3_const(glm::f16, 3) + static_swizzle3_const(glm::f16, 4) + static_swizzle3_const(glm::f32, 2) + static_swizzle3_const(glm::f32, 3) + static_swizzle3_const(glm::f32, 4) + static_swizzle3_const(glm::f64, 2) + static_swizzle3_const(glm::f64, 3) + static_swizzle3_const(glm::f64, 4) - static_swizzle3_const(glm::i8vec2, 2) - static_swizzle3_const(glm::i8vec3, 3) - static_swizzle3_const(glm::i8vec4, 4) - static_swizzle3_const(glm::i16vec2, 2) - static_swizzle3_const(glm::i16vec3, 3) - static_swizzle3_const(glm::i16vec4, 4) - static_swizzle3_const(glm::i32vec2, 2) - static_swizzle3_const(glm::i32vec3, 3) - static_swizzle3_const(glm::i32vec4, 4) - static_swizzle3_const(glm::i64vec2, 2) - static_swizzle3_const(glm::i64vec3, 3) - static_swizzle3_const(glm::i64vec4, 4) + static_swizzle3_const(glm::i8, 2) + static_swizzle3_const(glm::i8, 3) + static_swizzle3_const(glm::i8, 4) + static_swizzle3_const(glm::i16, 2) + static_swizzle3_const(glm::i16, 3) + static_swizzle3_const(glm::i16, 4) + static_swizzle3_const(glm::i32, 2) + static_swizzle3_const(glm::i32, 3) + static_swizzle3_const(glm::i32, 4) + static_swizzle3_const(glm::i64, 2) + static_swizzle3_const(glm::i64, 3) + static_swizzle3_const(glm::i64, 4) - static_swizzle3_const(glm::u8vec2, 2) - static_swizzle3_const(glm::u8vec3, 3) - static_swizzle3_const(glm::u8vec4, 4) - static_swizzle3_const(glm::u16vec2, 2) - static_swizzle3_const(glm::u16vec3, 3) - static_swizzle3_const(glm::u16vec4, 4) - static_swizzle3_const(glm::u32vec2, 2) - static_swizzle3_const(glm::u32vec3, 3) - static_swizzle3_const(glm::u32vec4, 4) - static_swizzle3_const(glm::u64vec2, 2) - static_swizzle3_const(glm::u64vec3, 3) - static_swizzle3_const(glm::u64vec4, 4) + static_swizzle3_const(glm::u8, 2) + static_swizzle3_const(glm::u8, 3) + static_swizzle3_const(glm::u8, 4) + static_swizzle3_const(glm::u16, 2) + static_swizzle3_const(glm::u16, 3) + static_swizzle3_const(glm::u16, 4) + static_swizzle3_const(glm::u32, 2) + static_swizzle3_const(glm::u32, 3) + static_swizzle3_const(glm::u32, 4) + static_swizzle3_const(glm::u64, 2) + static_swizzle3_const(glm::u64, 3) + static_swizzle3_const(glm::u64, 4) - static_swizzle4_const(glm::f16vec2, 2) - static_swizzle4_const(glm::f16vec3, 3) - static_swizzle4_const(glm::f16vec4, 4) - static_swizzle4_const(glm::f32vec2, 2) - static_swizzle4_const(glm::f32vec3, 3) - static_swizzle4_const(glm::f32vec4, 4) - static_swizzle4_const(glm::f64vec2, 2) - static_swizzle4_const(glm::f64vec3, 3) - static_swizzle4_const(glm::f64vec4, 4) + static_swizzle4_const(glm::f16, 2) + static_swizzle4_const(glm::f16, 3) + static_swizzle4_const(glm::f16, 4) + static_swizzle4_const(glm::f32, 2) + static_swizzle4_const(glm::f32, 3) + static_swizzle4_const(glm::f32, 4) + static_swizzle4_const(glm::f64, 2) + static_swizzle4_const(glm::f64, 3) + static_swizzle4_const(glm::f64, 4) - static_swizzle4_const(glm::i8vec2, 2) - static_swizzle4_const(glm::i8vec3, 3) - static_swizzle4_const(glm::i8vec4, 4) - static_swizzle4_const(glm::i16vec2, 2) - static_swizzle4_const(glm::i16vec3, 3) - static_swizzle4_const(glm::i16vec4, 4) - static_swizzle4_const(glm::i32vec2, 2) - static_swizzle4_const(glm::i32vec3, 3) - static_swizzle4_const(glm::i32vec4, 4) - static_swizzle4_const(glm::i64vec2, 2) - static_swizzle4_const(glm::i64vec3, 3) - static_swizzle4_const(glm::i64vec4, 4) + static_swizzle4_const(glm::i8, 2) + static_swizzle4_const(glm::i8, 3) + static_swizzle4_const(glm::i8, 4) + static_swizzle4_const(glm::i16, 2) + static_swizzle4_const(glm::i16, 3) + static_swizzle4_const(glm::i16, 4) + static_swizzle4_const(glm::i32, 2) + static_swizzle4_const(glm::i32, 3) + static_swizzle4_const(glm::i32, 4) + static_swizzle4_const(glm::i64, 2) + static_swizzle4_const(glm::i64, 3) + static_swizzle4_const(glm::i64, 4) - static_swizzle4_const(glm::u8vec2, 2) - static_swizzle4_const(glm::u8vec3, 3) - static_swizzle4_const(glm::u8vec4, 4) - static_swizzle4_const(glm::u16vec2, 2) - static_swizzle4_const(glm::u16vec3, 3) - static_swizzle4_const(glm::u16vec4, 4) - static_swizzle4_const(glm::u32vec2, 2) - static_swizzle4_const(glm::u32vec3, 3) - static_swizzle4_const(glm::u32vec4, 4) - static_swizzle4_const(glm::u64vec2, 2) - static_swizzle4_const(glm::u64vec3, 3) - static_swizzle4_const(glm::u64vec4, 4) + static_swizzle4_const(glm::u8, 2) + static_swizzle4_const(glm::u8, 3) + static_swizzle4_const(glm::u8, 4) + static_swizzle4_const(glm::u16, 2) + static_swizzle4_const(glm::u16, 3) + static_swizzle4_const(glm::u16, 4) + static_swizzle4_const(glm::u32, 2) + static_swizzle4_const(glm::u32, 3) + static_swizzle4_const(glm::u32, 4) + static_swizzle4_const(glm::u64, 2) + static_swizzle4_const(glm::u64, 3) + static_swizzle4_const(glm::u64, 4) # define static_swizzle2_ref(TYPE, SIZE) \ template \ @@ -268,80 +268,80 @@ namespace swizzle ///< GLM_GTC_swizzle extension GLM_FUNC_QUALIFIER glm::detail::tref4 swizzle(detail::tvec##SIZE & v) \ {return glm::detail::tref4(v[x], v[y], v[z], v[w]);} - static_swizzle2_ref(glm::f16vec2, 2) - static_swizzle2_ref(glm::f16vec3, 3) - static_swizzle2_ref(glm::f16vec4, 4) - static_swizzle2_ref(glm::f32vec2, 2) - static_swizzle2_ref(glm::f32vec3, 3) - static_swizzle2_ref(glm::f32vec4, 4) - static_swizzle2_ref(glm::f64vec2, 2) - static_swizzle2_ref(glm::f64vec3, 3) - static_swizzle2_ref(glm::f64vec4, 4) + static_swizzle2_ref(glm::f16, 2) + static_swizzle2_ref(glm::f16, 3) + static_swizzle2_ref(glm::f16, 4) + static_swizzle2_ref(glm::f32, 2) + static_swizzle2_ref(glm::f32, 3) + static_swizzle2_ref(glm::f32, 4) + static_swizzle2_ref(glm::f64, 2) + static_swizzle2_ref(glm::f64, 3) + static_swizzle2_ref(glm::f64, 4) - static_swizzle2_ref(glm::i8vec2, 2) - static_swizzle2_ref(glm::i8vec3, 3) - static_swizzle2_ref(glm::i8vec4, 4) - static_swizzle2_ref(glm::i16vec2, 2) - static_swizzle2_ref(glm::i16vec3, 3) - static_swizzle2_ref(glm::i16vec4, 4) - static_swizzle2_ref(glm::i32vec2, 2) - static_swizzle2_ref(glm::i32vec3, 3) - static_swizzle2_ref(glm::i32vec4, 4) - static_swizzle2_ref(glm::i64vec2, 2) - static_swizzle2_ref(glm::i64vec3, 3) - static_swizzle2_ref(glm::i64vec4, 4) + static_swizzle2_ref(glm::i8, 2) + static_swizzle2_ref(glm::i8, 3) + static_swizzle2_ref(glm::i8, 4) + static_swizzle2_ref(glm::i16, 2) + static_swizzle2_ref(glm::i16, 3) + static_swizzle2_ref(glm::i16, 4) + static_swizzle2_ref(glm::i32, 2) + static_swizzle2_ref(glm::i32, 3) + static_swizzle2_ref(glm::i32, 4) + static_swizzle2_ref(glm::i64, 2) + static_swizzle2_ref(glm::i64, 3) + static_swizzle2_ref(glm::i64, 4) - static_swizzle2_ref(glm::u8vec2, 2) - static_swizzle2_ref(glm::u8vec3, 3) - static_swizzle2_ref(glm::u8vec4, 4) - static_swizzle2_ref(glm::u16vec2, 2) - static_swizzle2_ref(glm::u16vec3, 3) - static_swizzle2_ref(glm::u16vec4, 4) - static_swizzle2_ref(glm::u32vec2, 2) - static_swizzle2_ref(glm::u32vec3, 3) - static_swizzle2_ref(glm::u32vec4, 4) - static_swizzle2_ref(glm::u64vec2, 2) - static_swizzle2_ref(glm::u64vec3, 3) - static_swizzle2_ref(glm::u64vec4, 4) + static_swizzle2_ref(glm::u8, 2) + static_swizzle2_ref(glm::u8, 3) + static_swizzle2_ref(glm::u8, 4) + static_swizzle2_ref(glm::u16, 2) + static_swizzle2_ref(glm::u16, 3) + static_swizzle2_ref(glm::u16, 4) + static_swizzle2_ref(glm::u32, 2) + static_swizzle2_ref(glm::u32, 3) + static_swizzle2_ref(glm::u32, 4) + static_swizzle2_ref(glm::u64, 2) + static_swizzle2_ref(glm::u64, 3) + static_swizzle2_ref(glm::u64, 4) - static_swizzle3_ref(glm::f16vec3, 3) - static_swizzle3_ref(glm::f16vec4, 4) - static_swizzle3_ref(glm::f32vec3, 3) - static_swizzle3_ref(glm::f32vec4, 4) - static_swizzle3_ref(glm::f64vec3, 3) - static_swizzle3_ref(glm::f64vec4, 4) + static_swizzle3_ref(glm::f16, 3) + static_swizzle3_ref(glm::f16, 4) + static_swizzle3_ref(glm::f32, 3) + static_swizzle3_ref(glm::f32, 4) + static_swizzle3_ref(glm::f64, 3) + static_swizzle3_ref(glm::f64, 4) - static_swizzle3_ref(glm::i8vec3, 3) - static_swizzle3_ref(glm::i8vec4, 4) - static_swizzle3_ref(glm::i16vec3, 3) - static_swizzle3_ref(glm::i16vec4, 4) - static_swizzle3_ref(glm::i32vec3, 3) - static_swizzle3_ref(glm::i32vec4, 4) - static_swizzle3_ref(glm::i64vec3, 3) - static_swizzle3_ref(glm::i64vec4, 4) + static_swizzle3_ref(glm::i8, 3) + static_swizzle3_ref(glm::i8, 4) + static_swizzle3_ref(glm::i16, 3) + static_swizzle3_ref(glm::i16, 4) + static_swizzle3_ref(glm::i32, 3) + static_swizzle3_ref(glm::i32, 4) + static_swizzle3_ref(glm::i64, 3) + static_swizzle3_ref(glm::i64, 4) - static_swizzle3_ref(glm::u8vec3, 3) - static_swizzle3_ref(glm::u8vec4, 4) - static_swizzle3_ref(glm::u16vec3, 3) - static_swizzle3_ref(glm::u16vec4, 4) - static_swizzle3_ref(glm::u32vec3, 3) - static_swizzle3_ref(glm::u32vec4, 4) - static_swizzle3_ref(glm::u64vec3, 3) - static_swizzle3_ref(glm::u64vec4, 4) + static_swizzle3_ref(glm::u8, 3) + static_swizzle3_ref(glm::u8, 4) + static_swizzle3_ref(glm::u16, 3) + static_swizzle3_ref(glm::u16, 4) + static_swizzle3_ref(glm::u32, 3) + static_swizzle3_ref(glm::u32, 4) + static_swizzle3_ref(glm::u64, 3) + static_swizzle3_ref(glm::u64, 4) - static_swizzle4_ref(glm::f16vec4, 4) - static_swizzle4_ref(glm::f32vec4, 4) - static_swizzle4_ref(glm::f64vec4, 4) + static_swizzle4_ref(glm::f16, 4) + static_swizzle4_ref(glm::f32, 4) + static_swizzle4_ref(glm::f64, 4) - static_swizzle4_ref(glm::i8vec4, 4) - static_swizzle4_ref(glm::i16vec4, 4) - static_swizzle4_ref(glm::i32vec4, 4) - static_swizzle4_ref(glm::i64vec4, 4) + static_swizzle4_ref(glm::i8, 4) + static_swizzle4_ref(glm::i16, 4) + static_swizzle4_ref(glm::i32, 4) + static_swizzle4_ref(glm::i64, 4) - static_swizzle4_ref(glm::u8vec4, 4) - static_swizzle4_ref(glm::u16vec4, 4) - static_swizzle4_ref(glm::u32vec4, 4) - static_swizzle4_ref(glm::u64vec4, 4) + static_swizzle4_ref(glm::u8, 4) + static_swizzle4_ref(glm::u16, 4) + static_swizzle4_ref(glm::u32, 4) + static_swizzle4_ref(glm::u64, 4) }//namespace swizzle }//namespace gtc From a87ce5d1646815fbe503a4545eb24dac6151987b Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Tue, 24 May 2011 12:19:51 +0100 Subject: [PATCH 3/8] Updated documentation for GLM 0.9.2.1 release --- doc/about.html | 7 ++++--- doc/code.html | 4 ++-- doc/download.html | 12 +++++++----- doc/glm-0.9.2.pdf | Bin 396140 -> 360382 bytes doc/goodies.html | 4 ++-- doc/index.html | 14 ++++++++++---- doc/src/data.xml | 22 +++++++++++++++++++--- readme.txt | 27 +++++++++++++++++++++++++-- 8 files changed, 69 insertions(+), 21 deletions(-) diff --git a/doc/about.html b/doc/about.html index cdbfb48f..f0899b4c 100644 --- a/doc/about.html +++ b/doc/about.html @@ -11,8 +11,8 @@ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); -

GLM Logo


Front page
Downloads
OpenGL SDK page

GLM Manual
GLM API
Code samples
GLSL Specification
OpenGL.org Toolkits forum

Report a bug
SourceForge page
G-Truc Creation page
Browse Git repository
Source snapshot


G-Truc

OpenGL Mathematics
GLSL + Optional features = OpenGL Mathematics (GLM).
A C++ mathematics library for 3D graphics.


+

GLM Logo


Front page
Downloads
OpenGL SDK page

GLM Manual
GLM API
Code samples
GLSL Specification
OpenGL.org Toolkits forum

Report a bug
SourceForge page
G-Truc Creation page
Browse Git repository
Source snapshot


G-Truc

OpenGL Mathematics
GLSL + Optional features = OpenGL Mathematics (GLM).
A C++ mathematics library for graphics programming.


OpenGL Mathematics (GLM) is a header only C++ mathematics library for graphics software based on the OpenGL Shading Language (GLSL) specification.

@@ -32,4 +32,5 @@

Thanks for contributing to the project by submitting tickets for bug reports and feature requests. (SF.net account required). Any feedback is welcome at glm@g-truc.net. -

GLM is written as a platform independent library with no dependence and officially supports the following compilers:
  • GCC 3.4 and higher
  • LLVM 2.3 through GCC 4.2 front-end and higher
  • Visual C++ 2005 and higher
  • Any C++ compiler following C++98 norm
_________________

_________________

Copyright © 2005 - 2011G-Truc Creation
\ No newline at end of file +

GLM is written as a platform independent library with no dependence and officially supports the following compilers:
  • Clang 2.0 and higher
  • CUDA 3.0 and higher +
  • GCC 3.4 and higher
  • LLVM 2.3 through GCC 4.2 front-end and higher
  • Visual C++ 2005 and higher
  • Any C++ compiler following C++98 norm
_________________

_________________

Copyright © 2005 - 2011G-Truc Creation
\ No newline at end of file diff --git a/doc/code.html b/doc/code.html index a07bc9f2..de70f715 100644 --- a/doc/code.html +++ b/doc/code.html @@ -11,8 +11,8 @@ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); -

GLM Logo


Front page
Downloads
OpenGL SDK page

GLM Manual
GLM API
Code samples
GLSL Specification
OpenGL.org Toolkits forum

Report a bug
SourceForge page
G-Truc Creation page
Browse Git repository
Source snapshot


G-Truc

OpenGL Mathematics
GLSL + Optional features = OpenGL Mathematics (GLM).
A C++ mathematics library for 3D graphics.


Compute a triangle normal: