X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-impl.h;h=8b0132ef770eeaca5c7a4305eb5a7c9dd2e22233;hp=6105867d20391803be5f196bd083316bf08dc0a6;hb=798ef5fa1591aa78851e9e3d08fe37411192176a;hpb=2ffec8b73989656f70411ef1a99a721b6f86cd14

diff --git a/dali-toolkit/internal/visuals/visual-base-impl.h b/dali-toolkit/internal/visuals/visual-base-impl.h
index 6105867..8b0132e 100644
--- a/dali-toolkit/internal/visuals/visual-base-impl.h
+++ b/dali-toolkit/internal/visuals/visual-base-impl.h
@@ -130,15 +130,15 @@ public:
   int GetDepthIndex() const;
 
   /**
-   * @copydoc Toolkit::Visual::Base::SetOnStage
+   * @copydoc Toolkit::Visual::Base::SetOnScene
    * @pre Impl->mGeometry must be created before this method is called
    */
-  void SetOnStage( Actor& actor );
+  void SetOnScene( Actor& actor );
 
   /**
-   * @copydoc Toolkit::Visual::Base::SetOffStage
+   * @copydoc Toolkit::Visual::Base::SetOffScene
    */
-  void SetOffStage( Actor& actor );
+  void SetOffScene( Actor& actor );
 
   /**
    * @copydoc Toolkit::Visual::Base::CreatePropertyMap
@@ -203,12 +203,6 @@ public:
   void SetMixColor( const Vector3& color );
 
   /**
-   * Gets the mix color of the visual.
-   * @return The mix color
-   */
-  const Vector4& GetMixColor() const;
-
-  /**
    * Animate the property if it exists in the visual or renderer.
    *
    * If it's a visual property such as mix color or a transform property,
@@ -279,8 +273,15 @@ public:
    */
   Toolkit::Visual::Type GetType() const;
 
- protected:
+  /**
+   * @brief Retrieve the property object associated with the property key.
+   *
+   * @param[in] key The Property key of the visual.
+   * @return The Property object
+   */
+  Dali::Property GetPropertyObject(Dali::Property::Key key);
 
+protected:
   /**
    * @brief Constructor.
    *
@@ -293,7 +294,7 @@ public:
   /**
    * @brief A reference counted object may only be deleted by calling Unreference().
    */
-  virtual ~Base();
+  ~Base() override;
 
 protected:
 
@@ -327,20 +328,20 @@ protected:
   virtual void OnSetTransform() = 0;
 
   /**
-   * @brief Called by SetOnStage() allowing sub classes to respond to the SetOnStage event
+   * @brief Called by SetOnScene() allowing sub classes to respond to the SetOnScene event
    *
    * @note The derived class is required to create the renderer, and add it to the actor when all the resources are in place.
    *
    * @param[in] actor The actor applying this visual.
    */
-  virtual void DoSetOnStage( Actor& actor ) = 0;
+  virtual void DoSetOnScene( Actor& actor ) = 0;
 
   /**
-   * @brief Called by SetOffStage() allowing sub classes to respond to the SetOffStage event
+   * @brief Called by SetOffScene() allowing sub classes to respond to the SetOffScene event
    *
    * @param[in] actor The actor applying this visual.
    */
-  virtual void DoSetOffStage( Actor& actor );
+  virtual void DoSetOffScene( Actor& actor );
 
   /**
    * @brief Called by DoAction() allowing sub classes to do the given action.
@@ -350,14 +351,33 @@ protected:
    */
   virtual void OnDoAction( const Property::Index actionId, const Property::Value& attributes );
 
+  /**
+   * @brief Update the shader when some properties are changed.
+   */
+  virtual void UpdateShader()
+  {
+  }
+
+  /**
+   * @brief Called by GetPropertyObject() allowing sub classes to respond to the GetPropertyObject event
+   * @note The derived class is required to register the given property.
+   * @param[in] key The key of the visual's property.
+   * @return The Property object
+   */
+  virtual Dali::Property OnGetPropertyObject(Dali::Property::Key key)
+  {
+    Handle handle;
+    return Dali::Property(handle, Property::INVALID_INDEX);
+  }
+
 protected:
 
   /**
-   * @brief Gets the on stage state for this Visual
+   * @brief Gets the on scene state for this Visual
    *
-   * @return Returns true if this Visual is on stage, false if it is off the stage
+   * @return Returns true if this Visual is on the scene, false if it is off the scene
    */
-  bool IsOnStage() const;
+  bool IsOnScene() const;
 
   /**
    * @brief Query whether the corners of the visual requires to be rounded.
@@ -435,25 +455,6 @@ private:
   void AnimateMixColorProperty( Dali::Animation& transition,
                                 Internal::TransitionData::Animator& animator );
 
-  /**
-   * Set up the right blend mode if the opacity is being animated.
-   * Also ensure that when the animation finishes, the blend mode is
-   * set to the appropriate value. It also uses the target value as
-   * set into mMixColor.
-   *
-   * @param[in] transition The transition to listen to
-   * @param[in] isInitialOpaque Whether the initial value is opaque
-   * @param[in] animating If the transition animates the value.
-   */
-  void SetupBlendMode( Dali::Animation& transition,
-                       bool isInitialOpaque, bool animating );
-
-  /**
-   * When a mix color animation has finished, ensure the blend mode is set back
-   * to the right value for the target opacity.
-   */
-  void OnMixColorFinished( Animation& animation );
-
   // Undefined
   Base( const Visual::Base& visual );