organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-14 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge branch '0.9.2' into cuda

Browse source
This commit is contained in:
Christophe Riccio 2011-04-26 14:07:36 +01:00
commit 5d2673fbba
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
glm/gtc/quaternion.inl
View file

@ -422,7 +422,7 @@ namespace quaternion{
detail::tquat<T> const & q
)
{
return gtc::quaternion::conjugate(q) / gtc::quaternion::length(q);
return gtc::quaternion::conjugate(q) / gtc::quaternion::dot(q, q);
}
template <typename T>

7
glm/gtc/type_ptr.hpp
View file

@ -15,6 +15,7 @@
// Dependency:
#include "../glm.hpp"
#include <cstring>
#if(defined(GLM_MESSAGES) && !defined(glm_ext))
# pragma message("GLM: GLM_GTC_type_ptr extension included")
@ -420,7 +421,7 @@ namespace glm
template<typename T>
inline detail::tmat2x2<T> make_mat2(T const * const ptr)
{
return make_mat2x2(Result);
return make_mat2x2(ptr);
}
//! Build a matrix from a pointer.
@ -428,7 +429,7 @@ namespace glm
template<typename T>
inline detail::tmat3x3<T> make_mat3(T const * const ptr)
{
return make_mat3x3(Result);
return make_mat3x3(ptr);
}
//! Build a matrix from a pointer.
@ -436,7 +437,7 @@ namespace glm
template<typename T>
inline detail::tmat4x4<T> make_mat4(T const * const ptr)
{
return make_mat4x4(Result);
return make_mat4x4(ptr);
}
///@}