Main: SceneManagerFactory - provide default destroyInstance

OGRECave · Sep 17, 2021 · de8e9de · de8e9de
1 parent e58eec3
commit de8e9de
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 27 deletions.
diff --git a/OgreMain/include/OgreSceneManager.h b/OgreMain/include/OgreSceneManager.h
@@ -3523,7 +3523,7 @@ namespace Ogre {
         */
         virtual SceneManager* createInstance(const String& instanceName) = 0;
         /** Destroy an instance of a SceneManager. */
-        virtual void destroyInstance(SceneManager* instance) = 0;
+        virtual void destroyInstance(SceneManager* instance) { delete instance; }
 
     };
 

diff --git a/OgreMain/include/OgreSceneManagerEnumerator.h b/OgreMain/include/OgreSceneManagerEnumerator.h
@@ -53,7 +53,6 @@ namespace Ogre {
         /// Factory type name
         static const String FACTORY_TYPE_NAME;
         SceneManager* createInstance(const String& instanceName);
-        void destroyInstance(SceneManager* instance);
     };
 
     /// Default scene manager

diff --git a/OgreMain/src/OgreSceneManagerEnumerator.cpp b/OgreMain/src/OgreSceneManagerEnumerator.cpp
@@ -274,11 +274,6 @@ namespace Ogre {
         return OGRE_NEW DefaultSceneManager(instanceName);
     }
     //-----------------------------------------------------------------------
-    void DefaultSceneManagerFactory::destroyInstance(SceneManager* instance)
-    {
-        OGRE_DELETE instance;
-    }
-    //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     DefaultSceneManager::DefaultSceneManager(const String& name)
         : SceneManager(name)

diff --git a/PlugIns/BSPSceneManager/include/OgreBspSceneManager.h b/PlugIns/BSPSceneManager/include/OgreBspSceneManager.h
@@ -272,7 +272,6 @@ namespace Ogre {
         /// Factory type name
         static const String FACTORY_TYPE_NAME;
         SceneManager* createInstance(const String& instanceName);
-        void destroyInstance(SceneManager* instance);
     };
     /** @} */
     /** @} */

diff --git a/PlugIns/BSPSceneManager/src/OgreBspSceneManager.cpp b/PlugIns/BSPSceneManager/src/OgreBspSceneManager.cpp
@@ -789,11 +789,6 @@ namespace Ogre {
     {
         return OGRE_NEW BspSceneManager(instanceName);
     }
-    //-----------------------------------------------------------------------
-    void BspSceneManagerFactory::destroyInstance(SceneManager* instance)
-    {
-        OGRE_DELETE instance;
-    }
 
 }
 
diff --git a/PlugIns/OctreeSceneManager/include/OgreOctreeSceneManager.h b/PlugIns/OctreeSceneManager/include/OgreOctreeSceneManager.h
@@ -227,7 +227,6 @@ class OctreeSceneManagerFactory : public SceneManagerFactory
     /// Factory type name
     static const String FACTORY_TYPE_NAME;
     SceneManager* createInstance(const String& instanceName);
-    void destroyInstance(SceneManager* instance);
 };
 
 

diff --git a/PlugIns/OctreeSceneManager/src/OgreOctreeSceneManager.cpp b/PlugIns/OctreeSceneManager/src/OgreOctreeSceneManager.cpp
@@ -1135,11 +1135,5 @@ SceneManager* OctreeSceneManagerFactory::createInstance(
 {
     return OGRE_NEW OctreeSceneManager(instanceName);
 }
-//-----------------------------------------------------------------------
-void OctreeSceneManagerFactory::destroyInstance(SceneManager* instance)
-{
-    OGRE_DELETE instance;
-}
-
 
 }
diff --git a/PlugIns/PCZSceneManager/include/OgrePCZSceneManager.h b/PlugIns/PCZSceneManager/include/OgrePCZSceneManager.h
@@ -383,7 +383,6 @@ namespace Ogre
         /// Factory type name
         static const String FACTORY_TYPE_NAME;
         SceneManager* createInstance(const String& instanceName);
-        void destroyInstance(SceneManager* instance);
     };
 
 

diff --git a/PlugIns/PCZSceneManager/src/OgrePCZSceneManager.cpp b/PlugIns/PCZSceneManager/src/OgrePCZSceneManager.cpp
@@ -1442,11 +1442,5 @@ namespace Ogre
     {
         return OGRE_NEW PCZSceneManager(instanceName);
     }
-    //-----------------------------------------------------------------------
-    void PCZSceneManagerFactory::destroyInstance(SceneManager* instance)
-    {
-        OGRE_DELETE instance;
-    }
-
 
 }