// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
-#include <dali-toolkit/devel-api/visual-factory/devel-visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
namespace Dali
{
Property::Map customShader;
customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = EMBOSS_FRAGMENT_SOURCE;
Property::Map visualMap;
- visualMap.Insert( Toolkit::VisualProperty::SHADER, customShader );
+ visualMap.Insert( Toolkit::DevelVisual::Property::SHADER, customShader );
// create actor to render input with applied emboss effect
mActorForInput1 = Toolkit::ImageView::New(mInputImage);
mRootActor.Add( mActorForComposite );
- Image dummyImage; // Dummy image, force creation of an image visual
-
- InitializeVisual( mActorForComposite, mVisualForEmboss1, dummyImage );
+ Internal::InitializeVisual( mActorForComposite, mVisualForEmboss1, mImageForEmboss1 );
Toolkit::GetImplementation( mVisualForEmboss1 ).SetCustomShader( customShader );
-
- InitializeVisual( mActorForComposite, mVisualForEmboss2, dummyImage );
- Toolkit::GetImplementation( mVisualForEmboss2 ).SetCustomShader( customShader );
-
- 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 );
+ Internal::InitializeVisual( mActorForComposite, mVisualForEmboss2, mImageForEmboss2 );
+ Toolkit::GetImplementation( mVisualForEmboss2 ).SetCustomShader( customShader );
mActorForComposite.GetRendererAt(1).RegisterProperty( COLOR_UNIFORM_NAME, Color::WHITE );
SetupCamera();
if( mActorForComposite )
{
- mVisualForEmboss1.SetOffStage( mActorForComposite );
- mVisualForEmboss2.SetOffStage( mActorForComposite );
+ Toolkit::GetImplementation(mVisualForEmboss1).SetOffStage( mActorForComposite );
+ Toolkit::GetImplementation(mVisualForEmboss2).SetOffStage( mActorForComposite );
mVisualForEmboss1.Reset();
mVisualForEmboss2.Reset();
mRootActor.Remove( mActorForComposite );
taskList.RemoveTask(mRenderTaskForEmboss2);
}
+ if( mRenderTaskForOutput )
+ {
+ taskList.RemoveTask( mRenderTaskForOutput );
+ }
+
mRootActor.Reset();
}
}