TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #877 from GarageGames/revert-794-euler_to_quat_revert

Browse source 
Revert "Euler to quat reversion"
This commit is contained in:
Daniel Buckmaster 2014-11-24 11:02:00 +11:00
commit 2546eec014
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Engine/source/math/mQuat.cpp
View file

@ -35,27 +35,27 @@ QuatF& QuatF::set( const EulerF & e )
F32 cx, sx; F32 cx, sx;
F32 cy, sy; F32 cy, sy;
F32 cz, sz; F32 cz, sz;
mSinCos( -e.x * 0.5f, sx, cx ); mSinCos( e.x * 0.5f, sx, cx );
mSinCos( -e.y * 0.5f, sy, cy ); mSinCos( e.y * 0.5f, sy, cy );
mSinCos( -e.z * 0.5f, sz, cz ); mSinCos( e.z * 0.5f, sz, cz );
// Qyaw(z) = [ (0, 0, sin z/2), cos z/2 ] // Qyaw(z) = [ (0, 0, sin z/2), cos z/2 ]
// Qpitch(x) = [ (sin x/2, 0, 0), cos x/2 ] // Qpitch(x) = [ (sin x/2, 0, 0), cos x/2 ]
// Qroll(y) = [ (0, sin y/2, 0), cos y/2 ] // Qroll(y) = [ (0, sin y/2, 0), cos y/2 ]
// this = Qresult = Qyaw*Qpitch*Qroll ZXY // this = Qresult = Qyaw*Qpitch*Qroll ZXY
// //
// The code that folows is a simplification of: // The code that folows is a simplification of:
// roll*=pitch; // roll*=pitch;
// roll*=yaw; // roll*=yaw;
// *this = roll; // *this = roll;
F32 cycz, sysz, sycz, cysz; F32 cycz, sysz, sycz, cysz;
cycz = cy*cz; cycz = cy*cz;
sysz = sy*sz; sysz = sy*sz;
sycz = sy*cz; sycz = sy*cz;
cysz = cy*sz; cysz = cy*sz;
w = cycz*cx + sysz*sx; w = cycz*cx - sysz*sx;
x = cycz*sx + sysz*cx; x = cycz*sx + sysz*cx;
y = sycz*cx - cysz*sx; y = sycz*cx + cysz*sx;
z = cysz*cx - sycz*sx; z = cysz*cx - sycz*sx;
return *this; return *this;