X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fcolor%2Fcolor-visual.h;h=6ced771106c0032e03818a05fb5d3c34b0b17b8f;hp=d2f3ebeb6926b8a88bb887090ba2ab06f7a2aa73;hb=abf5d9bb2bc8c3db867355573bdf8c27389dcf23;hpb=140fc4e567fa70d1fac89b50cf67b530a4dae0af

diff --git a/dali-toolkit/internal/visuals/color/color-visual.h b/dali-toolkit/internal/visuals/color/color-visual.h
index d2f3ebe..6ced771 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) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -26,15 +26,12 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal
 {
-
 class ColorVisual;
-typedef IntrusivePtr< ColorVisual > ColorVisualPtr;
+typedef IntrusivePtr<ColorVisual> ColorVisualPtr;
 
 /**
  * The visual which renders a solid color to the control's quad
@@ -45,48 +42,36 @@ typedef IntrusivePtr< ColorVisual > ColorVisualPtr;
  * |-----------------|-------------|
  * | mixColor        | VECTOR4     |
  */
-class ColorVisual: public Visual::Base
+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 );
-
-public:  // from Visual
-
-  /**
-   * @copydoc Visual::Base::SetSize
-   */
-  virtual void SetSize( const Vector2& size );
+  static ColorVisualPtr New(VisualFactoryCache& factoryCache, const Property::Map& properties);
 
+public: // from Visual
   /**
    * @copydoc Visual::Base::CreatePropertyMap
    */
-  virtual void DoCreatePropertyMap( Property::Map& map ) const;
-
-  /**
-   * @copydoc Visual::Base::DoSetProperty
-   */
-  virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
+  void DoCreatePropertyMap(Property::Map& map) const override;
 
   /**
-   * @copydoc Visual::Base::DoGetProperty
+   * @copydoc Visual::Base::CreateInstancePropertyMap
    */
-  virtual Dali::Property::Value DoGetProperty( Dali::Property::Index index );
+  void DoCreateInstancePropertyMap(Property::Map& map) const override;
 
 protected:
-
   /**
    * @brief Constructor.
    *
    * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
    */
-  ColorVisual( VisualFactoryCache& factoryCache );
+  ColorVisual(VisualFactoryCache& factoryCache);
 
   /**
    * @brief A reference counted object may only be deleted by calling Unreference().
@@ -94,47 +79,61 @@ protected:
   virtual ~ColorVisual();
 
   /**
+   * @copydoc Visual::Base::OnInitialize
+   */
+  void OnInitialize() override;
+
+  /**
    * @copydoc Visual::Base::DoSetProperties
    */
-  virtual void DoSetProperties( const Property::Map& propertyMap );
+  void DoSetProperties(const Property::Map& propertyMap) override;
+
+  /**
+   * @copydoc Visual::Base::DoSetOnScene
+   */
+  void DoSetOnScene(Actor& actor) override;
 
   /**
-   * @copydoc Visual::Base::DoSetOnStage
+   * @copydoc Visual::Base::DoSetOffScene
    */
-  virtual void DoSetOnStage( Actor& actor );
+  void DoSetOffScene(Actor& actor) override;
 
   /**
    * @copydoc Visual::Base::OnSetTransform
    */
-  virtual void OnSetTransform();
+  void OnSetTransform() override;
 
-public:
+  /**
+   * @copydoc Visual::Base::OnDoAction
+   */
+  void OnDoAction(const Property::Index actionId, const Property::Value& attributes) override;
 
   /**
-   * Set the color for rendering.
-   * @param[in] color The color to be rendered.
+   * @copydoc Visual::Base::UpdateShader
    */
-  void SetColor( const Vector4& color );
+  void UpdateShader() override;
 
-private:
   /**
-   * @brief Initialize the renderer with the geometry and shader from the cache, if not available, create and save to the cache for sharing.
+   * @copydoc Visual::Base::GenerateShader
    */
-  void InitializeRenderer();
+  Shader GenerateShader() const override;
 
-private:
+  /**
+   * @copydoc Visual::Base::OnGetPropertyObject
+   */
+  Dali::Property OnGetPropertyObject(Dali::Property::Key key) override;
 
+private:
   // Undefined
-  ColorVisual( const ColorVisual& colorRenderer );
+  ColorVisual(const ColorVisual& colorRenderer);
 
   // Undefined
-  ColorVisual& operator=( const ColorVisual& colorRenderer );
+  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            mAlwaysUsingBlurRadius : 1; ///< Whether we need the blur radius in shader always.
 };
 
 } // namespace Internal