NxOgre Druha Special Edition.

[Changed] const_iterator to iterator in erase functions in PtrMultiHashmap [Added] destroyActor in Scene
betajaen · Dec 12, 2009 · e260428 · e260428
1 parent e563725
commit e260428
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/build/source/NxOgrePtrMultiHashmap.h b/build/source/NxOgrePtrMultiHashmap.h
@@ -203,7 +203,7 @@ template<typename type> class ptr_multihashmap
   // Erase a pointer from the multimap then delete it.
   void erase(key_type& key) 
   {
-   multimap_type::const_iterator it = multimap.find(key);
+   multimap_type::iterator it = multimap.find(key);
    if (it == multimap.end())
     return;
 
@@ -215,7 +215,7 @@ template<typename type> class ptr_multihashmap
   // Erase a pointer from the multimap then delete it.
   void erase(const key_type& key) 
   {
-   multimap_type::const_iterator it = multimap.find(key);
+   multimap_type::iterator it = multimap.find(key);
    if (it == multimap.end())
     return;
 

diff --git a/build/source/NxOgreScene.cpp b/build/source/NxOgreScene.cpp
@@ -188,6 +188,20 @@ Actor* Scene::createActor(const ShapeDescription& shape, const Matrix44& pose, c
  return actor;
 }
 
+bool Scene::destroyActor(NxOgre::Actor* actor)
+{
+
+ if (actor == 0)
+  return false;
+
+ if (actor->isDynamic() == false)
+  return false;
+
+ mActors.erase(mActor);
+
+ return true;
+}
+
 SceneGeometry* Scene::createSceneGeometry(const ShapeDescriptions& shapes, const Matrix44& pose, const RigidBodyDescription& description)
 {
  SceneGeometry* sg = NXOGRE_NEW_NXOGRE(SceneGeometry)(shapes, pose, description, this);

diff --git a/build/source/NxOgreScene.h b/build/source/NxOgreScene.h
@@ -138,7 +138,7 @@ class NxOgrePublicClass Scene : public BigClassAllocatable, public TimeListener
       desc.
           
   */
-  void  destroyActor(Actor*);
+  bool  destroyActor(Actor*);
 
   /*! function. createSceneGeometry
       desc.