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

Fix 32bit Windows non-debug build with MSVC 11.0 crash during startup.

Browse source
This commit is contained in:
cc9cii 2014-02-28 00:29:57 +11:00
parent 56ae85df0c
commit 5c11a94511
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/openengine/bullet/physic.cpp
View file

@ -23,7 +23,7 @@ namespace Physic
mBody = mEngine->createAndAdjustRigidBody(mMesh, mName, scale, position, rotation, &mBoxScaledTranslation, &mBoxRotation);
mRaycastingBody = mEngine->createAndAdjustRigidBody(mMesh, mName, scale, position, rotation, &mBoxScaledTranslation, &mBoxRotation, true);
Ogre::Quaternion inverse = mBoxRotation.Inverse();
mBoxRotationInverse = btQuaternion(inverse.x, inverse.y, inverse.z,inverse.w);
mBoxRotationInverse = Ogre::Quaternion(inverse.w, inverse.x, inverse.y,inverse.z);
mEngine->addRigidBody(mBody, false, mRaycastingBody,true); //Add rigid body to dynamics world, but do not add to object map
}
@ -85,8 +85,8 @@ namespace Physic
Ogre::Quaternion PhysicActor::getRotation()
{
assert(mBody);
btQuaternion quat = mBody->getWorldTransform().getRotation() * mBoxRotationInverse;
return Ogre::Quaternion(quat.getW(), quat.getX(), quat.getY(), quat.getZ());
btQuaternion quat = mBody->getWorldTransform().getRotation();
return Ogre::Quaternion(quat.getW(), quat.getX(), quat.getY(), quat.getZ()) * mBoxRotationInverse;
}
void PhysicActor::setScale(float scale){

2
libs/openengine/bullet/physic.hpp
View file

@ -162,7 +162,7 @@ namespace Physic
Ogre::Vector3 mBoxScaledTranslation;
Ogre::Quaternion mBoxRotation;
btQuaternion mBoxRotationInverse;
Ogre::Quaternion mBoxRotationInverse;
Ogre::Vector3 mForce;
bool mOnGround;