mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-25 08:39:41 +00:00
Code Issues Releases Wiki Activity

Fix scene node being erased in the object reference map.

Browse source
This commit is contained in:
cc9cii 2014-11-09 12:34:26 +11:00
parent f2ff2f2988
commit 2c09b9ba21
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,9 +70,6 @@ namespace CSVWorld
if(referenceId != "") if(referenceId != "")
{ {
mSceneNodeToRefId.erase(sceneNodeName);
mSceneNodeToMesh.erase(sceneNodeName);
// find which SceneManager has this object // find which SceneManager has this object
Ogre::SceneManager *sceneManager = findSceneManager(sceneNodeName); Ogre::SceneManager *sceneManager = findSceneManager(sceneNodeName);
if(!sceneManager) if(!sceneManager)
@ -97,7 +94,8 @@ namespace CSVWorld
mRefIdToSceneNode.begin(); mRefIdToSceneNode.begin();
for(; itRef != mRefIdToSceneNode.end(); ++itRef) for(; itRef != mRefIdToSceneNode.end(); ++itRef)
{ {
if((*itRef).second.find(sceneManager) != (*itRef).second.end()) if((*itRef).first == referenceId &&
(*itRef).second.find(sceneManager) != (*itRef).second.end())
{ {
(*itRef).second.erase(sceneManager); (*itRef).second.erase(sceneManager);
break; break;
@ -110,6 +108,9 @@ namespace CSVWorld
mEngine->removeRigidBody(referenceId); mEngine->removeRigidBody(referenceId);
mEngine->deleteRigidBody(referenceId); mEngine->deleteRigidBody(referenceId);
} }
mSceneNodeToRefId.erase(sceneNodeName);
mSceneNodeToMesh.erase(sceneNodeName);
} }
} }
@ -252,11 +253,13 @@ namespace CSVWorld
return std::make_pair("", Ogre::Vector3(0,0,0)); return std::make_pair("", Ogre::Vector3(0,0,0));
else else
{ {
// FIXME: maybe below logic belongs in the caller, i.e. terrainUnderCursor or
// objectUnderCursor
std::string name = refIdToSceneNode(result.first, sceneMgr); std::string name = refIdToSceneNode(result.first, sceneMgr);
if(name == "") if(name == "")
name = result.first; name = result.first; // prob terrain
else else
name = refIdToSceneNode(result.first, sceneMgr); name = refIdToSceneNode(result.first, sceneMgr); // prob object
return std::make_pair(name, ray.getPoint(farClipDist*result.second)); return std::make_pair(name, ray.getPoint(farClipDist*result.second));
} }