X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fmetaball-refrac%2Fmetaball-refrac-example.cpp;h=3b418831ef0e15d249d59ca2e54331f167c1821c;hb=2e182925204bf3ef9f2a36cbfbf998e79fbafaf5;hp=8d1def8381ad6e07ae48d5c0df12068f54273477;hpb=1c663bd3223c7091d239f03c44d7ab1b30896976;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/metaball-refrac/metaball-refrac-example.cpp b/examples/metaball-refrac/metaball-refrac-example.cpp index 8d1def8..3b41883 100644 --- a/examples/metaball-refrac/metaball-refrac-example.cpp +++ b/examples/metaball-refrac/metaball-refrac-example.cpp @@ -210,7 +210,6 @@ private: // Data Texture mBackgroundTexture; FrameBuffer mMetaballFBO; - Texture mMetaballFBOTexture; Actor mMetaballRoot; MetaballInfo mMetaballs[METABALL_NUMBER]; @@ -423,9 +422,9 @@ void MetaballRefracController::CreateMetaballActors() mMetaballs[i].position = Vector2(0.0f, 0.0f); 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 ); @@ -440,7 +439,7 @@ void MetaballRefracController::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 ); @@ -451,11 +450,7 @@ void MetaballRefracController::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); @@ -478,7 +473,7 @@ void MetaballRefracController::CreateComposition() // Create new texture set mTextureSetRefraction = TextureSet::New(); mTextureSetRefraction.SetTexture( 0u, mBackgroundTexture ); - mTextureSetRefraction.SetTexture( 1u, mMetaballFBOTexture ); + mTextureSetRefraction.SetTexture( 1u, mMetaballFBO.GetColorTexture() ); // Create normal shader mShaderNormal = Shader::New( METABALL_VERTEX_SHADER, FRAG_SHADER ); @@ -489,9 +484,9 @@ void MetaballRefracController::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) ); // Create geometry Geometry metaballGeometry = CreateGeometry( false );