From e09a1f497e5dc762a51dbd2aee1765a0c575fb3d Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 21 Feb 2011 14:16:06 +0000 Subject: [PATCH] Resoved ticket #50, removed some warnings --- CMakeLists.txt | 3 +- glm/core/_detail.hpp | 2 +- glm/gtc/swizzle.hpp | 362 +++++++++++++++++++++---------------------- 3 files changed, 184 insertions(+), 183 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f481ce80..a502bd38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,9 +5,10 @@ project(glm) enable_testing() add_definitions(-D_CRT_SECURE_NO_WARNINGS) +add_definitions(-pedantic) #add_definitions(-S) #add_definitions(-s) -#add_definitions(-msse2) +add_definitions(-msse2) #add_definitions(-m32) #add_definitions(-mfpmath=387) #add_definitions(-ffast-math) diff --git a/glm/core/_detail.hpp b/glm/core/_detail.hpp index 16124b41..d11d7052 100644 --- a/glm/core/_detail.hpp +++ b/glm/core/_detail.hpp @@ -259,7 +259,7 @@ namespace detail _YES = 1, \ _NO = 0 \ }; \ - }; + } ////////////////// // matrix diff --git a/glm/gtc/swizzle.hpp b/glm/gtc/swizzle.hpp index 5134a460..7ebd630c 100644 --- a/glm/gtc/swizzle.hpp +++ b/glm/gtc/swizzle.hpp @@ -148,113 +148,113 @@ namespace glm inline detail::tvec4 swizzle(detail::tvec##SIZE const & v) \ {return detail::tvec4(v[x], v[y], v[z], v[w]);} */ - static_swizzle2_const(glm::f16vec2); - static_swizzle2_const(glm::f16vec3); - static_swizzle2_const(glm::f16vec4); - static_swizzle2_const(glm::f32vec2); - static_swizzle2_const(glm::f32vec3); - static_swizzle2_const(glm::f32vec4); - static_swizzle2_const(glm::f64vec2); - static_swizzle2_const(glm::f64vec3); - static_swizzle2_const(glm::f64vec4); - - 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_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_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::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_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_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::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_swizzle2_const(glm::f16vec2) + static_swizzle2_const(glm::f16vec3) + static_swizzle2_const(glm::f16vec4) + static_swizzle2_const(glm::f32vec2) + static_swizzle2_const(glm::f32vec3) + static_swizzle2_const(glm::f32vec4) + static_swizzle2_const(glm::f64vec2) + static_swizzle2_const(glm::f64vec3) + static_swizzle2_const(glm::f64vec4) + + 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_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_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::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_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_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::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) # define static_swizzle2_ref(TYPE) \ template \ @@ -271,80 +271,80 @@ namespace glm inline glm::detail::tref4 swizzle(TYPE & 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::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::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_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::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::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_swizzle4_ref(glm::f16vec4); - static_swizzle4_ref(glm::f32vec4); - static_swizzle4_ref(glm::f64vec4); - - static_swizzle4_ref(glm::i8vec4); - static_swizzle4_ref(glm::i16vec4); - static_swizzle4_ref(glm::i32vec4); - static_swizzle4_ref(glm::i64vec4); - - static_swizzle4_ref(glm::u8vec4); - static_swizzle4_ref(glm::u16vec4); - static_swizzle4_ref(glm::u32vec4); - static_swizzle4_ref(glm::u64vec4); + 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::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::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_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::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::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_swizzle4_ref(glm::f16vec4) + static_swizzle4_ref(glm::f32vec4) + static_swizzle4_ref(glm::f64vec4) + + static_swizzle4_ref(glm::i8vec4) + static_swizzle4_ref(glm::i16vec4) + static_swizzle4_ref(glm::i32vec4) + static_swizzle4_ref(glm::i64vec4) + + static_swizzle4_ref(glm::u8vec4) + static_swizzle4_ref(glm::u16vec4) + static_swizzle4_ref(glm::u32vec4) + static_swizzle4_ref(glm::u64vec4) }//namespace swizzle }//namespace gtc