(Vector) Change properties to get frame numbers

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / animated-vector-image / animated-vector-image-visual.cpp

diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
index e693fd1..fbb727b 100644 (file)
--- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
+++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
@@ -56,6 +56,10 @@ enum Flags
   RESEND_LOOP_COUNT  = 1 << 1
 };
 
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gVectorAnimationLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_VECTOR_ANIMATION" );
+#endif
+
 } // unnamed namespace
 
 AnimatedVectorImageVisualPtr AnimatedVectorImageVisual::New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties )
@@ -79,9 +83,10 @@ AnimatedVectorImageVisual::AnimatedVectorImageVisual( VisualFactoryCache& factor
   mUrl( imageUrl ),
   mVectorRasterizeThread( imageUrl.GetUrl() ),
   mVisualSize(),
-  mPlayRange( 0.0f, 1.0f ),
   mPlacementActor(),
   mLoopCount( LOOP_FOREVER ),
+  mStartFrame( 0 ),
+  mEndFrame( 0 ),
   mResendFlag( 0 ),
   mActionStatus( DevelAnimatedVectorImageVisual::Action::STOP )
 {
@@ -130,9 +135,15 @@ void AnimatedVectorImageVisual::DoCreatePropertyMap( Property::Map& map ) const
     map.Insert( Toolkit::ImageVisual::Property::URL, mUrl.GetUrl() );
   }
   map.Insert( Toolkit::DevelImageVisual::Property::LOOP_COUNT, mLoopCount );
-  map.Insert( Toolkit::DevelImageVisual::Property::PLAY_RANGE, mPlayRange );
+
+  Property::Array playRange;
+  playRange.PushBack( mStartFrame );
+  playRange.PushBack( mEndFrame );
+  map.Insert( Toolkit::DevelImageVisual::Property::PLAY_RANGE, playRange );
+
   map.Insert( Toolkit::DevelImageVisual::Property::PLAY_STATE, static_cast< int >( mVectorRasterizeThread.GetPlayState() ) );
-  map.Insert( Toolkit::DevelImageVisual::Property::CURRENT_PROGRESS, mVectorRasterizeThread.GetCurrentProgress() );
+  map.Insert( Toolkit::DevelImageVisual::Property::CURRENT_FRAME_NUMBER, static_cast< int32_t >( mVectorRasterizeThread.GetCurrentFrameNumber() ) );
+  map.Insert( Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, static_cast< int32_t >( mVectorRasterizeThread.GetTotalFrameNumber() ) );
 }
 
 void AnimatedVectorImageVisual::DoCreateInstancePropertyMap( Property::Map& map ) const
@@ -180,11 +191,28 @@ void AnimatedVectorImageVisual::DoSetProperty( Property::Index index, const Prop
     }
     case Toolkit::DevelImageVisual::Property::PLAY_RANGE:
     {
-      Vector2 range;
-      if( value.Get( range ) )
+      Property::Array* array = value.GetArray();
+      if( array )
       {
-        mPlayRange = range;
-        mResendFlag |= RESEND_PLAY_RANGE;
+        size_t count = array->Count();
+        if( count >= 2 )
+        {
+          int startFrame, endFrame;
+          int totalFrame = mVectorRasterizeThread.GetTotalFrameNumber();
+          array->GetElementAt( 0 ).Get( startFrame );
+          array->GetElementAt( 1 ).Get( endFrame );
+
+          if( startFrame >= 0 && startFrame < totalFrame && endFrame >= 0 && endFrame < totalFrame )
+          {
+            mStartFrame = startFrame;
+            mEndFrame = endFrame;
+            mResendFlag |= RESEND_PLAY_RANGE;
+          }
+          else
+          {
+            DALI_LOG_ERROR( "Invalid play range [%d, %d / %d]\n", startFrame, endFrame, totalFrame );
+          }
+        }
       }
       break;
     }
@@ -252,6 +280,8 @@ void AnimatedVectorImageVisual::OnSetTransform()
 
   if( IsOnStage() )
   {
+    DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSetTransform: width = %f, height = %f\n", visualSize.width, visualSize.height );
+
     if( visualSize != mVisualSize )
     {
       mVisualSize = visualSize;
@@ -331,12 +361,12 @@ void AnimatedVectorImageVisual::OnDoAction( const Property::Index actionId, cons
     }
     case DevelAnimatedVectorImageVisual::Action::JUMP_TO:
     {
-      float progress;
-      if( attributes.Get( progress ) )
+      int32_t frameNumber;
+      if( attributes.Get( frameNumber ) )
       {
-        mVectorRasterizeThread.SetCurrentProgress( progress );
+        mVectorRasterizeThread.SetCurrentFrameNumber( frameNumber );
 
-        if( mVectorRasterizeThread.GetPlayState() != DevelImageVisual::PlayState::PLAYING )
+        if( IsOnStage() && mVectorRasterizeThread.GetPlayState() != DevelImageVisual::PlayState::PLAYING )
         {
           mVectorRasterizeThread.RenderFrame();
           Stage::GetCurrent().KeepRendering( 0.0f );    // Trigger rendering
@@ -405,17 +435,20 @@ void AnimatedVectorImageVisual::SendAnimationData()
 
     if( mResendFlag & RESEND_PLAY_RANGE )
     {
-      mVectorRasterizeThread.SetPlayRange( mPlayRange );
+      mVectorRasterizeThread.SetPlayRange( mStartFrame, mEndFrame );
     }
 
-    if( isPlaying )
-    {
-      mVectorRasterizeThread.PlayAnimation();
-    }
-    else
+    if( IsOnStage() )
     {
-      mVectorRasterizeThread.RenderFrame();
-      Stage::GetCurrent().KeepRendering( 0.0f );
+      if( isPlaying )
+      {
+        mVectorRasterizeThread.PlayAnimation();
+      }
+      else
+      {
+        mVectorRasterizeThread.RenderFrame();
+        Stage::GetCurrent().KeepRendering( 0.0f );
+      }
     }
 
     mResendFlag = 0;