TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add handling to RotationF's addRotation function to ensure formatted return

Browse source
This commit is contained in:
Areloch 2021-09-28 18:17:49 -05:00
parent 8256aca65e
commit c5d5a91356
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -325,14 +325,21 @@ TEST(Maths, RotationF_Calculations)
};
#endif
DefineEngineFunction(AddRotation, RotationF, (RotationF a, RotationF b), ,
DefineEngineFunction(AddRotation, RotationF, (RotationF a, RotationF b, const char* returnType), ("Euler"),
"Adds two rotations together.\n"
"@param a Rotation one."
"@param b Rotation two."
"@returns v sum of both rotations."
"@ingroup Math")
{
return a + b;
RotationF ret;
RotationF sum = a + b;
if (String(returnType) == String("Euler"))
ret.set(sum.asEulerF());
else
ret.set(sum.asAxisAngle());
return ret;
}
DefineEngineFunction(SubtractRotation, RotationF, (RotationF a, RotationF b), ,