X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fsuper-blur-view%2Fsuper-blur-view-impl.cpp;h=2a4979b94dcd1d1ef7b2d8cc863ba34dd836302d;hp=3b2443b4bc47e316a132eb5a58e13e8655068f03;hb=c125573992c196f15ece50589ae80efed63c8870;hpb=57869973578f6a0b0f836d396c7232ddb8302c6b

diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
index 3b2443b..2a4979b 100644
--- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
+++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
@@ -15,17 +15,21 @@
  *
  */
 
+// CLASS HEADER
+#include "super-blur-view-impl.h"
+
 // EXTERNAL INCLUDES
 #include <cmath>
+#include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/object/type-registry.h>
-#include <dali/public-api/scripting/scripting.h>
+#include <dali/public-api/object/property-map.h>
+#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/devel-api/rendering/renderer.h>
+#include <dali/devel-api/scripting/scripting.h>
 #include <dali/integration-api/debug.h>
 
-// CLASS HEADER
-#include "super-blur-view-impl.h"
-
-namespace //unnamed namespace
+namespace //Unnamed namespace
 {
 
 using namespace Dali;
@@ -35,10 +39,24 @@ const unsigned int GAUSSIAN_BLUR_DEFAULT_NUM_SAMPLES = 11;
 const unsigned int GAUSSIAN_BLUR_NUM_SAMPLES_INCREMENTATION = 10;
 const float GAUSSIAN_BLUR_BELL_CURVE_WIDTH = 4.5f;
 const float GAUSSIAN_BLUR_BELL_CURVE_WIDTH_INCREMENTATION = 5.f;
-const Pixel::Format GAUSSIAN_BLUR_RENDER_TARGET_PIXEL_FORMAT = Pixel::RGB888;
+const Pixel::Format GAUSSIAN_BLUR_RENDER_TARGET_PIXEL_FORMAT = Pixel::RGBA8888;
 const float GAUSSIAN_BLUR_DOWNSAMPLE_WIDTH_SCALE = 0.5f;
 const float GAUSSIAN_BLUR_DOWNSAMPLE_HEIGHT_SCALE = 0.5f;
 
+const char* ALPHA_UNIFORM_NAME( "uAlpha" );
+const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
+  varying mediump vec2 vTexCoord;\n
+  uniform sampler2D sTexture;\n
+  uniform lowp vec4 uColor;\n
+  uniform lowp float uAlpha;\n
+  \n
+  void main()\n
+  {\n
+    gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor;\n
+    gl_FragColor.a *= uAlpha;
+  }\n
+);
+
 /**
  * The constraint is used to blend the group of blurred images continuously with a unified blur strength property value which ranges from zero to one.
  */
@@ -51,20 +69,20 @@ struct ActorOpacityConstraint
     mRange = Vector2( index*rangeLength, (index+1.f)*rangeLength );
   }
 
-  float operator()( float current, const PropertyInput& blurProperty )
+  void operator()( float& current, const PropertyInputContainer& inputs )
   {
-    float blurStrength = blurProperty.GetFloat();
-    if(blurStrength <= mRange.x)
+    float blurStrength = inputs[0]->GetFloat();
+    if(blurStrength < mRange.x)
     {
-      return 1.f;
+      current = 0.f;
     }
     else if(blurStrength > mRange.y)
     {
-      return 0.f;
+      current = 1.f;
     }
     else
     {
-      return (mRange.y - blurStrength)/(mRange.y-mRange.x);
+      current = ( blurStrength - mRange.x) / ( mRange.y - mRange.x );
     }
   }
 
@@ -79,13 +97,12 @@ namespace Dali
 namespace Toolkit
 {
 
-const Property::Index SuperBlurView::PROPERTY_IMAGE( Internal::SuperBlurView::SUPER_BLUR_VIEW_PROPERTY_START_INDEX );
-
 namespace Internal
 {
 
 namespace
 {
+
 const unsigned int DEFAULT_BLUR_LEVEL(5u); ///< The default blur level when creating SuperBlurView from the type registry
 
 BaseHandle Create()
@@ -93,24 +110,26 @@ BaseHandle Create()
   return Toolkit::SuperBlurView::New( DEFAULT_BLUR_LEVEL );
 }
 
-// Type registration
-TypeRegistration typeRegistration( typeid(Toolkit::SuperBlurView), typeid(Toolkit::Control), Create );
+// Setup properties, signals and actions using the type-registry.
+DALI_TYPE_REGISTRATION_BEGIN( Toolkit::SuperBlurView, Toolkit::Control, Create )
 
-PropertyRegistration property1( typeRegistration, "image", Toolkit::SuperBlurView::PROPERTY_IMAGE,   Property::MAP, &SuperBlurView::SetProperty, &SuperBlurView::GetProperty );
+DALI_PROPERTY_REGISTRATION( Toolkit, SuperBlurView, "image", MAP, IMAGE )
+
+DALI_TYPE_REGISTRATION_END()
 
 } // unnamed namespace
 
 SuperBlurView::SuperBlurView( unsigned int blurLevels )
-: Control( CONTROL_BEHAVIOUR_NONE ),
-  mBlurLevels( blurLevels ),
+: Control( ControlBehaviour( DISABLE_SIZE_NEGOTIATION ) ),
+  mTargetSize( Vector2::ZERO ),
   mBlurStrengthPropertyIndex(Property::INVALID_INDEX),
-  mResourcesCleared( true ),
-  mTargetSize( Vector2::ZERO )
+  mBlurLevels( blurLevels ),
+  mResourcesCleared( true )
 {
   DALI_ASSERT_ALWAYS( mBlurLevels > 0 && " Minimal blur level is one, otherwise no blur is needed" );
-  mGaussianBlurView.assign( blurLevels, NULL );
+  mGaussianBlurView.assign( blurLevels, Toolkit::GaussianBlurView() );
   mBlurredImage.assign( blurLevels, FrameBufferImage() );
-  mImageActors.assign( blurLevels + 1, ImageActor() );
+  mRenderers.assign( blurLevels+1, Toolkit::ControlRenderer() );
 }
 
 SuperBlurView::~SuperBlurView()
@@ -134,49 +153,51 @@ Toolkit::SuperBlurView SuperBlurView::New( unsigned int blurLevels )
 
 void SuperBlurView::OnInitialize()
 {
-  mBlurStrengthPropertyIndex = Self().RegisterProperty( "blur-strength",0.f );
+  mBlurStrengthPropertyIndex = Self().RegisterProperty( "blurStrength", 0.f );
 
-  DALI_ASSERT_ALWAYS( mImageActors.size() == mBlurLevels+1 && "must synchronize the ImageActor group if blur levels got changed " );
-  for(unsigned int i=0; i<=mBlurLevels;i++)
-  {
-    mImageActors[i] = ImageActor::New(  );
-    mImageActors[i].SetParentOrigin( ParentOrigin::CENTER );
-    mImageActors[i].SetZ(-static_cast<float>(i)*0.01f);
-    mImageActors[i].SetColorMode( USE_OWN_MULTIPLY_PARENT_ALPHA );
-    Self().Add( mImageActors[i] );
-  }
+  Property::Map rendererMap;
+  rendererMap.Insert( "rendererType", "image");
+
+  Property::Map shaderMap;
+  std::stringstream verterShaderString;
+  shaderMap[ "fragmentShader" ] = FRAGMENT_SHADER;
+  rendererMap.Insert( "shader", shaderMap );
 
-  for(unsigned int i=0; i < mBlurLevels; i++)
+  Toolkit::RendererFactory rendererFactory = Toolkit::RendererFactory::Get();
+  for(unsigned int i=0; i<=mBlurLevels; i++)
   {
-    mImageActors[i].ApplyConstraint( Constraint::New<float>( Actor::COLOR_ALPHA, ParentSource( mBlurStrengthPropertyIndex ), ActorOpacityConstraint(mBlurLevels, i) ) );
+    mRenderers[i] = rendererFactory.GetControlRenderer( rendererMap );
+    mRenderers[i].SetDepthIndex(i);
   }
-
-  Self().SetSize(Stage::GetCurrent().GetSize());
 }
 
 void SuperBlurView::SetImage(Image inputImage)
 {
-  DALI_ASSERT_ALWAYS( mImageActors.size() == mBlurLevels+1 && "must synchronize the ImageActor group if blur levels got changed " );
-  DALI_ASSERT_ALWAYS( mBlurredImage.size() == mBlurLevels && "must synchronize the blurred image group if blur levels got changed " );
+  if( mTargetSize == Vector2::ZERO || mInputImage == inputImage)
+  {
+    return;
+  }
 
   ClearBlurResource();
 
-  mImageActors[0].SetImage( inputImage );
-
-  for(unsigned int i=1; i<=mBlurLevels;i++)
-  {
-    mImageActors[i].SetImage( mBlurredImage[i-1] );
-  }
+  mInputImage = inputImage;
+  Actor self = Self();
+  Toolkit::RendererFactory::Get().ResetRenderer( mRenderers[0], self, mInputImage );
 
   BlurImage( 0,  inputImage);
   for(unsigned int i=1; i<mBlurLevels;i++)
   {
-    BlurImage( i,  mBlurredImage[i-1]);
+    BlurImage( i, mBlurredImage[i-1]);
   }
 
   mResourcesCleared = false;
 }
 
+Image SuperBlurView::GetImage()
+{
+  return mInputImage;
+}
+
 Property::Index SuperBlurView::GetBlurStrengthPropertyIndex() const
 {
   return mBlurStrengthPropertyIndex;
@@ -215,13 +236,13 @@ void SuperBlurView::BlurImage( unsigned int idx, Image image )
                                                            GAUSSIAN_BLUR_DOWNSAMPLE_WIDTH_SCALE, GAUSSIAN_BLUR_DOWNSAMPLE_HEIGHT_SCALE, true );
   mGaussianBlurView[idx].SetParentOrigin(ParentOrigin::CENTER);
   mGaussianBlurView[idx].SetSize(mTargetSize);
+  Stage::GetCurrent().Add( mGaussianBlurView[idx] );
   mGaussianBlurView[idx].SetUserImageAndOutputRenderTarget( image, mBlurredImage[idx] );
+  mGaussianBlurView[idx].ActivateOnce();
   if( idx == mBlurLevels-1 )
   {
     mGaussianBlurView[idx].FinishedSignal().Connect( this, &SuperBlurView::OnBlurViewFinished );
   }
-  Stage::GetCurrent().Add( mGaussianBlurView[idx] );
-  mGaussianBlurView[idx].ActivateOnce();
 }
 
 void SuperBlurView::OnBlurViewFinished( Toolkit::GaussianBlurView blurView )
@@ -240,59 +261,108 @@ void SuperBlurView::ClearBlurResource()
     {
       Stage::GetCurrent().Remove( mGaussianBlurView[i] );
       mGaussianBlurView[i].Deactivate();
-      mGaussianBlurView[i].Reset();
     }
     mResourcesCleared = true;
   }
 }
 
-void SuperBlurView::OnRelayout( const Vector2& size, ActorSizeContainer& container )
+void SuperBlurView::OnSizeSet( const Vector3& targetSize )
 {
-  unsigned int numChildren = Self().GetChildCount();
+  if( mTargetSize != Vector2(targetSize) )
+  {
+    mTargetSize = Vector2(targetSize);
 
-  for( unsigned int i=0; i<numChildren; ++i )
+    Toolkit::RendererFactory rendererFactory = Toolkit::RendererFactory::Get();
+    Actor self = Self();
+    for(unsigned int i=1; i<=mBlurLevels;i++)
+    {
+      float exponent = static_cast<float>(i);
+      mBlurredImage[i-1] = FrameBufferImage::New( mTargetSize.width/std::pow(2.f,exponent) , mTargetSize.height/std::pow(2.f,exponent),
+                                                GAUSSIAN_BLUR_RENDER_TARGET_PIXEL_FORMAT, Dali::Image::NEVER );
+      rendererFactory.ResetRenderer( mRenderers[i], self, mBlurredImage[i-1] );
+    }
+
+    if( mInputImage )
+    {
+      SetImage( mInputImage );
+    }
+
+    if( self.OnStage() )
+    {
+      for(unsigned int i=0; i<=mBlurLevels;i++)
+      {
+        mRenderers[i].SetOnStage( self );
+      }
+    }
+  }
+}
+
+void SuperBlurView::OnStageConnection( int depth )
+{
+  Control::OnStageConnection( depth );
+
+  if( mTargetSize == Vector2::ZERO )
   {
-    Self().GetChildAt(i).SetSize(size);
+    return;
+  }
+
+  Actor self = Self();
+  mRenderers[0].SetOnStage( self );
+  for(unsigned int i=1; i<=mBlurLevels;i++)
+  {
+    mRenderers[i].SetOnStage( self );
+
+    Renderer renderer = self.GetRendererAt( i );
+    Property::Index index = renderer.RegisterProperty( ALPHA_UNIFORM_NAME, 0.f );
+    Constraint constraint = Constraint::New<float>( renderer, index, ActorOpacityConstraint(mBlurLevels, i-1) );
+    constraint.AddSource( Source( self, mBlurStrengthPropertyIndex ) );
+    constraint.Apply();
   }
 }
 
-void SuperBlurView::OnControlSizeSet( const Vector3& targetSize )
+void SuperBlurView::OnStageDisconnection( )
 {
-  if( mTargetSize != Vector2(targetSize) )
+  if( mTargetSize == Vector2::ZERO )
   {
-    mTargetSize = Vector2(targetSize);
+    return;
+  }
 
-    for(unsigned int i=0; i<mBlurLevels;i++)
-    {
-      float exponent = static_cast<float>(i+1);
-      mBlurredImage[i] = FrameBufferImage::New( mTargetSize.width/std::pow(2.f,exponent) , mTargetSize.height/std::pow(2.f,exponent),
-                                                GAUSSIAN_BLUR_RENDER_TARGET_PIXEL_FORMAT, Dali::Image::Never );
-    }
+  Actor self = Self();
+  for(unsigned int i=0; i<mBlurLevels+1;i++)
+  {
+    mRenderers[i].SetOffStage( self );
   }
+
+  Control::OnStageDisconnection();
+}
+
+Vector3 SuperBlurView::GetNaturalSize()
+{
+  if( mInputImage )
+  {
+    return Vector3( mInputImage.GetWidth(), mInputImage.GetHeight(), 0.f );
+  }
+  return Vector3::ZERO;
 }
 
 void SuperBlurView::SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value )
 {
   Toolkit::SuperBlurView superBlurView = Toolkit::SuperBlurView::DownCast( Dali::BaseHandle( object ) );
 
-  if ( superBlurView )
+  if( superBlurView )
   {
     SuperBlurView& superBlurViewImpl( GetImpl( superBlurView ) );
 
-    switch ( propertyIndex )
+    if( propertyIndex == Toolkit::SuperBlurView::Property::IMAGE )
     {
-      case Toolkit::SuperBlurView::PROPERTY_IMAGE:
+      Dali::Image image = Scripting::NewImage( value );
+      if ( image )
+      {
+        superBlurViewImpl.SetImage( image );
+      }
+      else
       {
-        Dali::Image image = Scripting::NewImage( value );
-        if ( image )
-        {
-          superBlurViewImpl.SetImage( image );
-        }
-        else
-        {
-          DALI_LOG_ERROR( "Cannot create image from property value\n" );
-        }
-        break;
+        DALI_LOG_ERROR( "Cannot create image from property value\n" );
       }
     }
   }
@@ -302,24 +372,21 @@ Property::Value SuperBlurView::GetProperty( BaseObject* object, Property::Index
 {
   Property::Value value;
 
-  Toolkit::SuperBlurView pushButton = Toolkit::SuperBlurView::DownCast( Dali::BaseHandle( object ) );
+  Toolkit::SuperBlurView blurView = Toolkit::SuperBlurView::DownCast( Dali::BaseHandle( object ) );
 
-  if ( pushButton )
+  if( blurView )
   {
-    SuperBlurView& superBlurViewImpl( GetImpl( pushButton ) );
+    SuperBlurView& superBlurViewImpl( GetImpl( blurView ) );
 
-    switch ( propertyIndex )
+    if( propertyIndex == Toolkit::SuperBlurView::Property::IMAGE )
     {
-      case Toolkit::SuperBlurView::PROPERTY_IMAGE:
+      Property::Map map;
+      Image inputImage = superBlurViewImpl.GetImage();
+      if( inputImage )
       {
-        Property::Map map;
-        if ( !superBlurViewImpl.mImageActors.empty() && superBlurViewImpl.mImageActors[0] )
-        {
-          Scripting::CreatePropertyMap( superBlurViewImpl.mImageActors[0], map );
-        }
-        value = Property::Value( map );
-        break;
+        Scripting::CreatePropertyMap( inputImage, map );
       }
+      value = Property::Value( map );
     }
   }