mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 21:53:51 +00:00
Code Issues Releases Wiki Activity

fix the door bug

Browse source
This commit is contained in:
gugus 2011-03-22 20:15:19 +01:00
parent 0cc94c81d4
commit 7a28c9f3aa
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwrender/mwscene.cpp
View file

@ -127,7 +127,6 @@ void MWScene::doPhysics (float duration, MWWorld::World& world,
{
OEngine::Physic::PhysicActor* act = it->second;
btVector3 newPos = act->getPosition();
std::cout << newPos.x()<<newPos.y(),newPos.z();
MWWorld::Ptr ptr = world.getPtrViaHandle (it->first);
world.moveObject (ptr, newPos.x(), newPos.y(), newPos.z());
}
@ -164,7 +163,7 @@ void MWScene::moveObject (const std::string& handle, const Ogre::Vector3& positi
{
rend.getScene()->getSceneNode(handle)->setPosition(position);
if(updatePhysics)//TODO: is it an actor?
if(updatePhysics)//TODO: is it an actor? Done?
{
if (OEngine::Physic::RigidBody* body = eng->getRigidBody(handle))
{
@ -174,6 +173,12 @@ void MWScene::moveObject (const std::string& handle, const Ogre::Vector3& positi
tr.setOrigin(btVector3(position.x,position.y,position.z));
body->setWorldTransform(tr);
}
if (OEngine::Physic::PhysicActor* act = eng->getCharacter(handle))
{
// TODO very dirty hack to avoid crash during setup -> needs cleaning up to allow
// start positions others than 0, 0, 0
act->setPosition(btVector3(position.x,position.y,position.z));
}
}
}

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

@ -313,7 +313,6 @@ namespace MWWorld
mPlayer->setCell (cell);
// TODO orientation
mEnvironment.mMechanicsManager->addActor (mPlayer->getPlayer());
mEnvironment.mMechanicsManager->watchActor (mPlayer->getPlayer());
}