Commit: 3e1bda965d9b4ce972dcb4cf1a8449619cf8c0ed - HotshotOgreIOS (hg)

Commit MetaInfo

• Revision: 3e1bda965d9b4ce972dcb4cf1a8449619cf8c0ed (tree)
• Time: 2017-01-31 02:07:31
• Author: Raffaele Bratta <r.bratta@vaev...>
• Commiter: Raffaele Bratta

Log Message

Add human-readable name to workspace definitions.

Change Summary

• modified: OgreMain/include/Compositor/OgreCompositorManager2.h
• modified: OgreMain/include/Compositor/OgreCompositorWorkspaceDef.h
• modified: OgreMain/src/Compositor/OgreCompositorManager2.cpp
• modified: OgreMain/src/Compositor/OgreCompositorWorkspaceDef.cpp
• modified: Samples/2.0/Common/src/GraphicsSystem.cpp
• modified: Samples/2.0/Tutorials/Tutorial_DynamicCubemap/Tutorial_DynamicCubemapGameState.cpp

Incremental Difference

diff -r b11c19e0ad01 -r 3e1bda965d9b OgreMain/include/Compositor/OgreCompositorManager2.h
--- a/OgreMain/include/Compositor/OgreCompositorManager2.h	Sun Jan 29 11:23:16 2017 -0300
+++ b/OgreMain/include/Compositor/OgreCompositorManager2.h	Mon Jan 30 18:07:31 2017 +0100
@@ -194,7 +194,7 @@
             Setting workspace def's connections must be done *after* all node
             definitions have been created
         */
-        CompositorWorkspaceDef* addWorkspaceDefinition( IdString name );
+        CompositorWorkspaceDef* addWorkspaceDefinition( const String& name );
 
         /// Returns how many times _update has been called.
         size_t getFrameCount(void) const                    { return mFrameCount; }
@@ -371,7 +371,7 @@
             Name of the shadow node. Leave blank if no shadows.
             Caller is supposed to have set the shadow node correctly
         */
-        void createBasicWorkspaceDef( const IdString &workspaceDefName,
+        void createBasicWorkspaceDef( const String &workspaceDefName,
                                         const ColourValue &backgroundColour,
                                         IdString shadowNodeName=IdString() );
 

diff -r b11c19e0ad01 -r 3e1bda965d9b OgreMain/include/Compositor/OgreCompositorWorkspaceDef.h
--- a/OgreMain/include/Compositor/OgreCompositorWorkspaceDef.h	Sun Jan 29 11:23:16 2017 -0300
+++ b/OgreMain/include/Compositor/OgreCompositorWorkspaceDef.h	Mon Jan 30 18:07:31 2017 +0100
@@ -72,6 +72,7 @@
     protected:
 
         IdString            mName;
+        String              mNameStr;
         NodeAliasMap        mAliasedNodes;
         ChannelRouteList    mChannelRoutes;
         ChannelRouteList    mBufferChannelRoutes;
@@ -122,10 +123,11 @@
                                              uint32 outChannel ) const;
 
     public:
-        CompositorWorkspaceDef( IdString name, CompositorManager2 *compositorManager );
+        CompositorWorkspaceDef( const String& name, CompositorManager2 *compositorManager );
         virtual ~CompositorWorkspaceDef() {}
 
         IdString getName(void) const                                { return mName; }
+        String getNameStr(void) const                               { return mNameStr; }
 
         /** Connects outNode's output channel to inNode's input channel.
         @remarks

diff -r b11c19e0ad01 -r 3e1bda965d9b OgreMain/src/Compositor/OgreCompositorManager2.cpp
--- a/OgreMain/src/Compositor/OgreCompositorManager2.cpp	Sun Jan 29 11:23:16 2017 -0300
+++ b/OgreMain/src/Compositor/OgreCompositorManager2.cpp	Mon Jan 30 18:07:31 2017 +0100
@@ -311,7 +311,7 @@
         return retVal;
     }
     //-----------------------------------------------------------------------------------
-    CompositorWorkspaceDef* CompositorManager2::addWorkspaceDefinition( IdString name )
+    CompositorWorkspaceDef* CompositorManager2::addWorkspaceDefinition( const String& name )
     {
         CompositorWorkspaceDef *retVal = 0;
 
@@ -323,7 +323,7 @@
         else
         {
             OGRE_EXCEPT( Exception::ERR_DUPLICATE_ITEM, "A workspace with name '" +
-                            name.getFriendlyText() + "' already exists",
+                            name + "' already exists",
                             "CompositorManager2::addWorkspaceDefinition" );
         }
 
@@ -655,12 +655,12 @@
         mRenderSystem->_endFrameOnce();
     }
     //-----------------------------------------------------------------------------------
-    void CompositorManager2::createBasicWorkspaceDef( const IdString &workspaceDefName,
+    void CompositorManager2::createBasicWorkspaceDef( const String &workspaceDefName,
                                                         const ColourValue &backgroundColour,
                                                         IdString shadowNodeName )
     {
-        CompositorNodeDef *nodeDef = this->addNodeDefinition( "AutoGen " + (workspaceDefName +
-                                                                IdString("/Node")).getReleaseText() );
+        CompositorNodeDef *nodeDef = this->addNodeDefinition( "AutoGen " + IdString(workspaceDefName +
+                                                                "/Node").getReleaseText() );
 
         //Input texture
         nodeDef->addTextureSourceName( "WindowRT", 0, TextureDefinitionBase::TEXTURE_INPUT );

diff -r b11c19e0ad01 -r 3e1bda965d9b OgreMain/src/Compositor/OgreCompositorWorkspaceDef.cpp
--- a/OgreMain/src/Compositor/OgreCompositorWorkspaceDef.cpp	Sun Jan 29 11:23:16 2017 -0300
+++ b/OgreMain/src/Compositor/OgreCompositorWorkspaceDef.cpp	Mon Jan 30 18:07:31 2017 +0100
@@ -36,10 +36,11 @@
 
 namespace Ogre
 {
-    CompositorWorkspaceDef::CompositorWorkspaceDef( IdString name,
+    CompositorWorkspaceDef::CompositorWorkspaceDef( const String& name,
                                                     CompositorManager2 *compositorManager ) :
             TextureDefinitionBase( TEXTURE_GLOBAL ),
             mName( name ),
+            mNameStr( name ),
             mCompositorManager( compositorManager )
     {
     }

diff -r b11c19e0ad01 -r 3e1bda965d9b Samples/2.0/Common/src/GraphicsSystem.cpp
--- a/Samples/2.0/Common/src/GraphicsSystem.cpp	Sun Jan 29 11:23:16 2017 -0300
+++ b/Samples/2.0/Common/src/GraphicsSystem.cpp	Mon Jan 30 18:07:31 2017 +0100
@@ -542,7 +542,7 @@
     {
         Ogre::CompositorManager2 *compositorManager = mRoot->getCompositorManager2();
 
-        const Ogre::IdString workspaceName( "Demo Workspace" );
+        const Ogre::String workspaceName( "Demo Workspace" );
         if( !compositorManager->hasWorkspaceDefinition( workspaceName ) )
         {
             compositorManager->createBasicWorkspaceDef( workspaceName, mBackgroundColour,

diff -r b11c19e0ad01 -r 3e1bda965d9b Samples/2.0/Tutorials/Tutorial_DynamicCubemap/Tutorial_DynamicCubemapGameState.cpp
--- a/Samples/2.0/Tutorials/Tutorial_DynamicCubemap/Tutorial_DynamicCubemapGameState.cpp	Sun Jan 29 11:23:16 2017 -0300
+++ b/Samples/2.0/Tutorials/Tutorial_DynamicCubemap/Tutorial_DynamicCubemapGameState.cpp	Mon Jan 30 18:07:31 2017 +0100
@@ -83,7 +83,7 @@
         cubemapExternalChannels[0].target = mDynamicCubemap->getBuffer(0)->getRenderTarget();
         cubemapExternalChannels[0].textures.push_back( mDynamicCubemap );
 
-        const Ogre::IdString workspaceName( "Tutorial_DynamicCubemap_cubemap" );
+        const Ogre::String workspaceName( "Tutorial_DynamicCubemap_cubemap" );
         if( !compositorManager->hasWorkspaceDefinition( workspaceName ) )
         {
             CompositorWorkspaceDef *workspaceDef = compositorManager->addWorkspaceDefinition(