mewin/glm
1
0
Fork 0
Code Releases Activity

Merge branch '0.9.1' into doc

Browse Source
This commit is contained in:
Christophe Riccio
2011-02-05 01:17:15 +00:00
parent e755047ad7 ab20db721e
commit 30a372fd59
11 changed files with 123 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
glm/gtc/quaternion.hpp
View File

@@ -79,6 +79,11 @@ namespace glm
detail::tquat<T> operator- (
detail::tquat<T> const & q);
template <typename T>
detail::tquat<T> operator* (
detail::tquat<T> const & q,
detail::tquat<T> const & p);
template <typename T>
detail::tvec3<T> operator* (
detail::tquat<T> const & q,
@@ -145,7 +150,7 @@ namespace glm
//! Returns the cross product of q1 and q2.
//! From GLM_GTC_quaternion extension.
template <typename T>
detail::tquat<T> cross(
GLM_DEPRECATED detail::tquat<T> cross(
detail::tquat<T> const & q1,
detail::tquat<T> const & q2);

14
glm/gtc/quaternion.inl
View File

@@ -156,6 +156,20 @@ namespace detail{
return detail::tquat<T>(-q.w, -q.x, -q.y, -q.z);
}
template <typename T>
inline detail::tquat<T> operator*
(
detail::tquat<T> const & q,
detail::tquat<T> const & p
)
{
return detail::tquat<T>(
q.w * p.w - q.x * p.x - q.y * p.y - q.z * p.z,
q.w * p.x + q.x * p.w + q.y * p.z - q.z * p.y,
q.w * p.y + q.y * p.w + q.z * p.x - q.x * p.z,
q.w * p.z + q.z * p.w + q.x * p.y - q.y * p.x);
}
// Transformation
template <typename T>
inline detail::tvec3<T> operator*

20
glm/setup.hpp
View File

@@ -22,9 +22,9 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
// Compiler
// User defines: GLM_FORCE_COMPILER_UNKNOWNED
// User defines: GLM_FORCE_COMPILER_UNKNOWN
#define GLM_COMPILER_UNKNOWNED 0x00000000
#define GLM_COMPILER_UNKNOWN 0x00000000
// Visual C++ defines
#define GLM_COMPILER_VC 0x01000000
@@ -76,8 +76,8 @@
#define GLM_COMPILER_CODEWARRIOR 0x04000000
// Force generic C++ compiler
#ifdef GLM_FORCE_COMPILER_UNKNOWNED
# define GLM_COMPILER GLM_COMPILER_UNKNOWNED
#ifdef GLM_FORCE_COMPILER_UNKNOWN
# define GLM_COMPILER GLM_COMPILER_UNKNOWN
// Visual C++
#elif defined(_MSC_VER)
# if _MSC_VER == 900
@@ -157,7 +157,7 @@
# define GLM_COMPILER GLM_COMPILER_CODEWARRIOR
#else
# define GLM_COMPILER GLM_COMPILER_UNKNOWNED
# define GLM_COMPILER GLM_COMPILER_UNKNOWN
#endif
#ifndef GLM_COMPILER
@@ -249,7 +249,7 @@
/////////////////
// Platform
// User defines: GLM_FORCE_PURE
// User defines: GLM_FORCE_PURE GLM_FORCE_SSE2 GLM_FORCE_AVX
#define GLM_ARCH_PURE 0x0000 //(0x0000)
#define GLM_ARCH_SSE2 0x0001 //(0x0001)
@@ -258,6 +258,12 @@
#if(defined(GLM_FORCE_PURE))
# define GLM_ARCH GLM_ARCH_PURE
#elif(defined(GLM_FORCE_AVX))
# define GLM_ARCH GLM_ARCH_AVX
#elif(defined(GLM_FORCE_SSE3))
# define GLM_ARCH GLM_ARCH_SSE3
#elif(defined(GLM_FORCE_SSE2))
# define GLM_ARCH GLM_ARCH_SSE2
#elif((GLM_COMPILER & GLM_COMPILER_VC) && (defined(_M_IX86) || defined(_M_X64)))
# if(defined(_M_CEE_PURE))
# define GLM_ARCH GLM_ARCH_PURE
@@ -344,7 +350,7 @@
# elif(GLM_COMPONENT == GLM_COMPONENT_MS_EXT)
# pragma message("GLM: Multiple vector component names through Visual C++ language extensions")
# else
# error "GLM_COMPONENT value unknowned"
# error "GLM_COMPONENT value unknown"
# endif//GLM_MESSAGE_COMPONENT_DISPLAYED
#endif//GLM_MESSAGE