Commit: 5bc3c0ee06b5b610e390cf2319015b629d780a96 - HotshotOgreIOS (hg)

Commit MetaInfo

• Revision: 5bc3c0ee06b5b610e390cf2319015b629d780a96 (tree)
• Time: 2017-01-31 19:55:56
• Author: Raffaele Bratta <r.bratta@vaev...>
• Commiter: Raffaele Bratta

Log Message

Add support to remove compositor node definitions.

Change Summary

• modified: OgreMain/include/Compositor/OgreCompositorManager2.h
• modified: OgreMain/src/Compositor/OgreCompositorManager2.cpp

Incremental Difference

diff -r 3824d25bd862 -r 5bc3c0ee06b5 OgreMain/include/Compositor/OgreCompositorManager2.h
--- a/OgreMain/include/Compositor/OgreCompositorManager2.h	Tue Jan 31 11:44:49 2017 +0100
+++ b/OgreMain/include/Compositor/OgreCompositorManager2.h	Tue Jan 31 11:55:56 2017 +0100
@@ -176,6 +176,9 @@
         /// Returns a new node definition. The name must be unique, throws otherwise.
         CompositorNodeDef* addNodeDefinition( const String &name );
 
+        /// Removes the node definition with the given name. Throws if not found
+        void removeNodeDefinition( IdString nodeDefName );
+
         /// Returns the node definition with the given name. Throws if not found
         const CompositorShadowNodeDef* getShadowNodeDefinition( IdString nodeDefName ) const;
 

diff -r 3824d25bd862 -r 5bc3c0ee06b5 OgreMain/src/Compositor/OgreCompositorManager2.cpp
--- a/OgreMain/src/Compositor/OgreCompositorManager2.cpp	Tue Jan 31 11:44:49 2017 +0100
+++ b/OgreMain/src/Compositor/OgreCompositorManager2.cpp	Tue Jan 31 11:55:56 2017 +0100
@@ -264,6 +264,22 @@
         return retVal;
     }
     //-----------------------------------------------------------------------------------
+    void CompositorManager2::removeNodeDefinition( IdString nodeDefName )
+    {
+        CompositorNodeDefMap::const_iterator itor = mNodeDefinitions.find( nodeDefName );
+        if( itor != mNodeDefinitions.end() )
+        {
+            OGRE_DELETE itor->second;
+            mNodeDefinitions.erase( itor );
+        }
+        else
+        {
+            OGRE_EXCEPT( Exception::ERR_ITEM_NOT_FOUND, "Node definition with name '" +
+                            nodeDefName.getFriendlyText() + "' not found",
+                            "CompositorManager2::removeNodeDefinition" );
+        }
+    }
+    //-----------------------------------------------------------------------------------
     const CompositorShadowNodeDef* CompositorManager2::getShadowNodeDefinition(
                                                                     IdString nodeDefName ) const
     {