Update following the changes of Blending&Culling options

Change-Id: I390f4bd7cca141658c3a300ae742145fddf37e07

Update following the changes of Blending&Culling options
Change-Id: I390f4bd7cca141658c3a300ae742145fddf37e07
Xiangyin Ma
1 parent 1d35f77a
Showing 9 changed files with 14 additions and 13 deletions
examples/benchmark/benchmark.cpp
examples/item-view/item-view-example.cpp
examples/line-mesh/line-mesh-example.cpp
examples/mesh-morph/mesh-morph-example.cpp
examples/mesh-sorting/mesh-sorting-example.cpp
examples/metaball-explosion/metaball-explosion-example.cpp
examples/metaball-refrac/metaball-refrac-example.cpp
examples/point-mesh/point-mesh-example.cpp
examples/textured-mesh/textured-mesh-example.cpp
@@ -227,8 +227,8 @@ Renderer CreateRenderer( unsigned int index )
     Image image = ResourceImage::New(imagePath);
     Material material = Material::New( shader );
     material.AddTexture( image, "sTexture" );
-    material.SetBlendMode( BlendingMode::OFF );
     renderers[index] = Renderer::New( QuadMesh(), material );
+    renderers[index].SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::OFF );
   }
   return renderers[index];
 }
@@ -866,6 +866,7 @@ public: // From ItemFactory
     borderProperty.Insert( "rendererType", "borderRenderer" );
     borderProperty.Insert( "borderColor", Color::WHITE );
     borderProperty.Insert( "borderSize", ITEM_BORDER_SIZE );
+    borderProperty.Insert( "antiAliasing", true );
     borderActor.SetProperty( ImageView::Property::IMAGE, borderProperty );
     actor.Add(borderActor);
@@ -167,7 +167,7 @@ public:
     Property::Index morphAmountIndex = mMeshActor.RegisterProperty( "uMorphAmount", 0.0f );
-    mRenderer.SetDepthIndex(0);
+    mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
     mMeshActor.SetParentOrigin( ParentOrigin::CENTER );
     mMeshActor.SetAnchorPoint( AnchorPoint::CENTER );
@@ -304,7 +304,7 @@ public:
     Property::Index morphDeltaIndex = mMeshActor.RegisterProperty( "uDelta", 0.f );
-    mRenderer.SetDepthIndex(0);
+    mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
     mMeshActor.SetParentOrigin( ParentOrigin::CENTER );
     mMeshActor.SetAnchorPoint( AnchorPoint::CENTER );
@@ -180,7 +180,7 @@ public:
       meshActor.SetSize(175, 175);
       meshActor.RegisterProperty("index", (int)i);
-      renderer.SetDepthIndex(0);
+      renderer.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
       // Test with actor alpha
       meshActor.SetParentOrigin( ParentOrigin::CENTER );
       meshActor.SetAnchorPoint( AnchorPoint::CENTER );
@@ -240,7 +240,7 @@ public:
       mDepthIndices[index] = newDepthIndex;
       Renderer renderer = actor.GetRendererAt(0);
-      renderer.SetDepthIndex(newDepthIndex);
+      renderer.SetProperty( Renderer::Property::DEPTH_INDEX, newDepthIndex);
       PrintDepths();
     }
@@ -475,9 +475,6 @@ void MetaballExplosionController::CreateMetaballActors()
   Shader shader = Shader::New( METABALL_VERTEX_SHADER, METABALL_FRAG_SHADER );
   Material material = Material::New( shader );
-  material.SetBlendMode(BlendingMode::ON );
-  material.SetBlendFunc(BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE);
-
   Geometry metaballGeom = CreateGeometry();
   //Initialization of each of the metaballs
@@ -492,6 +489,9 @@ void MetaballExplosionController::CreateMetaballActors()
     mMetaballs[i].actor.SetParentOrigin( ParentOrigin::CENTER );
     Renderer renderer = Renderer::New( metaballGeom, material );
+    renderer.SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::ON );
+    renderer.SetBlendFunc(BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE);
+
     mMetaballs[i].actor.AddRenderer( renderer );
     mMetaballs[i].positionIndex = mMetaballs[i].actor.RegisterProperty( "uPositionMetaball", mMetaballs[i].position );
@@ -450,8 +450,6 @@ void MetaballRefracController::CreateMetaballActors()
   Shader shader = Shader::New( METABALL_VERTEX_SHADER, METABALL_FRAG_SHADER );
   Material material = Material::New( shader );
-  material.SetBlendMode(BlendingMode::ON );
-  material.SetBlendFunc(BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE);
   Geometry metaballGeom = CreateGeometry();
@@ -472,6 +470,8 @@ void MetaballRefracController::CreateMetaballActors()
     mMetaballs[i].actor.SetParentOrigin( ParentOrigin::CENTER );
     Renderer renderer = Renderer::New( metaballGeom, material );
+    renderer.SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::ON );
+    renderer.SetBlendFunc(BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE);
     mMetaballs[i].actor.AddRenderer( renderer );
     mMetaballs[i].positionIndex = mMetaballs[i].actor.RegisterProperty( "uPositionMetaball", mMetaballs[i].position );
@@ -173,7 +173,7 @@ public:
     mRenderer.RegisterProperty( "uFadeColor", Color::MAGENTA );
     mRenderer.RegisterProperty( "uPointSize", 80.0f );
-    mRenderer.SetDepthIndex(0);
+    mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
     mMeshActor.SetParentOrigin( ParentOrigin::CENTER );
     mMeshActor.SetAnchorPoint( AnchorPoint::CENTER );
@@ -163,7 +163,7 @@ public:
     mMeshActor.SetSize(400, 400);
     Property::Index fadeColorIndex = mRenderer.RegisterProperty( "uFadeColor", Color::MAGENTA );
-    mRenderer.SetDepthIndex(0);
+    mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
     mMeshActor.SetParentOrigin( ParentOrigin::TOP_CENTER );
     mMeshActor.SetAnchorPoint( AnchorPoint::TOP_CENTER );
@@ -180,7 +180,7 @@ public:
     mRenderer2.RegisterProperty( "anotherProperty",    Vector3::ZERO );
     mRenderer2.RegisterProperty( "aCoefficient",  0.008f );
     Property::Index fadeColorIndex2 = mRenderer2.RegisterProperty( "uFadeColor", Color::BLUE );
-    mRenderer2.SetDepthIndex(0);
+    mRenderer2.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
     mMeshActor2.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
     mMeshActor2.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );