Commit: 39fd056c7b3d3c188931087821152281be0b6b9b - HotshotOgreIOS (hg)

Commit MetaInfo

• Revision: 39fd056c7b3d3c188931087821152281be0b6b9b (tree)
• Time: 2017-01-31 18:21:31
• Author: Raffaele Bratta <r.bratta@vaev...>
• Commiter: Raffaele Bratta

Log Message

Add human-readable name to shadows texture definitions.

Change Summary

• modified: OgreMain/include/Compositor/OgreCompositorShadowNodeDef.h
• modified: OgreMain/src/OgreScriptTranslator.cpp

Incremental Difference

diff -r 3e1bda965d9b -r 39fd056c7b3d OgreMain/include/Compositor/OgreCompositorShadowNodeDef.h
--- a/OgreMain/include/Compositor/OgreCompositorShadowNodeDef.h	Mon Jan 30 18:07:31 2017 +0100
+++ b/OgreMain/include/Compositor/OgreCompositorShadowNodeDef.h	Tue Jan 31 10:21:31 2017 +0100
@@ -84,10 +84,11 @@
 
     protected:
         IdString    name;
+        String      nameStr;
         size_t      sharesSetupWith;
 
     public:
-        ShadowTextureDefinition( ShadowMapTechniques t, IdString _name,
+        ShadowTextureDefinition( ShadowMapTechniques t, const String& _name,
                                 size_t _light, size_t _split ) :
                 textureType( TEX_TYPE_2D ),
                 width(1024), height(1024), depth(1), widthFactor(1.0f), heightFactor(1.0f),
@@ -95,9 +96,10 @@
                 depthBufferId(2), depthBufferFormat( PF_UNKNOWN ),
                 light(_light), split(_split), shadowMapTechnique(t),
                 pssmLambda( 0.95f ), splitPadding( 1.0f ), numSplits( 3 ),
-                name( _name ), sharesSetupWith( -1 ) {}
+                name( _name ), nameStr( _name ), sharesSetupWith( -1 ) {}
 
         IdString getName() const            { return name; }
+        String getNameStr() const           { return nameStr; }
 
         void _setSharesSetupWithIdx( size_t idx )   { sharesSetupWith = idx; }
         size_t getSharesSetupWith() const           { return sharesSetupWith; }

diff -r 3e1bda965d9b -r 39fd056c7b3d OgreMain/src/OgreScriptTranslator.cpp
--- a/OgreMain/src/OgreScriptTranslator.cpp	Mon Jan 30 18:07:31 2017 +0100
+++ b/OgreMain/src/OgreScriptTranslator.cpp	Tue Jan 31 10:21:31 2017 +0100
@@ -7446,7 +7446,7 @@
         mShadowNodeDef->setNumTargetPass( numTargetPasses );
         mShadowNodeDef->setNumOutputChannels( numOutputChannels );
 
-        ShadowTextureDefinition defaultParams( SHADOWMAP_UNIFORM, IdString(), 0, 0 );
+        ShadowTextureDefinition defaultParams( SHADOWMAP_UNIFORM, "", 0, 0 );
 
         AbstractNodeList::iterator i = obj->children.begin();
         try