X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fvisuals%2Fcolor%2Fcolor-visual.h;h=bf28d25a410c62c60e0720cc3c51f05a42708fe8;hb=e9ce8b35ce64531e5c6c6214527a5bf9b9747a36;hp=ea02a2d013f707ce10a9b670aa017013f2b6d273;hpb=cc0aefb3259c6fe818d9949ebf768843cc01e6fd;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/visuals/color/color-visual.h b/dali-toolkit/internal/visuals/color/color-visual.h
index ea02a2d..bf28d25 100644
--- a/dali-toolkit/internal/visuals/color/color-visual.h
+++ b/dali-toolkit/internal/visuals/color/color-visual.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_COLOR_VISUAL_H
 
 /*
- * Copyright (c) 2015 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.
@@ -18,8 +18,11 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/intrusive-ptr.h>
+
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/visuals/visual-impl.h>
+#include <dali-toolkit/internal/visuals/visual-base-impl.h>
 
 namespace Dali
 {
@@ -30,6 +33,9 @@ namespace Toolkit
 namespace Internal
 {
 
+class ColorVisual;
+typedef IntrusivePtr< ColorVisual > ColorVisualPtr;
+
 /**
  * The visual which renders a solid color to the control's quad
  *
@@ -39,11 +45,34 @@ namespace Internal
  * |-----------------|-------------|
  * | mixColor        | VECTOR4     |
  */
-class ColorVisual: public Visual
+class ColorVisual: public Visual::Base
 {
 public:
 
   /**
+   * @brief Create a new color visual.
+   *
+   * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+   * @param[in] properties A Property::Map containing settings for this visual
+   * @return A smart-pointer to the newly allocated visual.
+   */
+  static ColorVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties );
+
+public:  // from Visual
+
+  /**
+   * @copydoc Visual::Base::CreatePropertyMap
+   */
+  void DoCreatePropertyMap( Property::Map& map ) const override;
+
+  /**
+   * @copydoc Visual::Base::CreateInstancePropertyMap
+   */
+  void DoCreateInstancePropertyMap( Property::Map& map ) const override;
+
+protected:
+
+  /**
    * @brief Constructor.
    *
    * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
@@ -55,47 +84,40 @@ public:
    */
   virtual ~ColorVisual();
 
-public:  // from Visual
-
   /**
-   * @copydoc Visual::SetSize
+   * @copydoc Visual::Base::DoSetProperties
    */
-  virtual void SetSize( const Vector2& size );
+  void DoSetProperties( const Property::Map& propertyMap ) override;
 
   /**
-   * @copydoc Visual::SetClipRect
+   * @copydoc Visual::Base::DoSetOnScene
    */
-  virtual void SetClipRect( const Rect<int>& clipRect );
+  void DoSetOnScene( Actor& actor ) override;
 
   /**
-   * @copydoc Visual::SetOffset
+   * @copydoc Visual::Base::DoSetOffScene
    */
-  virtual void SetOffset( const Vector2& offset );
+  void DoSetOffScene(Actor& actor) override;
 
   /**
-   * @copydoc Visual::CreatePropertyMap
+   * @copydoc Visual::Base::OnSetTransform
    */
-  virtual void DoCreatePropertyMap( Property::Map& map ) const;
-
-protected:
+  void OnSetTransform() override;
 
   /**
-   * @copydoc Visual::DoInitialize
+   * @copydoc Visual::Base::OnDoAction
    */
-  virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap );
+  void OnDoAction( const Property::Index actionId, const Property::Value& attributes ) override;
 
   /**
-   * @copydoc Visual::DoSetOnStage
+   * @copydoc Visual::Base::UpdateShader
    */
-  virtual void DoSetOnStage( Actor& actor );
-
-public:
+  void UpdateShader() override;
 
   /**
-   * Set the color for rendering.
-   * @param[in] color The color to be rendered.
+   * @copydoc Visual::Base::OnGetPropertyObject
    */
-  void SetColor( const Vector4& color );
+  Dali::Property OnGetPropertyObject(Dali::Property::Key key) override;
 
 private:
   /**
@@ -103,6 +125,12 @@ private:
    */
   void InitializeRenderer();
 
+  /**
+   * @brief Get a shader for the current properties.
+   * @return The shader for the current properties.
+   */
+  Shader GetShader();
+
 private:
 
   // Undefined
@@ -112,10 +140,10 @@ private:
   ColorVisual& operator=( const ColorVisual& colorRenderer );
 
 private:
-
-  Vector4 mMixColor;
-  Property::Index mMixColorIndex;
-
+  float           mBlurRadius;          ///< The blur radius
+  Property::Index mBlurRadiusIndex;     ///< The blur radius property index
+  bool            mRenderIfTransparent; ///< Whether we should render even if the mix-color is transparent.
+  bool            mNeedBlurRadius;      ///< Whether we need the blur radius in shader.
 };
 
 } // namespace Internal