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

gus' fly mode fix; manually applied

Browse source
This commit is contained in:
Marc Zinnschlag 2011-03-21 14:08:56 +01:00
parent 68004630e9
commit 91ea36509d
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,6 +51,8 @@ MWScene::MWScene(OEngine::Render::OgreRenderer &_rend , OEngine::Physic::PhysicE
mPlayer = new MWRender::Player (getCamera(), playerNode->getName()); mPlayer = new MWRender::Player (getCamera(), playerNode->getName());
mFreeFly = true;
} }
MWScene::~MWScene() MWScene::~MWScene()
@ -97,11 +99,24 @@ void MWScene::doPhysics (float duration, MWWorld::World& world,
OEngine::Physic::PhysicActor* act = eng->getCharacter(iter->first); OEngine::Physic::PhysicActor* act = eng->getCharacter(iter->first);
//dirty stuff to get the camera orientation. Must be changed! //dirty stuff to get the camera orientation. Must be changed!
Ogre::SceneNode *sceneNode = rend.getScene()->getSceneNode (iter->first);
Ogre::Quaternion quat = sceneNode->getChildIterator().getNext()->getOrientation();
Ogre::Vector3 dir1(iter->second.x,iter->second.z,-iter->second.y); Ogre::SceneNode *sceneNode = rend.getScene()->getSceneNode (iter->first);
Ogre::Vector3 dir = 0.01*(quat*dir1); Ogre::Vector3 dir;
Ogre::Node* yawNode = sceneNode->getChildIterator().getNext();
Ogre::Node* pitchNode = yawNode->getChildIterator().getNext();
if(mFreeFly)
{
Ogre::Quaternion yawQuat = yawNode->getOrientation();
Ogre::Quaternion pitchQuat = pitchNode->getOrientation();
Ogre::Vector3 dir1(iter->second.x,iter->second.z,-iter->second.y);
dir = 0.01*(yawQuat*pitchQuat*dir1);
}
else
{
Ogre::Quaternion quat = yawNode->getOrientation();
Ogre::Vector3 dir1(iter->second.x,iter->second.z,-iter->second.y);
dir = 0.01*(quat*dir1);
}
//set the walk direction //set the walk direction
act->setWalkDirection(btVector3(dir.x,-dir.z,dir.y)); act->setWalkDirection(btVector3(dir.x,-dir.z,dir.y));
@ -177,9 +192,11 @@ void MWScene::toggleCollisionMode()
act->enableCollisions(false); act->enableCollisions(false);
act->setGravity(0.); act->setGravity(0.);
act->setVerticalVelocity(0); act->setVerticalVelocity(0);
mFreeFly = true;
} }
else else
{ {
mFreeFly = false;
act->enableCollisions(true); act->enableCollisions(true);
act->setGravity(10.); act->setGravity(10.);
act->setVerticalVelocity(0); act->setVerticalVelocity(0);

2
apps/openmw/mwrender/mwscene.hpp
View file

@ -44,6 +44,8 @@ namespace MWRender
MWRender::Player *mPlayer; MWRender::Player *mPlayer;
bool mFreeFly;
public: public:
MWScene (OEngine::Render::OgreRenderer &_rend , OEngine::Physic::PhysicEngine* physEng); MWScene (OEngine::Render::OgreRenderer &_rend , OEngine::Physic::PhysicEngine* physEng);