TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #599 from Areloch/FormattedAddRotation

Browse source 
Add handling to RotationF's addRotation function to ensure formatted return
This commit is contained in:
Brian Roberts 2021-10-03 17:06:48 -05:00 committed by GitHub
parent 6ff9383672 c5d5a91356
commit 91b192f163
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show stats 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), ,

12
Engine/source/math/mathTypes.cpp
View file

@ -620,8 +620,16 @@ ConsoleGetType(TypeRotationF)
static const U32 bufSize = 256;
char* returnBuffer = Con::getReturnBuffer(bufSize);
EulerF out = pt->asEulerF(RotationF::Degrees);
dSprintf(returnBuffer, bufSize, "%g %g %g", out.x, out.y, out.z);
if (pt->mRotationType == RotationF::Euler)
{
EulerF out = pt->asEulerF(RotationF::Degrees);
dSprintf(returnBuffer, bufSize, "%g %g %g", out.x, out.y, out.z);
}
else if (pt->mRotationType == RotationF::AxisAngle)
{
AngAxisF out = pt->asAxisAngle(RotationF::Degrees);
dSprintf(returnBuffer, bufSize, "%g %g %g %g", out.axis.x, out.axis.y, out.axis.z, out.angle);
}
return returnBuffer;
}