Peter M. Groen / dali-demo

Commit 07ab57fde5eb011ecd843162afd4eeae3f7d844b

Authored by Xiangyin Ma
1 parent 1d35f77a

Update following the changes of Blending&Culling options 

Change-Id: I390f4bd7cca141658c3a300ae742145fddf37e07
Inline Side-by-side
Showing 9 changed files with 14 additions and 13 deletions
examples/benchmark/benchmark.cpp
  View file @07ab57f
... ... @@ -227,8 +227,8 @@ Renderer CreateRenderer( unsigned int index )
227 227 Image image = ResourceImage::New(imagePath);
228 228 Material material = Material::New( shader );
229 229 material.AddTexture( image, "sTexture" );
230   - material.SetBlendMode( BlendingMode::OFF );
231 230 renderers[index] = Renderer::New( QuadMesh(), material );
  231 + renderers[index].SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::OFF );
232 232 }
233 233 return renderers[index];
234 234 }
... ...
examples/item-view/item-view-example.cpp
  View file @07ab57f
... ... @@ -866,6 +866,7 @@ public: // From ItemFactory
866 866 borderProperty.Insert( "rendererType", "borderRenderer" );
867 867 borderProperty.Insert( "borderColor", Color::WHITE );
868 868 borderProperty.Insert( "borderSize", ITEM_BORDER_SIZE );
  869 + borderProperty.Insert( "antiAliasing", true );
869 870 borderActor.SetProperty( ImageView::Property::IMAGE, borderProperty );
870 871  
871 872 actor.Add(borderActor);
... ...
examples/line-mesh/line-mesh-example.cpp
  View file @07ab57f
... ... @@ -167,7 +167,7 @@ public:
167 167  
168 168 Property::Index morphAmountIndex = mMeshActor.RegisterProperty( "uMorphAmount", 0.0f );
169 169  
170   - mRenderer.SetDepthIndex(0);
  170 + mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
171 171  
172 172 mMeshActor.SetParentOrigin( ParentOrigin::CENTER );
173 173 mMeshActor.SetAnchorPoint( AnchorPoint::CENTER );
... ...
examples/mesh-morph/mesh-morph-example.cpp
  View file @07ab57f
... ... @@ -304,7 +304,7 @@ public:
304 304  
305 305 Property::Index morphDeltaIndex = mMeshActor.RegisterProperty( "uDelta", 0.f );
306 306  
307   - mRenderer.SetDepthIndex(0);
  307 + mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
308 308  
309 309 mMeshActor.SetParentOrigin( ParentOrigin::CENTER );
310 310 mMeshActor.SetAnchorPoint( AnchorPoint::CENTER );
... ...
examples/mesh-sorting/mesh-sorting-example.cpp
  View file @07ab57f
... ... @@ -180,7 +180,7 @@ public:
180 180 meshActor.SetSize(175, 175);
181 181 meshActor.RegisterProperty("index", (int)i);
182 182  
183   - renderer.SetDepthIndex(0);
  183 + renderer.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
184 184 // Test with actor alpha
185 185 meshActor.SetParentOrigin( ParentOrigin::CENTER );
186 186 meshActor.SetAnchorPoint( AnchorPoint::CENTER );
... ... @@ -240,7 +240,7 @@ public:
240 240 mDepthIndices[index] = newDepthIndex;
241 241  
242 242 Renderer renderer = actor.GetRendererAt(0);
243   - renderer.SetDepthIndex(newDepthIndex);
  243 + renderer.SetProperty( Renderer::Property::DEPTH_INDEX, newDepthIndex);
244 244  
245 245 PrintDepths();
246 246 }
... ...
examples/metaball-explosion/metaball-explosion-example.cpp
  View file @07ab57f
... ... @@ -475,9 +475,6 @@ void MetaballExplosionController::CreateMetaballActors()
475 475 Shader shader = Shader::New( METABALL_VERTEX_SHADER, METABALL_FRAG_SHADER );
476 476  
477 477 Material material = Material::New( shader );
478   - material.SetBlendMode(BlendingMode::ON );
479   - material.SetBlendFunc(BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE);
480   -
481 478 Geometry metaballGeom = CreateGeometry();
482 479  
483 480 //Initialization of each of the metaballs
... ... @@ -492,6 +489,9 @@ void MetaballExplosionController::CreateMetaballActors()
492 489 mMetaballs[i].actor.SetParentOrigin( ParentOrigin::CENTER );
493 490  
494 491 Renderer renderer = Renderer::New( metaballGeom, material );
  492 + renderer.SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::ON );
  493 + renderer.SetBlendFunc(BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE);
  494 +
495 495 mMetaballs[i].actor.AddRenderer( renderer );
496 496  
497 497 mMetaballs[i].positionIndex = mMetaballs[i].actor.RegisterProperty( "uPositionMetaball", mMetaballs[i].position );
... ...
examples/metaball-refrac/metaball-refrac-example.cpp
  View file @07ab57f
... ... @@ -450,8 +450,6 @@ void MetaballRefracController::CreateMetaballActors()
450 450 Shader shader = Shader::New( METABALL_VERTEX_SHADER, METABALL_FRAG_SHADER );
451 451  
452 452 Material material = Material::New( shader );
453   - material.SetBlendMode(BlendingMode::ON );
454   - material.SetBlendFunc(BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE);
455 453  
456 454 Geometry metaballGeom = CreateGeometry();
457 455  
... ... @@ -472,6 +470,8 @@ void MetaballRefracController::CreateMetaballActors()
472 470 mMetaballs[i].actor.SetParentOrigin( ParentOrigin::CENTER );
473 471  
474 472 Renderer renderer = Renderer::New( metaballGeom, material );
  473 + renderer.SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::ON );
  474 + renderer.SetBlendFunc(BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE, BlendingFactor::ONE);
475 475 mMetaballs[i].actor.AddRenderer( renderer );
476 476  
477 477 mMetaballs[i].positionIndex = mMetaballs[i].actor.RegisterProperty( "uPositionMetaball", mMetaballs[i].position );
... ...
examples/point-mesh/point-mesh-example.cpp
  View file @07ab57f
... ... @@ -173,7 +173,7 @@ public:
173 173  
174 174 mRenderer.RegisterProperty( "uFadeColor", Color::MAGENTA );
175 175 mRenderer.RegisterProperty( "uPointSize", 80.0f );
176   - mRenderer.SetDepthIndex(0);
  176 + mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
177 177  
178 178 mMeshActor.SetParentOrigin( ParentOrigin::CENTER );
179 179 mMeshActor.SetAnchorPoint( AnchorPoint::CENTER );
... ...
examples/textured-mesh/textured-mesh-example.cpp
  View file @07ab57f
... ... @@ -163,7 +163,7 @@ public:
163 163 mMeshActor.SetSize(400, 400);
164 164  
165 165 Property::Index fadeColorIndex = mRenderer.RegisterProperty( "uFadeColor", Color::MAGENTA );
166   - mRenderer.SetDepthIndex(0);
  166 + mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
167 167  
168 168 mMeshActor.SetParentOrigin( ParentOrigin::TOP_CENTER );
169 169 mMeshActor.SetAnchorPoint( AnchorPoint::TOP_CENTER );
... ... @@ -180,7 +180,7 @@ public:
180 180 mRenderer2.RegisterProperty( "anotherProperty", Vector3::ZERO );
181 181 mRenderer2.RegisterProperty( "aCoefficient", 0.008f );
182 182 Property::Index fadeColorIndex2 = mRenderer2.RegisterProperty( "uFadeColor", Color::BLUE );
183   - mRenderer2.SetDepthIndex(0);
  183 + mRenderer2.SetProperty( Renderer::Property::DEPTH_INDEX, 0 );
184 184  
185 185 mMeshActor2.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
186 186 mMeshActor2.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
... ...