mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Use Ogre's asin/acos functions which will protect against NaNs

Browse Source
This commit is contained in:
scrawl 2014-01-07 16:37:51 +01:00
parent 48a08c4c4d
commit 90b55c8d4b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/openmw/mwmechanics/aicombat.cpp
View File

@ -12,13 +12,13 @@
#include "creaturestats.hpp" #include "creaturestats.hpp"
#include "npcstats.hpp" #include "npcstats.hpp"
#include "OgreMath.h" #include <OgreMath.h>
namespace namespace
{ {
static float sgn(float a) static float sgn(Ogre::Radian a)
{ {
if(a > 0) if(a.valueDegrees() > 0)
return 1.0; return 1.0;
return -1.0; return -1.0;
} }
@ -106,7 +106,7 @@ namespace MWMechanics
float directionY = dest.mY - start.mY; float directionY = dest.mY - start.mY;
float directionResult = sqrt(directionX * directionX + directionY * directionY); float directionResult = sqrt(directionX * directionX + directionY * directionY);
zAngle = Ogre::Radian( acos(directionY / directionResult) * sgn(asin(directionX / directionResult)) ).valueDegrees(); zAngle = Ogre::Radian( Ogre::Math::ACos(directionY / directionResult) * sgn(Ogre::Math::ASin(directionX / directionResult)) ).valueDegrees();
// TODO: use movement settings instead of rotating directly // TODO: use movement settings instead of rotating directly
MWBase::Environment::get().getWorld()->rotateObject(actor, 0, 0, zAngle, false); MWBase::Environment::get().getWorld()->rotateObject(actor, 0, 0, zAngle, false);

6
apps/openmw/mwmechanics/pathfinding.cpp
View File

@ -53,9 +53,9 @@ namespace
return sqrt(x * x + y * y + z * z); return sqrt(x * x + y * y + z * z);
} }
static float sgn(float a) static float sgn(Ogre::Radian a)
{ {
if(a > 0) if(a.valueRadians() > 0)
return 1.0; return 1.0;
return -1.0; return -1.0;
} }
@ -196,7 +196,7 @@ namespace MWMechanics
float directionY = nextPoint.mY - y; float directionY = nextPoint.mY - y;
float directionResult = sqrt(directionX * directionX + directionY * directionY); float directionResult = sqrt(directionX * directionX + directionY * directionY);
return Ogre::Radian(acos(directionY / directionResult) * sgn(asin(directionX / directionResult))).valueDegrees(); return Ogre::Radian(Ogre::Math::ACos(directionY / directionResult) * sgn(Ogre::Math::ASin(directionX / directionResult))).valueDegrees();
} }
bool PathFinder::checkWaypoint(float x, float y, float z) bool PathFinder::checkWaypoint(float x, float y, float z)