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

Head tracking: fall back to target collision box center if the target has no head node

Browse Source
This commit is contained in:
scrawl 2015-11-03 18:27:15 +01:00
parent a5f8ffb83d
commit 46e07e4b19
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/openmw/mwmechanics/character.cpp
View File

@ -2121,7 +2121,7 @@ void CharacterController::updateHeadTracking(float duration)
osg::Matrixf mat = mats[0]; osg::Matrixf mat = mats[0];
osg::Vec3f headPos = mat.getTrans(); osg::Vec3f headPos = mat.getTrans();
osg::Vec3f targetPos (mHeadTrackTarget.getRefData().getPosition().asVec3()); osg::Vec3f direction;
if (MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(mHeadTrackTarget)) if (MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(mHeadTrackTarget))
{ {
const osg::Node* node = anim->getNode("Head"); const osg::Node* node = anim->getNode("Head");
@ -2131,11 +2131,12 @@ void CharacterController::updateHeadTracking(float duration)
{ {
osg::MatrixList mats = node->getWorldMatrices(); osg::MatrixList mats = node->getWorldMatrices();
if (mats.size()) if (mats.size())
targetPos = mats[0].getTrans(); direction = mats[0].getTrans() - headPos;
} }
else
// no head node to look at, fall back to look at center of collision box
direction = MWBase::Environment::get().getWorld()->aimToTarget(mPtr, mHeadTrackTarget);
} }
osg::Vec3f direction = targetPos - headPos;
direction.normalize(); direction.normalize();
if (!mPtr.getRefData().getBaseNode()) if (!mPtr.getRefData().getBaseNode())