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

Use the PhysicActor's set/getOnGround method

Browse source
This commit is contained in:
Chris Robinson 2013-02-14 20:10:04 -08:00
parent 15dc82f454
commit 18b606fddf
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwworld/physicssystem.cpp
View file

@ -187,6 +187,7 @@ namespace MWWorld
else
onground = false;
}
physicActor->setOnGround(onground);
physicActor->setVerticalForce(clippedVelocity.z - time*400.0f);
return newPosition;

8
apps/openmw/mwworld/worldimp.cpp
View file

@ -1418,17 +1418,13 @@ namespace MWWorld
RefData &refdata = mPlayer->getPlayer().getRefData();
Ogre::Vector3 playerPos(refdata.getPosition().pos);
std::pair<bool,Ogre::Vector3> hit = mPhysics->castRay(playerPos, Ogre::Vector3(0,0,-1), 50);
bool isOnGround = (hit.first ? (hit.second.distance (playerPos) < 25) : false);
if(!isOnGround || isUnderwater(*currentCell->mCell, playerPos))
const OEngine::Physic::PhysicActor *physactor = mPhysEngine->getCharacter(refdata.getHandle());
if(!physactor->getOnGround() || isUnderwater(*currentCell->mCell, playerPos))
return 2;
if((currentCell->mCell->mData.mFlags&ESM::Cell::NoSleep))
return 1;
return 0;
}
MWRender::Animation* World::getAnimation(const MWWorld::Ptr &ptr)