shader effect removal - cleanup of the API

Requires https://review.tizen.org/gerrit/#/c/25535/

[Problem]
[Cause]
[Solution]

Change-Id: I83afd41ddf7ce481a9c72dedf8bf9597f3f4b409

diff --git a/dali/internal/event/actor-attachments/renderable-attachment-impl.h b/dali/internal/event/actor-attachments/renderable-attachment-impl.h
index 4c48c8a..c2755e8 100644 (file)
--- a/dali/internal/event/actor-attachments/renderable-attachment-impl.h
+++ b/dali/internal/event/actor-attachments/renderable-attachment-impl.h
@@ -24,6 +24,7 @@
 #include <dali/internal/common/blending-options.h>
 #include <dali/internal/common/image-sampler.h>
 #include <dali/internal/event/actor-attachments/actor-attachment-impl.h>
+#include <dali/internal/event/effects/shader-declarations.h>
 
 namespace Dali
 {
@@ -35,8 +36,6 @@ namespace SceneGraph
 {
 class RenderableAttachment;
 }
-class ShaderEffect;
-typedef IntrusivePtr<ShaderEffect> ShaderEffectPtr;
 
 /**
  * An base class for renderable actor attachments

diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp
index ecba89e..cdb8105 100644 (file)
--- a/dali/internal/event/actors/actor-impl.cpp
+++ b/dali/internal/event/actors/actor-impl.cpp
@@ -41,7 +41,6 @@
 #include <dali/internal/event/actor-attachments/actor-attachment-impl.h>
 #include <dali/internal/event/animation/constraint-impl.h>
 #include <dali/internal/event/common/projection.h>
-#include <dali/internal/event/effects/shader-effect-impl.h>
 #include <dali/internal/update/common/animatable-property.h>
 #include <dali/internal/update/common/property-owner-messages.h>
 #include <dali/internal/update/nodes/node-messages.h>
@@ -1115,20 +1114,6 @@ const Vector3& Actor::GetCurrentSize() const
   return Vector3::ZERO;
 }
 
-void Actor::SetShaderEffect(ShaderEffect& effect)
-{
-  // no-op on an Actor
-}
-
-ShaderEffectPtr Actor::GetShaderEffect() const
-{
-  return ShaderEffectPtr();
-}
-
-void Actor::RemoveShaderEffect()
-{
-}
-
 #ifdef DYNAMICS_SUPPORT
 
 //--------------- Dynamics ---------------

diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h
index e5de95b..b2f75a8 100644 (file)
--- a/dali/internal/event/actors/actor-impl.h
+++ b/dali/internal/event/actors/actor-impl.h
@@ -52,8 +52,6 @@ namespace Internal
 class Actor;
 class ActorGestureData;
 class RenderTask;
-class ShaderEffect;
-typedef IntrusivePtr<ShaderEffect>            ShaderEffectPtr;
 struct DynamicsData;
 
 typedef IntrusivePtr<Actor>                   ActorPtr;
@@ -617,31 +615,6 @@ public:
     return mSensitive;
   }
 
-  // Shader effects, these are virtual so that RenderableActor can override the behaviour.
-  // Default actor behaviour is to do nothing, but the API is kept in Actor for convenience.
-
-  /**
-   * @todo remove when API is cleaned up
-   * Sets the shader effect for the Actor.
-   * Shader effects provide special effects like rippling and bending.
-   * Setting a shader effect removes any shader effect previously set by SetShaderEffect.
-   * @param [in] effect The shader effect.
-   */
-  virtual void SetShaderEffect(ShaderEffect& effect);
-
-  /**
-   * @todo remove when API is cleaned up
-   * Retrieve the shader effect for the Actor.
-   * @return The shader effect
-   */
-  virtual ShaderEffectPtr GetShaderEffect() const;
-
-  /**
-   * @todo remove when API is cleaned up
-   * Removes the current shader effect.
-   */
-  virtual void RemoveShaderEffect();
-
   /**
    * @copydoc Dali::Actor::SetDrawMode
    */

diff --git a/dali/internal/event/actors/renderable-actor-impl.h b/dali/internal/event/actors/renderable-actor-impl.h
index 8f7ef6e..025166e 100644 (file)
--- a/dali/internal/event/actors/renderable-actor-impl.h
+++ b/dali/internal/event/actors/renderable-actor-impl.h
@@ -22,6 +22,7 @@
 #include <dali/public-api/actors/renderable-actor.h>
 #include <dali/public-api/common/dali-common.h>
 #include <dali/internal/event/actors/actor-impl.h>
+#include <dali/internal/event/effects/shader-declarations.h>
 
 namespace Dali
 {

diff --git a/dali/public-api/actors/actor.cpp b/dali/public-api/actors/actor.cpp
index 58214dd..6bb0eb5 100644 (file)
--- a/dali/public-api/actors/actor.cpp
+++ b/dali/public-api/actors/actor.cpp
@@ -22,7 +22,6 @@
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/shader-effects/shader-effect.h>
 #include <dali/public-api/math/degree.h>
 #include <dali/public-api/math/radian.h>
 #include <dali/public-api/math/vector2.h>
@@ -31,7 +30,6 @@
 #include <dali/internal/event/actors/layer-impl.h>
 #include <dali/internal/event/actor-attachments/actor-attachment-impl.h>
 #include <dali/internal/event/animation/constraint-impl.h>
-#include <dali/internal/event/effects/shader-effect-impl.h>
 
 #include <dali/public-api/dynamics/dynamics-body.h>
 #include <dali/public-api/dynamics/dynamics-joint.h>
@@ -432,37 +430,6 @@ Vector4 Actor::GetCurrentWorldColor() const
   return GetImplementation(*this).GetCurrentWorldColor();
 }
 
-void Actor::SetInheritShaderEffect(bool inherit)
-{
-  // TODO remove this API
-  // @deprecated
-}
-
-bool Actor::GetInheritShaderEffect() const
-{
-  // TODO remove this API
-  // @deprecated
-  return false;
-}
-
-void Actor::SetShaderEffect(ShaderEffect effect)
-{
-  // TODO remove this API
-  GetImplementation(*this).SetShaderEffect(GetImplementation(effect));
-}
-
-ShaderEffect Actor::GetShaderEffect() const
-{
-  // TODO remove this API
-  return ShaderEffect();
-}
-
-void Actor::RemoveShaderEffect()
-{
-  // TODO remove this API
-  GetImplementation(*this).RemoveShaderEffect();
-}
-
 void Actor::SetDrawMode( DrawMode::Type drawMode )
 {
   GetImplementation(*this).SetDrawMode( drawMode );

diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h
index 2b48505..1634e82 100644 (file)
--- a/dali/public-api/actors/actor.h
+++ b/dali/public-api/actors/actor.h
@@ -48,7 +48,6 @@ class DynamicsJoint;
 class Quaternion;
 class Layer;
 struct Radian;
-class ShaderEffect;
 struct KeyEvent;
 struct TouchEvent;
 struct MouseWheelEvent;
@@ -987,41 +986,6 @@ public:
    */
   Vector4 GetCurrentWorldColor() const;
 
-  // Shader Effects
-
-  /**
-   * @deprecated call Set/RemoveShaderEffectRecursively if you want to apply the same shader for a tree of actors
-   *
-   * @param [in] ignored
-   */
-  void SetInheritShaderEffect(bool ignored);
-
-  /**
-   * @deprecated functionality no longer supported
-   *
-   * @return false
-   */
-  bool GetInheritShaderEffect() const;
-
-  /**
-   * @deprecated you need to call RenderableActor::SetShaderEffect
-   *
-   * @param [in] effect The shader effect.
-   */
-  void SetShaderEffect(ShaderEffect effect);
-
-  /**
-   * @deprecated you need to call RenderableActor::GetShaderEffect
-   *
-   * @return The shader effect
-   */
-  ShaderEffect GetShaderEffect() const;
-
-  /**
-   * @deprecated you need to call RenderableActor::GetShaderEffect
-   */
-  void RemoveShaderEffect();
-
   /**
    * @brief Set how the actor and its children should be drawn.
    *

diff --git a/dali/public-api/actors/renderable-actor.h b/dali/public-api/actors/renderable-actor.h
index 8206c25..a383d22 100644 (file)
--- a/dali/public-api/actors/renderable-actor.h
+++ b/dali/public-api/actors/renderable-actor.h
@@ -31,6 +31,8 @@ namespace Internal DALI_INTERNAL
 class RenderableActor;
 }
 
+class ShaderEffect;
+
 /**
  * @brief Face culling modes.
  */