mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-18 13:12:50 +00:00
Code Issues Projects Releases Wiki Activity

An attempt at making turning animation smoother. Copied some code from AiCombat for rotation.

Browse Source
This commit is contained in:
cc9cii 2014-04-20 11:59:47 +10:00
parent 3d26702f5e
commit 000afa48b7
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
apps/openmw/mwmechanics/aiwander.cpp
View File

@ -34,6 +34,9 @@ namespace MWMechanics
, mGreetDistanceMultiplier(0)
, mGreetDistanceReset(0)
, mChance(0)
, mRotate(false)
, mTargetAngle(0)
, mOriginalAngle(0)
, mSaidGreeting(false)
{
for(unsigned short counter = 0; counter < mIdle.size(); counter++)
@ -204,6 +207,12 @@ namespace MWMechanics
//#endif
}
if (mRotate)
{
if (zTurn(actor, Ogre::Degree(mTargetAngle)))
mRotate = false;
}
mReaction += duration;
if(mReaction > 0.25f) // FIXME: hard coded constant
{
@ -385,11 +394,28 @@ namespace MWMechanics
mWalking = false;
mObstacleCheck.clear();
}
Ogre::Vector3 dir = playerPos - actorPos;
float length = dir.length();
// FIXME: horrible hack, and does not turn smoothly
zTurn(actor, Ogre::Degree(Ogre::Radian(Ogre::Math::ACos(dir.y / length) * ((Ogre::Math::ASin(dir.x / length).valueRadians()>0)?1.0:-1.0)).valueDegrees()));
if(!mRotate)
{
Ogre::Vector3 dir = playerPos - actorPos;
float length = dir.length();
// FIXME: horrible hack
float faceAngle = Ogre::Radian(Ogre::Math::ACos(dir.y / length) *
((Ogre::Math::ASin(dir.x / length).valueRadians()>0)?1.0:-1.0)).valueDegrees();
// an attempt at reducing the turning animation glitch
// TODO: doesn't seem to work very well
if(abs(faceAngle) > 10)
{
mTargetAngle = faceAngle;
mRotate = true;
}
}
}
else if(!mDistance) // FIXME: stationary actors go back to their normal position
{
//mTargetAngle = mOriginalAngle;
//mRotate = true;
}
if (!mSaidGreeting)

5
apps/openmw/mwmechanics/aiwander.hpp
View File

@ -73,6 +73,11 @@ namespace MWMechanics
float mDoorCheckDuration;
int mStuckCount;
// the z rotation angle (degrees) we want to reach
// used every frame when mRotate is true
float mTargetAngle;
float mOriginalAngle;
bool mRotate;
float mReaction; // update some actions infrequently
};
}