Peter M. Groen / dali-demo

Commit a46012c503858f5e7960f5216a346a141c11c0a0

Authored by Ferran Sole
1 parent 66b0b003

Fixed texture mesh example after changed uniform precedence. 

Now actor's properties have precedence over Renderers properties as uniforms

Change-Id: Ie893579e3d59bfa4bc4b1b99939b0bf236c2efdd
Inline Side-by-side
Showing 1 changed file with 2 additions and 5 deletions
examples/textured-mesh/textured-mesh-example.cpp
  View file @a46012c
... ... @@ -165,9 +165,7 @@ public:
165 165 mMeshActor.AddRenderer( mRenderer );
166 166 mMeshActor.SetSize(400, 400);
167 167  
168   - Property::Index fadeColorIndex = mMeshActor.RegisterProperty( "uFadeColor", Color::GREEN );
169   -
170   - fadeColorIndex = mRenderer.RegisterProperty( "uFadeColor", Color::MAGENTA );
  168 + Property::Index fadeColorIndex = mRenderer.RegisterProperty( "uFadeColor", Color::MAGENTA );
171 169 mRenderer.SetDepthIndex(0);
172 170  
173 171 mMeshActor.SetParentOrigin( ParentOrigin::TOP_CENTER );
... ... @@ -181,11 +179,10 @@ public:
181 179 mMeshActor2.SetSize(400, 400);
182 180  
183 181 mMeshActor2.RegisterProperty( "a-n-other-property", Color::GREEN );
184   - Property::Index fadeColorIndex2 = mMeshActor2.RegisterProperty( "uFadeColor", Color::GREEN );
185 182  
186 183 mRenderer2.RegisterProperty( "a-n-other-property", Vector3::ZERO );
187 184 mRenderer2.RegisterProperty( "a-coefficient", 0.008f );
188   - fadeColorIndex2 = mRenderer2.RegisterProperty( "uFadeColor", Color::BLUE );
  185 + Property::Index fadeColorIndex2 = mRenderer2.RegisterProperty( "uFadeColor", Color::BLUE );
189 186 mRenderer2.SetDepthIndex(0);
190 187  
191 188 mMeshActor2.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
... ...