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

Merge pull request #1716 from Duion/patch-2

Browse source 
changes "Rotation" instead of "rotation" #1702
This commit is contained in:
Areloch 2016-08-01 22:44:08 -05:00 • committed by GitHub
commit 3771d1cb22
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -300,7 +300,7 @@ TEST(Maths, RotationF_Calculations)
}; };
#endif #endif
DefineConsoleStaticMethod(Rotation, Add, RotationF, (RotationF a, RotationF b), , DefineConsoleStaticMethod(rotation, Add, RotationF, (RotationF a, RotationF b), ,
"Adds two rotations together.\n" "Adds two rotations together.\n"
"@param a Rotation one." "@param a Rotation one."
"@param b Rotation two." "@param b Rotation two."
@ -309,8 +309,8 @@ DefineConsoleStaticMethod(Rotation, Add, RotationF, (RotationF a, RotationF b),
{ {
return a + b; return a + b;
} }
DefineConsoleStaticMethod(Rotation, Subtract, RotationF, (RotationF a, RotationF b), , DefineConsoleStaticMethod(rotation, Subtract, RotationF, (RotationF a, RotationF b), ,
"Subtracts two rotations.\n" "Subtracts two rotations.\n"
"@param a Rotation one." "@param a Rotation one."
"@param b Rotation two." "@param b Rotation two."
@ -319,8 +319,8 @@ DefineConsoleStaticMethod(Rotation, Subtract, RotationF, (RotationF a, RotationF
{ {
return a - b; return a - b;
} }
DefineConsoleStaticMethod(Rotation, Interpolate, RotationF, (RotationF a, RotationF b, F32 factor), , DefineConsoleStaticMethod(rotation, Interpolate, RotationF, (RotationF a, RotationF b, F32 factor), ,
"Interpolates between two rotations.\n" "Interpolates between two rotations.\n"
"@param a Rotation one." "@param a Rotation one."
"@param b Rotation two." "@param b Rotation two."
@ -332,8 +332,8 @@ DefineConsoleStaticMethod(Rotation, Interpolate, RotationF, (RotationF a, Rotati
result.interpolate(a, b, factor); result.interpolate(a, b, factor);
return result; return result;
} }
DefineConsoleStaticMethod(Rotation, LookAt, RotationF, (Point3F origin, Point3F target, Point3F up), DefineConsoleStaticMethod(rotation, LookAt, RotationF, (Point3F origin, Point3F target, Point3F up),
(Point3F(0, 0, 0), Point3F(0, 0, 0), Point3F(0, 0, 1)), (Point3F(0, 0, 0), Point3F(0, 0, 0), Point3F(0, 0, 1)),
"Provides a rotation orientation to look at a target from a given position.\n" "Provides a rotation orientation to look at a target from a given position.\n"
"@param origin Position of the object doing the looking." "@param origin Position of the object doing the looking."
@ -345,4 +345,4 @@ DefineConsoleStaticMethod(Rotation, LookAt, RotationF, (Point3F origin, Point3F
RotationF result; RotationF result;
result.lookAt(origin, target, up); result.lookAt(origin, target, up);
return result; return result;
} }