mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-12-24 12:23:07 +00:00
Code Issues Releases Wiki Activity

Fix deleting object physics again.

Browse source
This commit is contained in:
cc9cii 2014-11-03 10:03:54 +11:00
parent d9755f82c3
commit 358cac2f0a
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/opencs/view/world/physicssystem.cpp
View file

@ -39,7 +39,7 @@ namespace CSVWorld
Ogre::SceneManager *sceneManager = findSceneManager(sceneNodeName); Ogre::SceneManager *sceneManager = findSceneManager(sceneNodeName);
if(sceneManager) if(sceneManager)
{ {
// update maps // update maps (NOTE: sometimes replaced)
mSceneNodeToRefId[sceneNodeName] = referenceId; mSceneNodeToRefId[sceneNodeName] = referenceId;
mSceneNodeToMesh[sceneNodeName] = mesh; mSceneNodeToMesh[sceneNodeName] = mesh;
mRefIdToSceneNode[referenceId][sceneManager] = sceneNodeName; mRefIdToSceneNode[referenceId][sceneManager] = sceneNodeName;
@ -126,14 +126,11 @@ namespace CSVWorld
std::string referenceId = mSceneNodeToRefId[sceneNodeName]; std::string referenceId = mSceneNodeToRefId[sceneNodeName];
if(referenceId != "") if(referenceId != "")
{
if(mRefIdToSceneNode.find(referenceId) == mRefIdToSceneNode.end())
{ {
mEngine->removeRigidBody(referenceId); mEngine->removeRigidBody(referenceId);
mEngine->deleteRigidBody(referenceId); mEngine->deleteRigidBody(referenceId);
} }
} }
}
void PhysicsSystem::replaceObject(const std::string &sceneNodeName, float scale, void PhysicsSystem::replaceObject(const std::string &sceneNodeName, float scale,
const Ogre::Vector3 &position, const Ogre::Quaternion &rotation, bool placeable) const Ogre::Vector3 &position, const Ogre::Quaternion &rotation, bool placeable)