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

Deleting scaled shapes; scaleObject()

Browse source
This commit is contained in:
Jason Hooks 2012-06-18 13:03:00 -04:00
parent 33fe80723c
commit 4d55ecfdbe
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -300,7 +300,15 @@ namespace MWWorld
void PhysicsSystem::scaleObject (const std::string& handle, float scale)
{
if(handleToMesh.find(handle) != handleToMesh.end())
{
btTransform transform = mEngine->getRigidBody(handle)->getWorldTransform();
removeObject(handle);
Ogre::Quaternion quat = Ogre::Quaternion(transform.getRotation().getW(), transform.getRotation().getX(), transform.getRotation().getY(), transform.getRotation().getZ());
Ogre::Vector3 vec = Ogre::Vector3(transform.getOrigin().getX(), transform.getOrigin().getY(), transform.getOrigin().getZ());
addObject(handle, handleToMesh[handle], quat, scale, vec);
}
}
bool PhysicsSystem::toggleCollisionMode()

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

@ -398,10 +398,16 @@ namespace Physic
if (it != RigidBodyMap.end() )
{
RigidBody* body = it->second;
btScaledBvhTriangleMeshShape* scaled = dynamic_cast<btScaledBvhTriangleMeshShape*> (body->getCollisionShape());
if(body != NULL)
{
delete body;
}
if(scaled != NULL)
{
delete scaled;
}
RigidBodyMap.erase(it);
}
}