Further Setter/Getter public API removal from Dali::Actor

[platform/core/uifw/dali-demo.git] / examples / metaball-explosion / metaball-explosion-example.cpp

diff --git a/examples/metaball-explosion/metaball-explosion-example.cpp b/examples/metaball-explosion/metaball-explosion-example.cpp
index a7fdd82..283bc0c 100644 (file)
--- a/examples/metaball-explosion/metaball-explosion-example.cpp
+++ b/examples/metaball-explosion/metaball-explosion-example.cpp
@@ -218,7 +218,6 @@ private: // Data
 
   Texture           mBackgroundTexture;
   FrameBuffer       mMetaballFBO;
-  Texture           mMetaballFBOTexture;
 
   Actor             mMetaballRoot;
   MetaballInfo      mMetaballs[METABALL_NUMBER];
@@ -312,7 +311,6 @@ MetaballExplosionController::MetaballExplosionController( Application& applicati
   mScreenSize(),
   mBackgroundTexture(),
   mMetaballFBO(),
-  mMetaballFBOTexture(),
   mMetaballRoot(),
   mMetaballs(),
   mPositionIndex(),
@@ -445,9 +443,9 @@ void MetaballExplosionController::CreateMetaballActors()
     mMetaballs[i].radius = mMetaballs[i].initRadius = Random::Range(0.05f,0.07f);
 
     mMetaballs[i].actor = Actor::New( );
-    mMetaballs[i].actor.SetName( "Metaball" );
-    mMetaballs[i].actor.SetScale( 1.0f );
-    mMetaballs[i].actor.SetParentOrigin( ParentOrigin::CENTER );
+    mMetaballs[i].actor.SetProperty( Dali::Actor::Property::NAME, "Metaball" );
+    mMetaballs[i].actor.SetProperty( Actor::Property::SCALE, 1.0f );
+    mMetaballs[i].actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
     mMetaballs[i].actor.AddRenderer( renderer );
 
     mMetaballs[i].positionIndex = mMetaballs[i].actor.RegisterProperty( "uPositionMetaball", mMetaballs[i].position );
@@ -461,7 +459,7 @@ void MetaballExplosionController::CreateMetaballActors()
 
   // Root creation
   mMetaballRoot = Actor::New();
-  mMetaballRoot.SetParentOrigin( ParentOrigin::CENTER );
+  mMetaballRoot.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
   for( uint32_t i = 0; i < METABALL_NUMBER; i++ )
   {
     mMetaballRoot.Add( mMetaballs[i].actor );
@@ -474,11 +472,7 @@ void MetaballExplosionController::CreateMetaballImage()
   // Create an FBO and a render task to create to render the metaballs with a fragment shader
   Stage stage = Stage::GetCurrent();
 
-  mMetaballFBO = FrameBuffer::New( mScreenSize.x, mScreenSize.y, FrameBuffer::Attachment::NONE );
-  mMetaballFBOTexture = Texture::New( Dali::TextureType::TEXTURE_2D,
-                                      Pixel::RGB888,
-                                      mScreenSize.x, mScreenSize.y );
-  mMetaballFBO.AttachColorTexture( mMetaballFBOTexture );
+  mMetaballFBO = FrameBuffer::New( mScreenSize.x, mScreenSize.y );
 
   stage.Add(mMetaballRoot);
 
@@ -501,7 +495,7 @@ void MetaballExplosionController::CreateComposition()
   // Create new texture set
   auto textureSet = TextureSet::New();
   textureSet.SetTexture( 0u, mBackgroundTexture  );
-  textureSet.SetTexture( 1u, mMetaballFBOTexture );
+  textureSet.SetTexture( 1u, mMetaballFBO.GetColorTexture() );
 
   // Create geometry
   Geometry metaballGeom = CreateGeometry( false );
@@ -511,9 +505,9 @@ void MetaballExplosionController::CreateComposition()
 
   // Create actor
   mCompositionActor = Actor::New( );
-  mCompositionActor.SetParentOrigin(ParentOrigin::CENTER);
-  mCompositionActor.SetPosition(Vector3(0.0f, 0.0f, 0.0f));
-  mCompositionActor.SetSize(mScreenSize.x, mScreenSize.y);
+  mCompositionActor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
+  mCompositionActor.SetProperty( Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f));
+  mCompositionActor.SetProperty( Actor::Property::SIZE, Vector2(mScreenSize.x, mScreenSize.y) );
   mCompositionActor.AddRenderer( mRenderer );
 
   Vector2 metaballCenter(0.0,0);
@@ -523,7 +517,7 @@ void MetaballExplosionController::CreateComposition()
 
   SetPositionToMetaballs( metaballCenter );
 
-  mCompositionActor.SetSize(mScreenSize.x, mScreenSize.y);
+  mCompositionActor.SetProperty( Actor::Property::SIZE, Vector2(mScreenSize.x, mScreenSize.y) );
 
   Stage stage = Stage::GetCurrent();
   stage.Add( mCompositionActor );