From 07ab57fde5eb011ecd843162afd4eeae3f7d844b Mon Sep 17 00:00:00 2001 From: Xiangyin Ma Date: Mon, 1 Feb 2016 13:47:34 +0000 Subject: [PATCH] Update following the changes of Blending&Culling options Change-Id: I390f4bd7cca141658c3a300ae742145fddf37e07 --- examples/benchmark/benchmark.cpp | 2 +- examples/item-view/item-view-example.cpp | 1 + examples/line-mesh/line-mesh-example.cpp | 2 +- examples/mesh-morph/mesh-morph-example.cpp | 2 +- examples/mesh-sorting/mesh-sorting-example.cpp | 4 ++-- examples/metaball-explosion/metaball-explosion-example.cpp | 6 +++--- examples/metaball-refrac/metaball-refrac-example.cpp | 4 ++-- examples/point-mesh/point-mesh-example.cpp | 2 +- examples/textured-mesh/textured-mesh-example.cpp | 4 ++-- 9 files changed, 14 insertions(+), 13 deletions(-) diff --git a/examples/benchmark/benchmark.cpp b/examples/benchmark/benchmark.cpp index 96e1e51..687f84b 100644 --- a/examples/benchmark/benchmark.cpp +++ b/examples/benchmark/benchmark.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]; } diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp index c435604..3ebc0b5 100644 --- a/examples/item-view/item-view-example.cpp +++ b/examples/item-view/item-view-example.cpp @@ -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); diff --git a/examples/line-mesh/line-mesh-example.cpp b/examples/line-mesh/line-mesh-example.cpp index ac9b402..e8de9ab 100644 --- a/examples/line-mesh/line-mesh-example.cpp +++ b/examples/line-mesh/line-mesh-example.cpp @@ -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 ); diff --git a/examples/mesh-morph/mesh-morph-example.cpp b/examples/mesh-morph/mesh-morph-example.cpp index c4e27b9..ce5f61e 100644 --- a/examples/mesh-morph/mesh-morph-example.cpp +++ b/examples/mesh-morph/mesh-morph-example.cpp @@ -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 ); diff --git a/examples/mesh-sorting/mesh-sorting-example.cpp b/examples/mesh-sorting/mesh-sorting-example.cpp index 9e6da9b..4dc7237 100644 --- a/examples/mesh-sorting/mesh-sorting-example.cpp +++ b/examples/mesh-sorting/mesh-sorting-example.cpp @@ -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(); } diff --git a/examples/metaball-explosion/metaball-explosion-example.cpp b/examples/metaball-explosion/metaball-explosion-example.cpp index 6aea940..ac46a68 100644 --- a/examples/metaball-explosion/metaball-explosion-example.cpp +++ b/examples/metaball-explosion/metaball-explosion-example.cpp @@ -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 ); diff --git a/examples/metaball-refrac/metaball-refrac-example.cpp b/examples/metaball-refrac/metaball-refrac-example.cpp index bd4c296..ada6a8e 100644 --- a/examples/metaball-refrac/metaball-refrac-example.cpp +++ b/examples/metaball-refrac/metaball-refrac-example.cpp @@ -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 ); diff --git a/examples/point-mesh/point-mesh-example.cpp b/examples/point-mesh/point-mesh-example.cpp index cc14999..ce7a080 100644 --- a/examples/point-mesh/point-mesh-example.cpp +++ b/examples/point-mesh/point-mesh-example.cpp @@ -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 ); diff --git a/examples/textured-mesh/textured-mesh-example.cpp b/examples/textured-mesh/textured-mesh-example.cpp index b7b79b6..a586a07 100644 --- a/examples/textured-mesh/textured-mesh-example.cpp +++ b/examples/textured-mesh/textured-mesh-example.cpp @@ -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 ); -- 2.7.4