From a46012c503858f5e7960f5216a346a141c11c0a0 Mon Sep 17 00:00:00 2001 From: Ferran Sole Date: Wed, 23 Sep 2015 10:35:57 +0100 Subject: [PATCH] Fixed texture mesh example after changed uniform precedence. --- examples/textured-mesh/textured-mesh-example.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/examples/textured-mesh/textured-mesh-example.cpp b/examples/textured-mesh/textured-mesh-example.cpp index 3b65701..1597aca 100644 --- a/examples/textured-mesh/textured-mesh-example.cpp +++ b/examples/textured-mesh/textured-mesh-example.cpp @@ -165,9 +165,7 @@ public: mMeshActor.AddRenderer( mRenderer ); mMeshActor.SetSize(400, 400); - Property::Index fadeColorIndex = mMeshActor.RegisterProperty( "uFadeColor", Color::GREEN ); - - fadeColorIndex = mRenderer.RegisterProperty( "uFadeColor", Color::MAGENTA ); + Property::Index fadeColorIndex = mRenderer.RegisterProperty( "uFadeColor", Color::MAGENTA ); mRenderer.SetDepthIndex(0); mMeshActor.SetParentOrigin( ParentOrigin::TOP_CENTER ); @@ -181,11 +179,10 @@ public: mMeshActor2.SetSize(400, 400); mMeshActor2.RegisterProperty( "a-n-other-property", Color::GREEN ); - Property::Index fadeColorIndex2 = mMeshActor2.RegisterProperty( "uFadeColor", Color::GREEN ); mRenderer2.RegisterProperty( "a-n-other-property", Vector3::ZERO ); mRenderer2.RegisterProperty( "a-coefficient", 0.008f ); - fadeColorIndex2 = mRenderer2.RegisterProperty( "uFadeColor", Color::BLUE ); + Property::Index fadeColorIndex2 = mRenderer2.RegisterProperty( "uFadeColor", Color::BLUE ); mRenderer2.SetDepthIndex(0); mMeshActor2.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); -- libgit2 0.21.4