q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-22 10:20:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use standard Sin/Cos version (fixing "The Pit" tilting floor issue, and maybe other similar issues too)

Browse Source
This commit is contained in:
ptitSeb 2017-05-27 15:41:24 +02:00
parent a41642340c
commit dce391583c
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Sources/Engine/Math/Functions.cpp
View File

@ -69,7 +69,7 @@ double adCosQuadrants[4][2] =
{1.0, -90.0}, {1.0, -90.0},
{1.0, 0.0}, {1.0, 0.0},
}; };
/*
FLOAT Sin(ANGLE a) FLOAT Sin(ANGLE a)
{ {
double aWrapped = WrapAngle(a); double aWrapped = WrapAngle(a);
@ -92,3 +92,4 @@ FLOAT Tan(ANGLE a)
{ {
return Sin(a)/Cos(a); return Sin(a)/Cos(a);
} }
*/

12
Sources/Engine/Math/Functions.h
View File

@ -495,9 +495,15 @@ inline FLOAT RadAngle(ANGLE aAngle) {
return FLOAT (WrapAngle(aAngle)*PI/ANGLE_180); return FLOAT (WrapAngle(aAngle)*PI/ANGLE_180);
} }
ENGINE_API FLOAT Sin(ANGLE a); #ifdef __arm__
ENGINE_API FLOAT Cos(ANGLE a); inline ENGINE_API FLOAT Sin(ANGLE a) { return sinf(a*(PI/ANGLE_180)); };
ENGINE_API FLOAT Tan(ANGLE a); inline ENGINE_API FLOAT Cos(ANGLE a) { return cosf(a*(PI/ANGLE_180)); };
inline ENGINE_API FLOAT Tan(ANGLE a) { return tanf(a*(PI/ANGLE_180)); };
#else
inline ENGINE_API FLOAT Sin(ANGLE a) { return sin(a*(PI/ANGLE_180)); };
inline ENGINE_API FLOAT Cos(ANGLE a) { return cos(a*(PI/ANGLE_180)); };
inline ENGINE_API FLOAT Tan(ANGLE a) { return tan(a*(PI/ANGLE_180)); };
#endif
#ifdef __arm__ #ifdef __arm__
inline ENGINE_API FLOAT SinFast(ANGLE a) { return sinf(a*(PI/ANGLE_180)); }; inline ENGINE_API FLOAT SinFast(ANGLE a) { return sinf(a*(PI/ANGLE_180)); };