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

Tweaks the asMatrixF for RotationF, as well as exposes additional console methods for rotation manipulation

Browse source
This commit is contained in:
Areloch 2017-10-15 03:41:26 -05:00
parent 6479c7592a
commit 1407f3953c
1 changed files with 69 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

71
Engine/source/math/mRotation.cpp
View file

@ -252,14 +252,29 @@ MatrixF RotationF::asMatrixF() const
MatrixF returnMat; MatrixF returnMat;
if (mRotationType == Euler) if (mRotationType == Euler)
{ {
returnMat.set(EulerF(x, y, z)); MatrixF imat, xmat, ymat, zmat;
xmat.set(EulerF(x, 0, 0));
ymat.set(EulerF(0.0f, y, 0.0f));
zmat.set(EulerF(0, 0, z));
imat.mul(zmat, xmat);
returnMat.mul(imat, ymat);
} }
else else
{ {
AngAxisF aa; AngAxisF aa;
aa.set(Point3F(x, y, z), w); aa.set(Point3F(x, y, z), w);
aa.setMatrix(&returnMat); MatrixF tempMat;
aa.setMatrix(&tempMat);
EulerF eul = tempMat.toEuler();
MatrixF imat, xmat, ymat, zmat;
xmat.set(EulerF(eul.x, 0, 0));
ymat.set(EulerF(0.0f, eul.y, 0.0f));
zmat.set(EulerF(0, 0, eul.z));
imat.mul(zmat, xmat);
returnMat.mul(imat, ymat);
} }
return returnMat; return returnMat;
@ -357,6 +372,58 @@ DefineConsoleStaticMethod(rotation, LookAt, RotationF, (Point3F origin, Point3F
return result; return result;
} }
DefineConsoleStaticMethod(rotation, setRightVector, RotationF, (RotationF a, VectorF rightVec), ,
"Subtracts two rotations.\n"
"@param a Rotation one."
"@param b Rotation two."
"@returns v difference of both rotations."
"@ingroup Math")
{
a.asMatrixF().setColumn(0, rightVec);
return a;
}
DefineConsoleStaticMethod(rotation, setUpVector, RotationF, (RotationF a, VectorF upVec), ,
"Subtracts two rotations.\n"
"@param a Rotation one."
"@param b Rotation two."
"@returns v difference of both rotations."
"@ingroup Math")
{
a.asMatrixF().setColumn(2, upVec);
return a;
}
DefineConsoleStaticMethod(rotation, getForwardVector, VectorF, (RotationF a), ,
"Subtracts two rotations.\n"
"@param a Rotation one."
"@param b Rotation two."
"@returns v difference of both rotations."
"@ingroup Math")
{
return a.asMatrixF().getForwardVector();
}
DefineConsoleStaticMethod(rotation, getRightVector, VectorF, (RotationF a), ,
"Subtracts two rotations.\n"
"@param a Rotation one."
"@param b Rotation two."
"@returns v difference of both rotations."
"@ingroup Math")
{
return a.asMatrixF().getRightVector();
}
DefineConsoleStaticMethod(rotation, getUpVector, VectorF, (RotationF a), ,
"Subtracts two rotations.\n"
"@param a Rotation one."
"@param b Rotation two."
"@returns v difference of both rotations."
"@ingroup Math")
{
return a.asMatrixF().getUpVector();
}
DefineConsoleStaticMethod(rotation, getDirection, Point3F, (RotationF rot),, DefineConsoleStaticMethod(rotation, getDirection, Point3F, (RotationF rot),,
"Takes the angles of the provided rotation and returns a direction vector.\n" "Takes the angles of the provided rotation and returns a direction vector.\n"
"@param rot Our rotation." "@param rot Our rotation."