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=bf28d25a410c62c60e0720cc3c51f05a42708fe8;hp=ebe2768d99235c4c4e673617a142f4a5e7ae8d3d;hb=798ef5fa1591aa78851e9e3d08fe37411192176a;hpb=89ae5b785c2eb8276d5fb350004414bc3fab8a2d

diff --git a/dali-toolkit/internal/visuals/color/color-visual.h b/dali-toolkit/internal/visuals/color/color-visual.h
index ebe2768..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) 2016 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.
@@ -53,16 +53,22 @@ 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 );
+  static ColorVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties );
 
 public:  // from Visual
 
   /**
    * @copydoc Visual::Base::CreatePropertyMap
    */
-  virtual void DoCreatePropertyMap( Property::Map& map ) const;
+  void DoCreatePropertyMap( Property::Map& map ) const override;
+
+  /**
+   * @copydoc Visual::Base::CreateInstancePropertyMap
+   */
+  void DoCreateInstancePropertyMap( Property::Map& map ) const override;
 
 protected:
 
@@ -81,25 +87,37 @@ protected:
   /**
    * @copydoc Visual::Base::DoSetProperties
    */
-  virtual void DoSetProperties( const Property::Map& propertyMap );
+  void DoSetProperties( const Property::Map& propertyMap ) override;
 
   /**
-   * @copydoc Visual::Base::DoSetOnStage
+   * @copydoc Visual::Base::DoSetOnScene
    */
-  virtual void DoSetOnStage( Actor& actor );
+  void DoSetOnScene( Actor& actor ) override;
+
+  /**
+   * @copydoc Visual::Base::DoSetOffScene
+   */
+  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;
+
+  /**
+   * @copydoc Visual::Base::OnGetPropertyObject
+   */
+  Dali::Property OnGetPropertyObject(Dali::Property::Key key) override;
 
 private:
   /**
@@ -107,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
@@ -116,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