X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffilters%2Femboss-filter.cpp;h=b1bd177f72bd98221b3b196e1757c061742519b3;hp=4bb7c3036c3441e23c5522b858cf32de32a550d4;hb=0e1683ef848d1d877e26633609fa95e0d2ab36b5;hpb=600d7859cddf8ee59d6ddd49002af5fc99e48bf8

diff --git a/dali-toolkit/internal/filters/emboss-filter.cpp b/dali-toolkit/internal/filters/emboss-filter.cpp
index 4bb7c30..b1bd177 100644
--- a/dali-toolkit/internal/filters/emboss-filter.cpp
+++ b/dali-toolkit/internal/filters/emboss-filter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,16 +21,13 @@
 // EXTERNAL INCLUDES
 #include <sstream>
 #include <dali/public-api/animation/constraints.h>
-#include <dali/public-api/common/stage.h>
+#include <dali/devel-api/common/stage.h>
 #include <dali/public-api/object/property-map.h>
 #include <dali/public-api/render-tasks/render-task-list.h>
 #include <dali/public-api/rendering/renderer.h>
-#include <dali/devel-api/images/texture-set-image.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/visuals/visual-properties.h>
-#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
-#include <dali-toolkit/internal/visuals/visual-base-impl.h>
+#include <dali-toolkit/internal/controls/control/control-renderers.h>
 
 namespace Dali
 {
@@ -90,60 +87,54 @@ EmbossFilter::~EmbossFilter()
 
 void EmbossFilter::Enable()
 {
-  mImageForEmboss1 = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Image::UNUSED );
-  mImageForEmboss2 = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Image::UNUSED );
+  mFrameBufferForEmboss1 = FrameBuffer::New( mTargetSize.width, mTargetSize.height, FrameBuffer::Attachment::NONE );
+  Texture texture1 = Texture::New( TextureType::TEXTURE_2D, mPixelFormat, unsigned(mTargetSize.width), unsigned(mTargetSize.height) );
+  mFrameBufferForEmboss1.AttachColorTexture( texture1 );
 
-  Property::Map customShader;
-  customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = EMBOSS_FRAGMENT_SOURCE;
-  Property::Map visualMap;
-  visualMap.Insert( Toolkit::Visual::Property::SHADER, customShader );
+  mFrameBufferForEmboss2 = FrameBuffer::New( mTargetSize.width, mTargetSize.height, FrameBuffer::Attachment::NONE );
+  Texture texture2 = Texture::New( TextureType::TEXTURE_2D, mPixelFormat, unsigned(mTargetSize.width), unsigned(mTargetSize.height) );
+  mFrameBufferForEmboss2.AttachColorTexture( texture2 );
 
   // create actor to render input with applied emboss effect
-  mActorForInput1 = Toolkit::ImageView::New(mInputImage);
-  mActorForInput1.SetParentOrigin( ParentOrigin::CENTER );
-  mActorForInput1.SetSize(mTargetSize);
+  mActorForInput1 = Actor::New();
+  mActorForInput1.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  mActorForInput1.SetProperty( Actor::Property::SIZE, mTargetSize);
   Vector2 textureScale( 1.5f/mTargetSize.width, 1.5f/mTargetSize.height);
   mActorForInput1.RegisterProperty( TEX_SCALE_UNIFORM_NAME, textureScale );
   mActorForInput1.RegisterProperty( COEFFICIENT_UNIFORM_NAME, Vector3( 2.f, -1.f, -1.f ) );
   // set EMBOSS custom shader
-  mActorForInput1.SetProperty( Toolkit::ImageView::Property::IMAGE, visualMap );
+  Renderer renderer1 = CreateRenderer( BASIC_VERTEX_SOURCE, EMBOSS_FRAGMENT_SOURCE );
+  SetRendererTexture( renderer1, mInputTexture );
+  mActorForInput1.AddRenderer( renderer1 );
   mRootActor.Add( mActorForInput1 );
 
-  mActorForInput2 = Toolkit::ImageView::New(mInputImage);
-  mActorForInput2.SetParentOrigin( ParentOrigin::CENTER );
-  mActorForInput2.SetSize(mTargetSize);
+  mActorForInput2 = Actor::New();
+  mActorForInput2.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  mActorForInput2.SetProperty( Actor::Property::SIZE, mTargetSize);
   mActorForInput2.RegisterProperty( TEX_SCALE_UNIFORM_NAME, textureScale );
   mActorForInput2.RegisterProperty( COEFFICIENT_UNIFORM_NAME, Vector3( -1.f, -1.f, 2.f ) );
   // set EMBOSS custom shader
-  mActorForInput2.SetProperty( Toolkit::ImageView::Property::IMAGE, visualMap );
+  Renderer renderer2 = CreateRenderer( BASIC_VERTEX_SOURCE, EMBOSS_FRAGMENT_SOURCE );
+  SetRendererTexture( renderer2, mInputTexture );
+  mActorForInput2.AddRenderer( renderer2 );
   mRootActor.Add( mActorForInput2 );
 
   mActorForComposite = Actor::New();
-  mActorForComposite.SetParentOrigin( ParentOrigin::CENTER );
-  mActorForComposite.SetSize(mTargetSize);
-  mActorForComposite.SetColor( Color::BLACK );
-
-  customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = COMPOSITE_FRAGMENT_SOURCE;
+  mActorForComposite.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  mActorForComposite.SetProperty( Actor::Property::SIZE, mTargetSize);
+  mActorForComposite.SetProperty( Actor::Property::COLOR, Color::BLACK );
 
   mRootActor.Add( mActorForComposite );
 
-  Image dummyImage; // Dummy image, force creation of an image visual
-
-  InitializeVisual( mActorForComposite, mVisualForEmboss1, dummyImage );
-  Toolkit::GetImplementation( mVisualForEmboss1 ).SetCustomShader( customShader );
-
-  InitializeVisual( mActorForComposite, mVisualForEmboss2, dummyImage );
-  Toolkit::GetImplementation( mVisualForEmboss2 ).SetCustomShader( customShader );
+  mRendererForEmboss1 = CreateRenderer( BASIC_VERTEX_SOURCE, COMPOSITE_FRAGMENT_SOURCE );
+  SetRendererTexture( mRendererForEmboss1, mFrameBufferForEmboss1 );
+  mRendererForEmboss1.RegisterProperty( COLOR_UNIFORM_NAME, Color::BLACK );
+  mActorForComposite.AddRenderer( mRendererForEmboss1 );
 
-  TextureSet textureSet1 = TextureSet::New();
-  TextureSetImage( textureSet1, 0, mImageForEmboss1 );
-  mActorForComposite.GetRendererAt(0).SetTextures( textureSet1 );
-  mActorForComposite.GetRendererAt(0).RegisterProperty( COLOR_UNIFORM_NAME, Color::BLACK );
-
-  TextureSet textureSet2 = TextureSet::New();
-  TextureSetImage( textureSet2, 0, mImageForEmboss2 );
-  mActorForComposite.GetRendererAt(1).SetTextures( textureSet2 );
-  mActorForComposite.GetRendererAt(1).RegisterProperty( COLOR_UNIFORM_NAME, Color::WHITE );
+  mRendererForEmboss2 = CreateRenderer( BASIC_VERTEX_SOURCE, COMPOSITE_FRAGMENT_SOURCE );
+  SetRendererTexture( mRendererForEmboss2, mFrameBufferForEmboss2 );
+  mRendererForEmboss2.RegisterProperty( COLOR_UNIFORM_NAME, Color::WHITE );
+  mActorForComposite.AddRenderer( mRendererForEmboss2 );
 
   SetupCamera();
   CreateRenderTasks();
@@ -173,10 +164,12 @@ void EmbossFilter::Disable()
 
     if( mActorForComposite )
     {
-      mVisualForEmboss1.SetOffStage( mActorForComposite );
-      mVisualForEmboss2.SetOffStage( mActorForComposite );
-      mVisualForEmboss1.Reset();
-      mVisualForEmboss2.Reset();
+      mActorForComposite.RemoveRenderer( mRendererForEmboss1 );
+      mRendererForEmboss1.Reset();
+
+      mActorForComposite.RemoveRenderer( mRendererForEmboss2 );
+      mRendererForEmboss2.Reset();
+
       mRootActor.Remove( mActorForComposite );
       mActorForComposite.Reset();
     }
@@ -192,6 +185,11 @@ void EmbossFilter::Disable()
       taskList.RemoveTask(mRenderTaskForEmboss2);
     }
 
+    if( mRenderTaskForOutput )
+    {
+      taskList.RemoveTask( mRenderTaskForOutput );
+    }
+
     mRootActor.Reset();
   }
 }
@@ -213,15 +211,15 @@ void EmbossFilter::SetSize( const Vector2& size )
   mTargetSize = size;
   if( mActorForInput1 )
   {
-    mActorForInput1.SetSize(mTargetSize);
+    mActorForInput1.SetProperty( Actor::Property::SIZE, mTargetSize);
   }
   if( mActorForInput2 )
   {
-    mActorForInput2.SetSize(mTargetSize);
+    mActorForInput2.SetProperty( Actor::Property::SIZE, mTargetSize);
   }
   if( mActorForComposite )
   {
-    mActorForComposite.SetSize(mTargetSize);
+    mActorForComposite.SetProperty( Actor::Property::SIZE, mTargetSize);
   }
 }
 
@@ -236,7 +234,7 @@ void EmbossFilter::CreateRenderTasks()
   mRenderTaskForEmboss1.SetInputEnabled( false );
   mRenderTaskForEmboss1.SetClearColor( Vector4( 0.0f, 0.0f, 0.0f, 0.0f ) );
   mRenderTaskForEmboss1.SetClearEnabled( true );
-  mRenderTaskForEmboss1.SetTargetFrameBuffer( mImageForEmboss1 );
+  mRenderTaskForEmboss1.SetFrameBuffer( mFrameBufferForEmboss1 );
   mRenderTaskForEmboss1.SetCameraActor( mCameraActor );
 
   mRenderTaskForEmboss2 = taskList.CreateTask();
@@ -246,7 +244,7 @@ void EmbossFilter::CreateRenderTasks()
   mRenderTaskForEmboss2.SetInputEnabled( false );
   mRenderTaskForEmboss2.SetClearColor( Vector4( 1.0f, 1.0f, 1.0f, 0.0f ) );
   mRenderTaskForEmboss2.SetClearEnabled( true );
-  mRenderTaskForEmboss2.SetTargetFrameBuffer( mImageForEmboss2 );
+  mRenderTaskForEmboss2.SetFrameBuffer( mFrameBufferForEmboss2 );
   mRenderTaskForEmboss2.SetCameraActor( mCameraActor );
 
   mRenderTaskForOutput = taskList.CreateTask();
@@ -256,7 +254,7 @@ void EmbossFilter::CreateRenderTasks()
   mRenderTaskForOutput.SetInputEnabled( false );
   mRenderTaskForOutput.SetClearColor( Vector4( 0.5f, 0.5f, 0.5f, 0.0f ) );
   mRenderTaskForOutput.SetClearEnabled( true );
-  mRenderTaskForOutput.SetTargetFrameBuffer( mOutputImage );
+  mRenderTaskForOutput.SetFrameBuffer( mOutputFrameBuffer );
   mRenderTaskForOutput.SetCameraActor( mCameraActor );
 }