(Vector) GetMarkerInfo method

Change-Id: Ic3b29173e7a19bd10e0f0b77ceba1801c0564478

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 1a31f23..c7b0011 100644 (file)
--- a/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h
+++ b/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h
@@ -114,6 +114,21 @@ public:
   virtual void GetLayerInfo( Property::Map& map ) const = 0;
 
   /**
+   * @brief Gets the start frame and the end frame number of the composition marker.
+   *
+   * @param[in] marker The composition marker of the file
+   * @param[out] startFrame The start frame number of the specified marker
+   * @param[out] endFrame The end frame number of the specified marker
+   * @return True if the marker is found in the file, false otherwise.
+   *
+   * @note https://helpx.adobe.com/after-effects/using/layer-markers-composition-markers.html
+   * Markers exported from AfterEffect are used to describe a segment of an animation {comment/tag , startFrame, endFrame}
+   * Marker can be use to devide a resource in to separate animations by tagging the segment with comment string,
+   * start frame and duration of that segment.
+   */
+  virtual bool GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const = 0;
+
+  /**
    * @brief Connect to this signal to be notified when the texture upload is completed.
    *
    * @return The signal to connect to.

diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp b/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp
index bf61154..9cd05ad 100755 (executable)
--- a/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp
+++ b/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp
@@ -99,6 +99,11 @@ void VectorAnimationRenderer::GetLayerInfo( Property::Map& map ) const
   GetImplementation( *this ).GetLayerInfo( map );
 }
 
+bool VectorAnimationRenderer::GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const
+{
+  return GetImplementation( *this ).GetMarkerInfo( marker, startFrame, endFrame );
+}
+
 VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::UploadCompletedSignal()
 {
   return GetImplementation( *this ).UploadCompletedSignal();

diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer.h b/dali/devel-api/adaptor-framework/vector-animation-renderer.h
index af01253..0e2f14a 100755 (executable)
--- a/dali/devel-api/adaptor-framework/vector-animation-renderer.h
+++ b/dali/devel-api/adaptor-framework/vector-animation-renderer.h
@@ -141,6 +141,21 @@ public:
    */
   void GetLayerInfo( Property::Map& map ) const;
 
+  /**
+   * @brief Gets the start frame and the end frame number of the composition marker.
+   *
+   * @param[in] marker The composition marker of the file
+   * @param[out] startFrame The start frame number of the specified marker
+   * @param[out] endFrame The end frame number of the specified marker
+   * @return True if the marker is found in the file, false otherwise.
+   *
+   * @note https://helpx.adobe.com/after-effects/using/layer-markers-composition-markers.html
+   * Markers exported from AfterEffect are used to describe a segment of an animation {comment/tag , startFrame, endFrame}
+   * Marker can be use to devide a resource in to separate animations by tagging the segment with comment string,
+   * start frame and duration of that segment.
+   */
+  bool GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const;
+
 public: // Signals
 
   /**

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 a677418..1b76ff3 100644 (file)
--- a/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp
+++ b/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp
@@ -105,6 +105,11 @@ void VectorAnimationRenderer::GetLayerInfo( Property::Map& map ) const
   mPlugin.GetLayerInfo( map );
 }
 
+bool VectorAnimationRenderer::GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const
+{
+  return mPlugin.GetMarkerInfo( marker, startFrame, endFrame );
+}
+
 Dali::VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::UploadCompletedSignal()
 {
   return mPlugin.UploadCompletedSignal();

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 9d9aee5..b635683 100755 (executable)
--- a/dali/internal/vector-animation/common/vector-animation-renderer-impl.h
+++ b/dali/internal/vector-animation/common/vector-animation-renderer-impl.h
@@ -97,6 +97,11 @@ public:
   void GetLayerInfo( Property::Map& map ) const;
 
   /**
+   * @copydoc Dali::VectorAnimationRenderer::GetMarkerInfo()
+   */
+  bool GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const;
+
+  /**
    * @copydoc Dali::VectorAnimationRenderer::UploadCompletedSignal()
    */
   Dali::VectorAnimationRenderer::UploadCompletedSignalType& UploadCompletedSignal();

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 e171c8e..6eae9bf 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
@@ -177,6 +177,15 @@ void VectorAnimationRendererPluginProxy::GetLayerInfo( Property::Map& map ) cons
   }
 }
 
+bool VectorAnimationRendererPluginProxy::GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const
+{
+  if( mPlugin )
+  {
+    return mPlugin->GetMarkerInfo( marker, startFrame, endFrame );
+  }
+  return false;
+}
+
 VectorAnimationRendererPlugin::UploadCompletedSignalType& VectorAnimationRendererPluginProxy::UploadCompletedSignal()
 {
   if( mPlugin )

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 ed1e6d0..1480aca 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
@@ -93,6 +93,11 @@ public:
   void GetLayerInfo( Property::Map& map ) const;
 
   /**
+   * @copydoc Dali::VectorAnimationRendererPlugin::GetMarkerInfo()
+   */
+  bool GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const;
+
+  /**
    * @copydoc Dali::VectorAnimationRendererPlugin::UploadCompletedSignal()
    */
   VectorAnimationRendererPlugin::UploadCompletedSignalType& UploadCompletedSignal();