Home Explore Help
Sign In
cpp
/
glm
mirror of https://github.com/g-truc/glm.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Ticket #113, fixed quat product

Christophe Riccio 14 years ago
parent
df750578c4
commit
3a32e3d7c3
1 changed files with 2 additions and 1 deletions
Unified View Show Diff Stats
  1. 2 1
      glm/gtc/quaternion.inl

+ 2 - 1
glm/gtc/quaternion.inl
View File 

@@ -474,7 +474,8 @@ namespace quaternion{
 
         typename detail::tquat<T>::value_type AngleRad = radians(angle);
 
         typename detail::tquat<T>::value_type AngleRad = radians(angle);
 
         typename detail::tquat<T>::value_type fSin = sin(AngleRad * T(0.5));
 
         typename detail::tquat<T>::value_type fSin = sin(AngleRad * T(0.5));
 
 
 
-        return gtc::quaternion::cross(q, detail::tquat<T>(cos(AngleRad * T(0.5)), Tmp.x * fSin, Tmp.y * fSin, Tmp.z * fSin));
 
+		return q * detail::tquat<T>(cos(AngleRad * T(0.5)), Tmp.x * fSin, Tmp.y * fSin, Tmp.z * fSin);
 
+        //return gtc::quaternion::cross(q, detail::tquat<T>(cos(AngleRad * T(0.5)), Tmp.x * fSin, Tmp.y * fSin, Tmp.z * fSin));
 
 	}
 
 	}
 
 
 
     template <typename T> 
     template <typename T>