mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-26 18:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resoved ticket #50, removed some warnings

Browse Source
This commit is contained in:
Christophe Riccio 2011-02-21 14:16:06 +00:00
parent 680485f8f7
commit e09a1f497e
3 changed files with 168 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -5,9 +5,10 @@ project(glm)
enable_testing() enable_testing()
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-pedantic)
#add_definitions(-S) #add_definitions(-S)
#add_definitions(-s) #add_definitions(-s)
#add_definitions(-msse2) add_definitions(-msse2)
#add_definitions(-m32) #add_definitions(-m32)
#add_definitions(-mfpmath=387) #add_definitions(-mfpmath=387)
#add_definitions(-ffast-math) #add_definitions(-ffast-math)

2
glm/core/_detail.hpp
View File

@ -259,7 +259,7 @@ namespace detail
_YES = 1, \ _YES = 1, \
_NO = 0 \ _NO = 0 \
}; \ }; \
}; }
////////////////// //////////////////
// matrix // matrix

330
glm/gtc/swizzle.hpp
View File

@ -148,113 +148,113 @@ namespace glm
inline detail::tvec4<TYPE> swizzle(detail::tvec##SIZE<TYPE> const & v) \ inline detail::tvec4<TYPE> swizzle(detail::tvec##SIZE<TYPE> const & v) \
{return detail::tvec4<TYPE>(v[x], v[y], v[z], v[w]);} {return detail::tvec4<TYPE>(v[x], v[y], v[z], v[w]);}
*/ */
static_swizzle2_const(glm::f16vec2); static_swizzle2_const(glm::f16vec2)
static_swizzle2_const(glm::f16vec3); static_swizzle2_const(glm::f16vec3)
static_swizzle2_const(glm::f16vec4); static_swizzle2_const(glm::f16vec4)
static_swizzle2_const(glm::f32vec2); static_swizzle2_const(glm::f32vec2)
static_swizzle2_const(glm::f32vec3); static_swizzle2_const(glm::f32vec3)
static_swizzle2_const(glm::f32vec4); static_swizzle2_const(glm::f32vec4)
static_swizzle2_const(glm::f64vec2); static_swizzle2_const(glm::f64vec2)
static_swizzle2_const(glm::f64vec3); static_swizzle2_const(glm::f64vec3)
static_swizzle2_const(glm::f64vec4); static_swizzle2_const(glm::f64vec4)
static_swizzle2_const(glm::i8vec2); static_swizzle2_const(glm::i8vec2)
static_swizzle2_const(glm::i8vec3); static_swizzle2_const(glm::i8vec3)
static_swizzle2_const(glm::i8vec4); static_swizzle2_const(glm::i8vec4)
static_swizzle2_const(glm::i16vec2); static_swizzle2_const(glm::i16vec2)
static_swizzle2_const(glm::i16vec3); static_swizzle2_const(glm::i16vec3)
static_swizzle2_const(glm::i16vec4); static_swizzle2_const(glm::i16vec4)
static_swizzle2_const(glm::i32vec2); static_swizzle2_const(glm::i32vec2)
static_swizzle2_const(glm::i32vec3); static_swizzle2_const(glm::i32vec3)
static_swizzle2_const(glm::i32vec4); static_swizzle2_const(glm::i32vec4)
static_swizzle2_const(glm::i64vec2); static_swizzle2_const(glm::i64vec2)
static_swizzle2_const(glm::i64vec3); static_swizzle2_const(glm::i64vec3)
static_swizzle2_const(glm::i64vec4); static_swizzle2_const(glm::i64vec4)
static_swizzle2_const(glm::u8vec2); static_swizzle2_const(glm::u8vec2)
static_swizzle2_const(glm::u8vec3); static_swizzle2_const(glm::u8vec3)
static_swizzle2_const(glm::u8vec4); static_swizzle2_const(glm::u8vec4)
static_swizzle2_const(glm::u16vec2); static_swizzle2_const(glm::u16vec2)
static_swizzle2_const(glm::u16vec3); static_swizzle2_const(glm::u16vec3)
static_swizzle2_const(glm::u16vec4); static_swizzle2_const(glm::u16vec4)
static_swizzle2_const(glm::u32vec2); static_swizzle2_const(glm::u32vec2)
static_swizzle2_const(glm::u32vec3); static_swizzle2_const(glm::u32vec3)
static_swizzle2_const(glm::u32vec4); static_swizzle2_const(glm::u32vec4)
static_swizzle2_const(glm::u64vec2); static_swizzle2_const(glm::u64vec2)
static_swizzle2_const(glm::u64vec3); static_swizzle2_const(glm::u64vec3)
static_swizzle2_const(glm::u64vec4); static_swizzle2_const(glm::u64vec4)
static_swizzle3_const(glm::f16vec2); static_swizzle3_const(glm::f16vec2)
static_swizzle3_const(glm::f16vec3); static_swizzle3_const(glm::f16vec3)
static_swizzle3_const(glm::f16vec4); static_swizzle3_const(glm::f16vec4)
static_swizzle3_const(glm::f32vec2); static_swizzle3_const(glm::f32vec2)
static_swizzle3_const(glm::f32vec3); static_swizzle3_const(glm::f32vec3)
static_swizzle3_const(glm::f32vec4); static_swizzle3_const(glm::f32vec4)
static_swizzle3_const(glm::f64vec2); static_swizzle3_const(glm::f64vec2)
static_swizzle3_const(glm::f64vec3); static_swizzle3_const(glm::f64vec3)
static_swizzle3_const(glm::f64vec4); static_swizzle3_const(glm::f64vec4)
static_swizzle3_const(glm::i8vec2); static_swizzle3_const(glm::i8vec2)
static_swizzle3_const(glm::i8vec3); static_swizzle3_const(glm::i8vec3)
static_swizzle3_const(glm::i8vec4); static_swizzle3_const(glm::i8vec4)
static_swizzle3_const(glm::i16vec2); static_swizzle3_const(glm::i16vec2)
static_swizzle3_const(glm::i16vec3); static_swizzle3_const(glm::i16vec3)
static_swizzle3_const(glm::i16vec4); static_swizzle3_const(glm::i16vec4)
static_swizzle3_const(glm::i32vec2); static_swizzle3_const(glm::i32vec2)
static_swizzle3_const(glm::i32vec3); static_swizzle3_const(glm::i32vec3)
static_swizzle3_const(glm::i32vec4); static_swizzle3_const(glm::i32vec4)
static_swizzle3_const(glm::i64vec2); static_swizzle3_const(glm::i64vec2)
static_swizzle3_const(glm::i64vec3); static_swizzle3_const(glm::i64vec3)
static_swizzle3_const(glm::i64vec4); static_swizzle3_const(glm::i64vec4)
static_swizzle3_const(glm::u8vec2); static_swizzle3_const(glm::u8vec2)
static_swizzle3_const(glm::u8vec3); static_swizzle3_const(glm::u8vec3)
static_swizzle3_const(glm::u8vec4); static_swizzle3_const(glm::u8vec4)
static_swizzle3_const(glm::u16vec2); static_swizzle3_const(glm::u16vec2)
static_swizzle3_const(glm::u16vec3); static_swizzle3_const(glm::u16vec3)
static_swizzle3_const(glm::u16vec4); static_swizzle3_const(glm::u16vec4)
static_swizzle3_const(glm::u32vec2); static_swizzle3_const(glm::u32vec2)
static_swizzle3_const(glm::u32vec3); static_swizzle3_const(glm::u32vec3)
static_swizzle3_const(glm::u32vec4); static_swizzle3_const(glm::u32vec4)
static_swizzle3_const(glm::u64vec2); static_swizzle3_const(glm::u64vec2)
static_swizzle3_const(glm::u64vec3); static_swizzle3_const(glm::u64vec3)
static_swizzle3_const(glm::u64vec4); static_swizzle3_const(glm::u64vec4)
static_swizzle4_const(glm::f16vec2); static_swizzle4_const(glm::f16vec2)
static_swizzle4_const(glm::f16vec3); static_swizzle4_const(glm::f16vec3)
static_swizzle4_const(glm::f16vec4); static_swizzle4_const(glm::f16vec4)
static_swizzle4_const(glm::f32vec2); static_swizzle4_const(glm::f32vec2)
static_swizzle4_const(glm::f32vec3); static_swizzle4_const(glm::f32vec3)
static_swizzle4_const(glm::f32vec4); static_swizzle4_const(glm::f32vec4)
static_swizzle4_const(glm::f64vec2); static_swizzle4_const(glm::f64vec2)
static_swizzle4_const(glm::f64vec3); static_swizzle4_const(glm::f64vec3)
static_swizzle4_const(glm::f64vec4); static_swizzle4_const(glm::f64vec4)
static_swizzle4_const(glm::i8vec2); static_swizzle4_const(glm::i8vec2)
static_swizzle4_const(glm::i8vec3); static_swizzle4_const(glm::i8vec3)
static_swizzle4_const(glm::i8vec4); static_swizzle4_const(glm::i8vec4)
static_swizzle4_const(glm::i16vec2); static_swizzle4_const(glm::i16vec2)
static_swizzle4_const(glm::i16vec3); static_swizzle4_const(glm::i16vec3)
static_swizzle4_const(glm::i16vec4); static_swizzle4_const(glm::i16vec4)
static_swizzle4_const(glm::i32vec2); static_swizzle4_const(glm::i32vec2)
static_swizzle4_const(glm::i32vec3); static_swizzle4_const(glm::i32vec3)
static_swizzle4_const(glm::i32vec4); static_swizzle4_const(glm::i32vec4)
static_swizzle4_const(glm::i64vec2); static_swizzle4_const(glm::i64vec2)
static_swizzle4_const(glm::i64vec3); static_swizzle4_const(glm::i64vec3)
static_swizzle4_const(glm::i64vec4); static_swizzle4_const(glm::i64vec4)
static_swizzle4_const(glm::u8vec2); static_swizzle4_const(glm::u8vec2)
static_swizzle4_const(glm::u8vec3); static_swizzle4_const(glm::u8vec3)
static_swizzle4_const(glm::u8vec4); static_swizzle4_const(glm::u8vec4)
static_swizzle4_const(glm::u16vec2); static_swizzle4_const(glm::u16vec2)
static_swizzle4_const(glm::u16vec3); static_swizzle4_const(glm::u16vec3)
static_swizzle4_const(glm::u16vec4); static_swizzle4_const(glm::u16vec4)
static_swizzle4_const(glm::u32vec2); static_swizzle4_const(glm::u32vec2)
static_swizzle4_const(glm::u32vec3); static_swizzle4_const(glm::u32vec3)
static_swizzle4_const(glm::u32vec4); static_swizzle4_const(glm::u32vec4)
static_swizzle4_const(glm::u64vec2); static_swizzle4_const(glm::u64vec2)
static_swizzle4_const(glm::u64vec3); static_swizzle4_const(glm::u64vec3)
static_swizzle4_const(glm::u64vec4); static_swizzle4_const(glm::u64vec4)
# define static_swizzle2_ref(TYPE) \ # define static_swizzle2_ref(TYPE) \
template <glm::comp x, glm::comp y> \ template <glm::comp x, glm::comp y> \
@ -271,80 +271,80 @@ namespace glm
inline glm::detail::tref4<typename TYPE::value_type> swizzle(TYPE & v) \ inline glm::detail::tref4<typename TYPE::value_type> swizzle(TYPE & v) \
{return glm::detail::tref4<typename TYPE::value_type>(v[x], v[y], v[z], v[w]);} {return glm::detail::tref4<typename TYPE::value_type>(v[x], v[y], v[z], v[w]);}
static_swizzle2_ref(glm::f16vec2); static_swizzle2_ref(glm::f16vec2)
static_swizzle2_ref(glm::f16vec3); static_swizzle2_ref(glm::f16vec3)
static_swizzle2_ref(glm::f16vec4); static_swizzle2_ref(glm::f16vec4)
static_swizzle2_ref(glm::f32vec2); static_swizzle2_ref(glm::f32vec2)
static_swizzle2_ref(glm::f32vec3); static_swizzle2_ref(glm::f32vec3)
static_swizzle2_ref(glm::f32vec4); static_swizzle2_ref(glm::f32vec4)
static_swizzle2_ref(glm::f64vec2); static_swizzle2_ref(glm::f64vec2)
static_swizzle2_ref(glm::f64vec3); static_swizzle2_ref(glm::f64vec3)
static_swizzle2_ref(glm::f64vec4); static_swizzle2_ref(glm::f64vec4)
static_swizzle2_ref(glm::i8vec2); static_swizzle2_ref(glm::i8vec2)
static_swizzle2_ref(glm::i8vec3); static_swizzle2_ref(glm::i8vec3)
static_swizzle2_ref(glm::i8vec4); static_swizzle2_ref(glm::i8vec4)
static_swizzle2_ref(glm::i16vec2); static_swizzle2_ref(glm::i16vec2)
static_swizzle2_ref(glm::i16vec3); static_swizzle2_ref(glm::i16vec3)
static_swizzle2_ref(glm::i16vec4); static_swizzle2_ref(glm::i16vec4)
static_swizzle2_ref(glm::i32vec2); static_swizzle2_ref(glm::i32vec2)
static_swizzle2_ref(glm::i32vec3); static_swizzle2_ref(glm::i32vec3)
static_swizzle2_ref(glm::i32vec4); static_swizzle2_ref(glm::i32vec4)
static_swizzle2_ref(glm::i64vec2); static_swizzle2_ref(glm::i64vec2)
static_swizzle2_ref(glm::i64vec3); static_swizzle2_ref(glm::i64vec3)
static_swizzle2_ref(glm::i64vec4); static_swizzle2_ref(glm::i64vec4)
static_swizzle2_ref(glm::u8vec2); static_swizzle2_ref(glm::u8vec2)
static_swizzle2_ref(glm::u8vec3); static_swizzle2_ref(glm::u8vec3)
static_swizzle2_ref(glm::u8vec4); static_swizzle2_ref(glm::u8vec4)
static_swizzle2_ref(glm::u16vec2); static_swizzle2_ref(glm::u16vec2)
static_swizzle2_ref(glm::u16vec3); static_swizzle2_ref(glm::u16vec3)
static_swizzle2_ref(glm::u16vec4); static_swizzle2_ref(glm::u16vec4)
static_swizzle2_ref(glm::u32vec2); static_swizzle2_ref(glm::u32vec2)
static_swizzle2_ref(glm::u32vec3); static_swizzle2_ref(glm::u32vec3)
static_swizzle2_ref(glm::u32vec4); static_swizzle2_ref(glm::u32vec4)
static_swizzle2_ref(glm::u64vec2); static_swizzle2_ref(glm::u64vec2)
static_swizzle2_ref(glm::u64vec3); static_swizzle2_ref(glm::u64vec3)
static_swizzle2_ref(glm::u64vec4); static_swizzle2_ref(glm::u64vec4)
static_swizzle3_ref(glm::f16vec3); static_swizzle3_ref(glm::f16vec3)
static_swizzle3_ref(glm::f16vec4); static_swizzle3_ref(glm::f16vec4)
static_swizzle3_ref(glm::f32vec3); static_swizzle3_ref(glm::f32vec3)
static_swizzle3_ref(glm::f32vec4); static_swizzle3_ref(glm::f32vec4)
static_swizzle3_ref(glm::f64vec3); static_swizzle3_ref(glm::f64vec3)
static_swizzle3_ref(glm::f64vec4); static_swizzle3_ref(glm::f64vec4)
static_swizzle3_ref(glm::i8vec3); static_swizzle3_ref(glm::i8vec3)
static_swizzle3_ref(glm::i8vec4); static_swizzle3_ref(glm::i8vec4)
static_swizzle3_ref(glm::i16vec3); static_swizzle3_ref(glm::i16vec3)
static_swizzle3_ref(glm::i16vec4); static_swizzle3_ref(glm::i16vec4)
static_swizzle3_ref(glm::i32vec3); static_swizzle3_ref(glm::i32vec3)
static_swizzle3_ref(glm::i32vec4); static_swizzle3_ref(glm::i32vec4)
static_swizzle3_ref(glm::i64vec3); static_swizzle3_ref(glm::i64vec3)
static_swizzle3_ref(glm::i64vec4); static_swizzle3_ref(glm::i64vec4)
static_swizzle3_ref(glm::u8vec3); static_swizzle3_ref(glm::u8vec3)
static_swizzle3_ref(glm::u8vec4); static_swizzle3_ref(glm::u8vec4)
static_swizzle3_ref(glm::u16vec3); static_swizzle3_ref(glm::u16vec3)
static_swizzle3_ref(glm::u16vec4); static_swizzle3_ref(glm::u16vec4)
static_swizzle3_ref(glm::u32vec3); static_swizzle3_ref(glm::u32vec3)
static_swizzle3_ref(glm::u32vec4); static_swizzle3_ref(glm::u32vec4)
static_swizzle3_ref(glm::u64vec3); static_swizzle3_ref(glm::u64vec3)
static_swizzle3_ref(glm::u64vec4); static_swizzle3_ref(glm::u64vec4)
static_swizzle4_ref(glm::f16vec4); static_swizzle4_ref(glm::f16vec4)
static_swizzle4_ref(glm::f32vec4); static_swizzle4_ref(glm::f32vec4)
static_swizzle4_ref(glm::f64vec4); static_swizzle4_ref(glm::f64vec4)
static_swizzle4_ref(glm::i8vec4); static_swizzle4_ref(glm::i8vec4)
static_swizzle4_ref(glm::i16vec4); static_swizzle4_ref(glm::i16vec4)
static_swizzle4_ref(glm::i32vec4); static_swizzle4_ref(glm::i32vec4)
static_swizzle4_ref(glm::i64vec4); static_swizzle4_ref(glm::i64vec4)
static_swizzle4_ref(glm::u8vec4); static_swizzle4_ref(glm::u8vec4)
static_swizzle4_ref(glm::u16vec4); static_swizzle4_ref(glm::u16vec4)
static_swizzle4_ref(glm::u32vec4); static_swizzle4_ref(glm::u32vec4)
static_swizzle4_ref(glm::u64vec4); static_swizzle4_ref(glm::u64vec4)
}//namespace swizzle }//namespace swizzle
}//namespace gtc }//namespace gtc