(VectorAnimation) Add a function to change a Renderer

Change-Id: Ib446d1144ba78951be4961115c55800bf69d4ff5

diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h b/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h
index bb4ef856703a1f287dc410276d6fbca25918b376..61544cab162b3680004966022acdc2101ecb2273 100644 (file)
--- a/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h
+++ b/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h
@@ -45,15 +45,18 @@ public:
   virtual ~VectorAnimationRendererPlugin() {}
 
   /**
-   * @brief Creates a renderer to render an vector animation file.
+   * @brief Sets the url of the animation file.
    *
-   * @param[in] url The url of an animation file
-   * @param[in] renderer The renderer used to render the image
-   * @param[in] width The target image width
-   * @param[in] height The target image height
-   * @return True if the renderer is successfully created, false otherwise
+   * @param[in] url The url of the animation file
+   */
+  virtual void SetUrl( const std::string& url ) = 0;
+
+  /**
+   * @brief Sets the renderer used to display the result image.
+   *
+   * @param[in] renderer The renderer used to display the result image
    */
-  virtual bool CreateRenderer( const std::string& url, Renderer renderer, uint32_t width, uint32_t height ) = 0;
+  virtual void SetRenderer( Renderer renderer ) = 0;
 
   /**
    * @brief Sets the target image size.

diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp b/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp
index 8daaba2d4f66eb96074b5923b490e7235db53e54..b1b9e74085f8702c100b37ad1f2b559ab3d1afc5 100755 (executable)
--- a/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp
+++ b/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp
@@ -24,12 +24,12 @@
 namespace Dali
 {
 
-VectorAnimationRenderer VectorAnimationRenderer::New( const std::string& url, Renderer renderer, uint32_t width, uint32_t height )
+VectorAnimationRenderer VectorAnimationRenderer::New( const std::string& url )
 {
   Internal::Adaptor::VectorAnimationRendererPtr animationRenderer = Internal::Adaptor::VectorAnimationRenderer::New();
   if( animationRenderer )
   {
-    animationRenderer->Initialize( url, renderer, width, height );
+    animationRenderer->Initialize( url );
   }
 
   return VectorAnimationRenderer( animationRenderer.Get() );
@@ -59,6 +59,11 @@ VectorAnimationRenderer& VectorAnimationRenderer::operator=( const VectorAnimati
   return *this;
 }
 
+void VectorAnimationRenderer::SetRenderer( Renderer renderer )
+{
+  GetImplementation( *this ).SetRenderer( renderer );
+}
+
 void VectorAnimationRenderer::SetSize( uint32_t width, uint32_t height )
 {
   GetImplementation( *this ).SetSize( width, height );

diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer.h b/dali/devel-api/adaptor-framework/vector-animation-renderer.h
index f769073082d4783060e5f989f5e7fd8907e1f264..64603a5b34f383523946ea835d91f850b4d2ca27 100755 (executable)
--- a/dali/devel-api/adaptor-framework/vector-animation-renderer.h
+++ b/dali/devel-api/adaptor-framework/vector-animation-renderer.h
@@ -51,12 +51,9 @@ public:
    * @brief Creates an initialized handle to a new VectorAnimationRenderer.
    *
    * @param[in] url The url of the vector animation file
-   * @param[in] renderer The renderer used to render the image
-   * @param[in] width The width of the content
-   * @param[in] height The height of the content
    * @return A handle to a newly allocated VectorAnimationRenderer
    */
-  static VectorAnimationRenderer New( const std::string& url, Renderer renderer, uint32_t width, uint32_t height );
+  static VectorAnimationRenderer New( const std::string& url );
 
   /**
    * @brief Creates an empty handle.
@@ -84,6 +81,13 @@ public:
    */
   VectorAnimationRenderer& operator=( const VectorAnimationRenderer& rhs );
 
+  /**
+   * @brief Sets the renderer used to display the result image.
+   *
+   * @param[in] renderer The renderer used to display the result image
+   */
+  void SetRenderer( Renderer renderer );
+
   /**
    * @brief Sets the target image size.
    *

diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp b/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp
index f2e46e30f3f6be70b2d6ed3132b060c16a9d99f6..de8140d6894dff4921f289bc381110b03cf7644e 100644 (file)
--- a/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp
+++ b/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp
@@ -60,9 +60,14 @@ VectorAnimationRenderer::~VectorAnimationRenderer()
 {
 }
 
-void VectorAnimationRenderer::Initialize( const std::string& url, Dali::Renderer renderer, uint32_t width, uint32_t height )
+void VectorAnimationRenderer::Initialize( const std::string& url )
 {
-  mPlugin.CreateRenderer( url, renderer, width, height );
+  mPlugin.SetUrl( url );
+}
+
+void VectorAnimationRenderer::SetRenderer( Dali::Renderer renderer )
+{
+  mPlugin.SetRenderer( renderer );
 }
 
 void VectorAnimationRenderer::SetSize( uint32_t width, uint32_t height )

diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-impl.h b/dali/internal/vector-animation/common/vector-animation-renderer-impl.h
index 5e8e80dba1468bdf9750c8659ef489f450e11df9..a21cf7fbdbeae458bba09cc80c0e9609244467df 100755 (executable)
--- a/dali/internal/vector-animation/common/vector-animation-renderer-impl.h
+++ b/dali/internal/vector-animation/common/vector-animation-renderer-impl.h
@@ -54,7 +54,12 @@ public:
   /**
    * @brief Initializes member data.
    */
-  void Initialize( const std::string& url, Dali::Renderer renderer, uint32_t width, uint32_t height );
+  void Initialize( const std::string& url );
+
+  /**
+   * @copydoc Dali::VectorAnimationRenderer::SetRenderer()
+   */
+  void SetRenderer( Dali::Renderer renderer );
 
   /**
    * @copydoc Dali::VectorAnimationRenderer::SetSize()

diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp
index b2134781487e22b08c45f6ccc1281be9ccb2344c..2860f42019a7e71e929cfe56c5d999e5ecf65703 100644 (file)
--- a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp
+++ b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp
@@ -100,13 +100,20 @@ void VectorAnimationRendererPluginProxy::Initialize()
   }
 }
 
-bool VectorAnimationRendererPluginProxy::CreateRenderer( const std::string& url, Dali::Renderer renderer, uint32_t width, uint32_t height )
+void VectorAnimationRendererPluginProxy::SetUrl( const std::string& url )
 {
   if( mPlugin )
   {
-    return mPlugin->CreateRenderer( url, renderer, width, height );
+    mPlugin->SetUrl( url );
+  }
+}
+
+void VectorAnimationRendererPluginProxy::SetRenderer( Dali::Renderer renderer )
+{
+  if( mPlugin )
+  {
+    mPlugin->SetRenderer( renderer );
   }
-  return false;
 }
 
 void VectorAnimationRendererPluginProxy::SetSize( uint32_t width, uint32_t height )

diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h
index 2fc4e05f3d07d1d553e4dac931fd208be50a803e..fe2f636259715d6f33742ec658bc0ea151f2fb4e 100644 (file)
--- a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h
+++ b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h
@@ -48,9 +48,14 @@ public:
   ~VectorAnimationRendererPluginProxy();
 
   /**
-   * @copydoc Dali::VectorAnimationRendererPlugin::CreateRenderer()
+   * @copydoc Dali::VectorAnimationRendererPlugin::SetUrl()
    */
-  bool CreateRenderer( const std::string& url, Dali::Renderer renderer, uint32_t width, uint32_t height );
+  void SetUrl( const std::string& url );
+
+  /**
+   * @copydoc Dali::VectorAnimationRendererPlugin::SetRenderer()
+   */
+  void SetRenderer( Dali::Renderer renderer );
 
   /**
    * @copydoc Dali::VectorAnimationRendererPlugin::SetSize()