X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffilters%2Fspread-filter.cpp;h=5eb8a825ef82b83df6f6a136250820b2d4fdeeb5;hp=3d911b92df8d1b895da1fd30083dc15670e8815c;hb=0e1683ef848d1d877e26633609fa95e0d2ab36b5;hpb=306d2f61a1b64179e801fa8a0bb2bd7b4e9dd682 diff --git a/dali-toolkit/internal/filters/spread-filter.cpp b/dali-toolkit/internal/filters/spread-filter.cpp index 3d911b9..5eb8a82 100644 --- a/dali-toolkit/internal/filters/spread-filter.cpp +++ b/dali-toolkit/internal/filters/spread-filter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 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. @@ -19,12 +19,13 @@ #include "spread-filter.h" // EXTERNAL INCLUDES -#include #include -#include +#include +#include #include // INTERNAL INCLUDES +#include namespace Dali { @@ -38,38 +39,29 @@ namespace Internal namespace { -const float ARBITRARY_FIELD_OF_VIEW = Math::PI / 4.0f; - const char* const SPREAD_FRAGMENT_SOURCE = { "precision highp float;\n" - "uniform float uSpread;\n" + "varying mediump vec2 vTexCoord;\n" + "uniform sampler2D sTexture;\n" + "uniform int uSpread;\n" "uniform vec2 uTexScale;\n" "void main()\n" "{\n" " vec4 color = texture2D( sTexture, vTexCoord);\n" - "# ifdef DEBUG_RENDER\n" - " if( vTexCoord.s < 0.495 )\n" - " {\n" - "# endif //def DEBUG_RENDER\n" - " int spread = int(uSpread);\n" - " for( int i = 1; i <= spread; ++i )\n" - " {\n" - " vec2 offset = uTexScale * float(i);\n" - " color = max( texture2D( sTexture, vTexCoord + offset), color );\n" - " color = max( texture2D( sTexture, vTexCoord - offset), color );\n" - " }\n" - "# ifdef DEBUG_RENDER\n" - " }\n" - " else if( vTexCoord.s <= 0.505 )\n" + " for( int i = 1; i <= uSpread; ++i )\n" " {\n" - " color = vec4( 1.0, 0.0, 0.0, 1.0 );\n" + " vec2 offset = uTexScale * float(i);\n" + " color = max( texture2D( sTexture, vTexCoord + offset), color );\n" + " color = max( texture2D( sTexture, vTexCoord - offset), color );\n" " }\n" - "# endif //def DEBUG_RENDER\n" " gl_FragColor = color;\n" "}\n" }; +const char* const SPREAD_UNIFORM_NAME( "uSpread" ); +const char* const TEX_SCALE_UNIFORM_NAME( "uTexScale" ); + } // namespace @@ -90,44 +82,36 @@ void SpreadFilter::SetSpread( float spread ) void SpreadFilter::Enable() { - mCameraActor = CameraActor::New(); - mCameraActor.SetParentOrigin(ParentOrigin::CENTER); - // create actor to render input with applied emboss effect - mActorForInput = ImageActor::New( mInputImage ); - mActorForInput.SetParentOrigin( ParentOrigin::CENTER ); - mActorForInput.SetSize(mTargetSize); - mActorForInput.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); + mActorForInput = Actor::New(); + mActorForInput.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mActorForInput.SetProperty( Actor::Property::SIZE, mTargetSize); + // register properties as shader uniforms + mActorForInput.RegisterProperty( SPREAD_UNIFORM_NAME, mSpread ); + mActorForInput.RegisterProperty( TEX_SCALE_UNIFORM_NAME, Vector2( 1.0f / mTargetSize.width, 0.0f ) ); + + Renderer rendererForInput = CreateRenderer( BASIC_VERTEX_SOURCE, SPREAD_FRAGMENT_SOURCE ); + SetRendererTexture( rendererForInput, mInputTexture ); + mActorForInput.AddRenderer( rendererForInput ); // create internal offscreen for result of horizontal pass - mImageForHorz = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Image::Unused ); + mFrameBufferForHorz = FrameBuffer::New( mTargetSize.width, mTargetSize.height, FrameBuffer::Attachment::NONE ); + Texture textureForHorz = Texture::New( TextureType::TEXTURE_2D, mPixelFormat, unsigned(mTargetSize.width), unsigned(mTargetSize.height) ); + mFrameBufferForHorz.AttachColorTexture( textureForHorz ); // create an actor to render mImageForHorz for vertical blur pass - mActorForHorz = ImageActor::New( mImageForHorz ); - mActorForHorz.SetParentOrigin( ParentOrigin::CENTER ); - mActorForHorz.SetSize(mTargetSize); - mActorForHorz.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); + mActorForHorz = Actor::New(); + mActorForHorz.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mActorForHorz.SetProperty( Actor::Property::SIZE, mTargetSize); + // register properties as shader uniforms + mActorForHorz.RegisterProperty( SPREAD_UNIFORM_NAME, mSpread ); + mActorForHorz.RegisterProperty( TEX_SCALE_UNIFORM_NAME, Vector2( 0.0f, 1.0f / mTargetSize.height ) ); + Renderer rendererForHorz = CreateRenderer( BASIC_VERTEX_SOURCE, SPREAD_FRAGMENT_SOURCE ); + SetRendererTexture( rendererForHorz, textureForHorz ); + mActorForHorz.AddRenderer( rendererForHorz ); mRootActor.Add( mActorForInput ); mRootActor.Add( mActorForHorz ); - mRootActor.Add( mCameraActor ); - - std::ostringstream fragmentSource; - if( mDebugRender ) - { - fragmentSource << "#define DEBUG_RENDER\n"; - } - fragmentSource << SPREAD_FRAGMENT_SOURCE; - - mShaderForHorz = ShaderEffect::New( "", fragmentSource.str() ); - mActorForInput.SetShaderEffect( mShaderForHorz ); - mShaderForHorz.SetUniform( "uSpread", mSpread ); - mShaderForHorz.SetUniform( "uTexScale", Vector2( 1.0f / mTargetSize.width, 0.0f ) ); - - mShaderForVert = ShaderEffect::New( "", fragmentSource.str() ); - mActorForHorz.SetShaderEffect( mShaderForVert ); - mShaderForVert.SetUniform( "uSpread", mSpread ); - mShaderForVert.SetUniform( "uTexScale", Vector2( 0.0f, 1.0f / mTargetSize.height ) ); SetupCamera(); CreateRenderTasks(); @@ -188,25 +172,14 @@ void SpreadFilter::SetSize( const Vector2& size ) mTargetSize = size; if( mActorForInput ) { - mActorForInput.SetSize(mTargetSize); + mActorForInput.SetProperty( Actor::Property::SIZE, mTargetSize); } if( mActorForHorz ) { - mActorForHorz.SetSize(mTargetSize); + mActorForHorz.SetProperty( Actor::Property::SIZE, mTargetSize); } } -void SpreadFilter::SetupCamera() -{ - // Create and place a camera for the embossing render, corresponding to its render target size - mCameraActor.SetFieldOfView(ARBITRARY_FIELD_OF_VIEW); - mCameraActor.SetNearClippingPlane(1.0f); - mCameraActor.SetAspectRatio(mTargetSize.width / mTargetSize.height); - mCameraActor.SetType(Dali::Camera::FREE_LOOK); // camera orientation based solely on actor - mCameraActor.SetRotation(Quaternion(M_PI, Vector3::YAXIS)); - mCameraActor.SetPosition(0.0f, 0.0f, ((mTargetSize.height * 0.5f) / tanf(ARBITRARY_FIELD_OF_VIEW * 0.5f))); -} - void SpreadFilter::CreateRenderTasks() { RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList(); @@ -219,7 +192,7 @@ void SpreadFilter::CreateRenderTasks() mRenderTaskForHorz.SetInputEnabled( false ); mRenderTaskForHorz.SetClearEnabled( true ); mRenderTaskForHorz.SetClearColor( mBackgroundColor ); - mRenderTaskForHorz.SetTargetFrameBuffer( mImageForHorz ); + mRenderTaskForHorz.SetFrameBuffer( mFrameBufferForHorz ); mRenderTaskForHorz.SetCameraActor( mCameraActor ); // use the internal buffer and perform a horizontal blur targeting the output buffer @@ -230,7 +203,7 @@ void SpreadFilter::CreateRenderTasks() mRenderTaskForVert.SetInputEnabled( false ); mRenderTaskForVert.SetClearEnabled( true ); mRenderTaskForVert.SetClearColor( mBackgroundColor ); - mRenderTaskForVert.SetTargetFrameBuffer( mOutputImage ); + mRenderTaskForVert.SetFrameBuffer( mOutputFrameBuffer ); mRenderTaskForVert.SetCameraActor( mCameraActor ); }