(Vector) Fix some issues

[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 c4e2df0..8939729 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,10 +52,25 @@ const Dali::Vector4 FULL_TEXTURE_RECT( 0.f, 0.f, 1.f, 1.f );
 // Flags for re-sending data to the rasterize thread
 enum Flags
 {
-  RESEND_PLAY_RANGE  = 1 << 0,
-  RESEND_LOOP_COUNT  = 1 << 1
+  RESEND_PLAY_RANGE    = 1 << 0,
+  RESEND_LOOP_COUNT    = 1 << 1,
+  RESEND_STOP_BEHAVIOR = 1 << 2,
+  RESEND_LOOPING_MODE  = 1 << 3
 };
 
+// stop behavior
+DALI_ENUM_TO_STRING_TABLE_BEGIN( STOP_BEHAVIOR )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::DevelImageVisual::StopBehavior, CURRENT_FRAME )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::DevelImageVisual::StopBehavior, FIRST_FRAME )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::DevelImageVisual::StopBehavior, LAST_FRAME )
+DALI_ENUM_TO_STRING_TABLE_END( STOP_BEHAVIOR )
+
+// looping mode
+DALI_ENUM_TO_STRING_TABLE_BEGIN( LOOPING_MODE )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::DevelImageVisual::LoopingMode, RESTART )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::DevelImageVisual::LoopingMode, AUTO_REVERSE )
+DALI_ENUM_TO_STRING_TABLE_END( LOOPING_MODE )
+
 #if defined(DEBUG_ENABLED)
 Debug::Filter* gVectorAnimationLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_VECTOR_ANIMATION" );
 #endif
@@ -83,11 +98,14 @@ 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 )
+  mActionStatus( DevelAnimatedVectorImageVisual::Action::STOP ),
+  mStopBehavior( DevelImageVisual::StopBehavior::CURRENT_FRAME ),
+  mLoopingMode( DevelImageVisual::LoopingMode::RESTART )
 {
   // the rasterized image is with pre-multiplied alpha format
   mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA;
@@ -134,9 +152,18 @@ 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() ) );
+
+  map.Insert( Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR, mStopBehavior );
+  map.Insert( Toolkit::DevelImageVisual::Property::LOOPING_MODE, mLoopingMode );
 }
 
 void AnimatedVectorImageVisual::DoCreateInstancePropertyMap( Property::Map& map ) const
@@ -164,6 +191,14 @@ void AnimatedVectorImageVisual::DoSetProperties( const Property::Map& propertyMa
        {
           DoSetProperty( Toolkit::DevelImageVisual::Property::PLAY_RANGE, keyValue.second );
        }
+       else if( keyValue.first == STOP_BEHAVIOR_NAME )
+       {
+          DoSetProperty( Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR, keyValue.second );
+       }
+       else if( keyValue.first == LOOPING_MODE_NAME )
+       {
+          DoSetProperty( Toolkit::DevelImageVisual::Property::LOOPING_MODE, keyValue.second );
+       }
     }
   }
 }
@@ -184,14 +219,47 @@ 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;
     }
+    case Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR:
+    {
+      int32_t stopBehavior;
+      Scripting::GetEnumerationProperty( value, STOP_BEHAVIOR_TABLE, STOP_BEHAVIOR_TABLE_COUNT, stopBehavior );
+      mStopBehavior = DevelImageVisual::StopBehavior::Type( stopBehavior );
+      mResendFlag |= RESEND_STOP_BEHAVIOR;
+      break;
+    }
+    case Toolkit::DevelImageVisual::Property::LOOPING_MODE:
+    {
+      int32_t loopingMode;
+      Scripting::GetEnumerationProperty( value, LOOPING_MODE_TABLE, LOOPING_MODE_TABLE_COUNT, loopingMode );
+      mLoopingMode = DevelImageVisual::LoopingMode::Type( loopingMode );
+      mResendFlag |= RESEND_LOOPING_MODE;
+      break;
+    }
   }
 }
 
@@ -228,6 +296,8 @@ void AnimatedVectorImageVisual::DoSetOnStage( Actor& actor )
   mPlacementActor = actor;
 
   mVectorRasterizeThread.SetRenderer( mImpl->mRenderer );
+
+  DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOnStage [%p]\n", this );
 }
 
 void AnimatedVectorImageVisual::DoSetOffStage( Actor& actor )
@@ -248,6 +318,8 @@ void AnimatedVectorImageVisual::DoSetOffStage( Actor& actor )
 
   // Reset the visual size to zero so that when adding the actor back to stage the rasterization is forced
   mVisualSize = Vector2::ZERO;
+
+  DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOffStage [%p]\n", this );
 }
 
 void AnimatedVectorImageVisual::OnSetTransform()
@@ -256,7 +328,7 @@ void AnimatedVectorImageVisual::OnSetTransform()
 
   if( IsOnStage() )
   {
-    DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSetTransform: width = %f, height = %f\n", visualSize.width, visualSize.height );
+    DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSetTransform: width = %f, height = %f [%p]\n", visualSize.width, visualSize.height, this );
 
     if( visualSize != mVisualSize )
     {
@@ -289,6 +361,8 @@ void AnimatedVectorImageVisual::OnSetTransform()
       {
         actor.AddRenderer( mImpl->mRenderer );
         mPlacementActor.Reset();
+
+        DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSetTransform: Renderer is added [%p]\n", this );
       }
 
       ResourceReady( Toolkit::Visual::ResourceStatus::READY );
@@ -337,10 +411,10 @@ 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( IsOnStage() && mVectorRasterizeThread.GetPlayState() != DevelImageVisual::PlayState::PLAYING )
         {
@@ -375,6 +449,8 @@ void AnimatedVectorImageVisual::OnResourceReady()
     mPlacementActor.Reset();
 
     ResourceReady( Toolkit::Visual::ResourceStatus::READY );
+
+    DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnResourceReady: Renderer is added [%p]\n", this );
   }
 }
 
@@ -411,7 +487,17 @@ void AnimatedVectorImageVisual::SendAnimationData()
 
     if( mResendFlag & RESEND_PLAY_RANGE )
     {
-      mVectorRasterizeThread.SetPlayRange( mPlayRange );
+      mVectorRasterizeThread.SetPlayRange( mStartFrame, mEndFrame );
+    }
+
+    if( mResendFlag & RESEND_STOP_BEHAVIOR )
+    {
+      mVectorRasterizeThread.SetStopBehavior( mStopBehavior );
+    }
+
+    if( mResendFlag & RESEND_LOOPING_MODE )
+    {
+      mVectorRasterizeThread.SetLoopingMode( mLoopingMode );
     }
 
     if( IsOnStage() )