X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffilters%2Fblur-two-pass-filter.h;h=8ff681aaac0d633cc336bdc091aaa57385f28e78;hp=1e723b942d52e4f1472bdfedd8cefd7bf205c68c;hb=0e1683ef848d1d877e26633609fa95e0d2ab36b5;hpb=4b38b709efae6ba534f7d336b70dabb74c804e03

diff --git a/dali-toolkit/internal/filters/blur-two-pass-filter.h b/dali-toolkit/internal/filters/blur-two-pass-filter.h
index 1e723b9..8ff681a 100644
--- a/dali-toolkit/internal/filters/blur-two-pass-filter.h
+++ b/dali-toolkit/internal/filters/blur-two-pass-filter.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H__
-#define __DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H__
+#ifndef DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H
+#define DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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,10 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/actors/camera-actor.h>
-#include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/render-tasks/render-task.h>
-#include <dali/public-api/shader-effects/shader-effect.h>
 
 // INTERNAL INCLUDES
 #include "image-filter.h"
@@ -55,16 +52,16 @@ public:
 
 public: // From ImageFilter
   /// @copydoc Dali::Toolkit::Internal::ImageFilter::Enable
-  virtual void Enable();
+  void Enable() override;
 
   /// @copydoc Dali::Toolkit::Internal::ImageFilter::Disable
-  virtual void Disable();
+  void Disable() override;
 
   /// @copydoc Dali::Toolkit::Internal::ImageFilter::Refresh
-  virtual void Refresh();
+  void Refresh() override;
 
   /// @copydoc Dali::Toolkit::Internal::ImageFilter::SetSize
-  virtual void SetSize( const Vector2& size );
+  void SetSize( const Vector2& size ) override;
 
   /**
    * Get the property index that controls the strength of the blur applied to the image. Useful for animating this property.
@@ -79,10 +76,6 @@ public: // From ImageFilter
   Handle GetHandleForAnimateBlurStrength();
 
 private:
-  /**
-   * Setup position and parameters for camera
-   */
-  void SetupCamera();
 
   /**
    * Setup render tasks for blur
@@ -95,26 +88,21 @@ private:
 
 private: // Attributes
 
-  CameraActor      mCameraForBlur;
-
-  // To perform horizontal blur from mInputImage to mImageForHorz
-  RenderTask       mRenderTaskForHorz;
-  ImageActor       mActorForInput;
-  FrameBufferImage mImageForHorz;
-  ShaderEffect     mShaderForHorz;
+  // To perform horizontal blur from mInputTexture to mFrameBufferForHorz
+  RenderTask         mRenderTaskForHorz;
+  Actor              mActorForInput;
+  FrameBuffer        mFrameBufferForHorz;
 
-  // To perform vertical blur from mImageForHorz to mOutputImage
-  RenderTask       mRenderTaskForVert;
-  ImageActor       mActorForHorz;
-  ShaderEffect     mShaderForVert;
-  FrameBufferImage mBlurredImage;
+  // To perform vertical blur from mFrameBufferForHorz to mOutputFrameBuffer
+  RenderTask         mRenderTaskForVert;
+  Actor              mActorForHorz;
+  FrameBuffer        mBlurredFrameBuffer;
 
   // To blend the blurred image and input image according to the blur strength
-  RenderTask       mRenderTaskForBlending;
-  ImageActor       mActorForBlending;
-  Actor            mRootActorForBlending;
-  ShaderEffect     mShaderForBlending;
-  Property::Index  mBlurStrengthPropertyIndex;
+  RenderTask         mRenderTaskForBlending;
+  Actor              mActorForBlending;
+  Actor              mRootActorForBlending;
+  Property::Index    mBlurStrengthPropertyIndex;
 
 }; // class BlurTwoPassFilter
 
@@ -124,5 +112,5 @@ private: // Attributes
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H__
+#endif // DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H