teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Revert "Bug #840, First Person Sneaking Camera Height"

Browse source 
This reverts commit 296abfd48f.
This commit is contained in:
Alex "rainChu" Haddad 2013-10-01 11:44:45 -04:00
parent 296abfd48f
commit 0ddb5097fc
1 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/openmw/mwrender/npcanimation.cpp
View file

@ -443,31 +443,11 @@ Ogre::Vector3 NpcAnimation::runAnimation(float timepassed)
Ogre::Vector3 ret = Animation::runAnimation(timepassed); Ogre::Vector3 ret = Animation::runAnimation(timepassed);
Ogre::SkeletonInstance *baseinst = mSkelBase->getSkeleton(); Ogre::SkeletonInstance *baseinst = mSkelBase->getSkeleton();
// We have to make a few adjustments to the first person animation, since the armature
// is partly driven by code.
if(mViewMode == VM_FirstPerson && mCamera) if(mViewMode == VM_FirstPerson && mCamera)
{ {
// Bend his neck and shoulders so his eyes don't go into his torso.
float pitch = mCamera->getPitch(); float pitch = mCamera->getPitch();
Ogre::Node *node = baseinst->getBone("Bip01 Neck"); Ogre::Node *node = baseinst->getBone("Bip01 Neck");
node->pitch(Ogre::Radian(pitch*0.75f), Ogre::Node::TS_WORLD); node->pitch(Ogre::Radian(pitch*0.75f), Ogre::Node::TS_WORLD);
// If NPC is sneaking, his head and shoulders must lower to adjust his camera.
const MWWorld::Class *npcClass = &MWWorld::Class::get(mPtr);
const MWBase::World *world = MWBase::Environment::get().getWorld();
bool isSneaking = npcClass->getStance(mPtr, MWWorld::Class::Sneak);
bool isInAir = !world->isOnGround(mPtr);
bool isSwimming = world->isSwimming(mPtr);
if(isSneaking && !(isSwimming || isInAir))
{
Ogre::Node *headNode = baseinst->getBone("Bip01 Neck");
Ogre::Vector3 position = headNode->getPosition();
position.x -= 9.5f;
headNode->setPosition(position);
}
} }
for(size_t i = 0;i < ESM::PRT_Count;i++) for(size_t i = 0;i < ESM::PRT_Count;i++)