v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #446 from yeonseok-yi/master 

Fixed error of aiQuaterniont::Rotate()
pull/456/head
Kim Kulling 2015-01-29 11:37:03 +01:00
parent 7d887204ac 1bdb31f8aa
commit 80a2c9a9ab
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/assimp/quaternion.inl
View File

@ -273,11 +273,10 @@ template<typename TReal>
inline aiVector3t<TReal> aiQuaterniont<TReal>::Rotate (const aiVector3t<TReal>& v) inline aiVector3t<TReal> aiQuaterniont<TReal>::Rotate (const aiVector3t<TReal>& v)
{ {
aiQuaterniont q2(0.f,v.x,v.y,v.z), q = *this, qinv = q; aiQuaterniont q2(0.f,v.x,v.y,v.z), q = *this, qinv = q;
q.Conjugate(); qinv.Conjugate();
q = q*q2*qinv; q = q*q2*qinv;
return aiVector3t<TReal>(q.x,q.y,q.z); return aiVector3t<TReal>(q.x,q.y,q.z);
} }
#endif #endif