X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fvisuals%2Fanimated-vector-image%2Fanimated-vector-image-visual.h;h=6196e39345a3992d27b4223abe40e543a76771a2;hb=ed11499452da1ccd5fdfa36324881dc66a5281bc;hp=5d871f0d48c16e96a3f838e4b7b101721c71d596;hpb=7c1ca2d9ab3bc63f3dc164c4f5d4ea0d8bf5ba3e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
index 5d871f0..6196e39 100644
--- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
+++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_ANIMATED_VECTOR_IMAGE_VISUAL_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -21,13 +21,16 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/public-api/object/weak-handle.h>
-#include <memory>
+#include <dali/public-api/object/property-notification.h>
+#include <dali/public-api/adaptor-framework/window.h>
+#include <dali/devel-api/actors/actor-devel.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/visuals/visual-base-impl.h>
 #include <dali-toolkit/internal/visuals/visual-url.h>
 #include <dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h>
-#include <dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h>
+#include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h>
+#include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.h>
 
 namespace Dali
 {
@@ -39,7 +42,6 @@ namespace Internal
 {
 
 class ImageVisualShaderFactory;
-class VectorRasterizeThread;
 class AnimatedVectorImageVisual;
 using AnimatedVectorImageVisualPtr = IntrusivePtr< AnimatedVectorImageVisual >;
 
@@ -54,7 +56,7 @@ using AnimatedVectorImageVisualPtr = IntrusivePtr< AnimatedVectorImageVisual >;
  * | url                      | STRING           |
  *
  */
-class AnimatedVectorImageVisual: public Visual::Base
+class AnimatedVectorImageVisual: public Visual::Base, public ConnectionTracker, public VectorAnimationManager::LifecycleObserver
 {
 public:
 
@@ -96,6 +98,12 @@ public:  // from Visual
    */
   void DoCreateInstancePropertyMap( Property::Map& map ) const override;
 
+protected: // From VectorAnimationManager::LifecycleObserver:
+  /**
+   * @copydoc VectorAnimationManager::LifecycleObserver::VectorAnimationManagerDestroyed()
+   */
+  void VectorAnimationManagerDestroyed() override;
+
 protected:
 
   /**
@@ -110,7 +118,7 @@ protected:
   /**
    * @brief A reference counted object may only be deleted by calling Unreference().
    */
-  virtual ~AnimatedVectorImageVisual();
+  ~AnimatedVectorImageVisual() override;
 
   /**
    * @copydoc Visual::Base::DoSetProperties
@@ -118,14 +126,14 @@ protected:
   void DoSetProperties( const Property::Map& propertyMap ) override;
 
   /**
-   * @copydoc Visual::Base::DoSetOnStage
+   * @copydoc Visual::Base::DoSetOnScene
    */
-  void DoSetOnStage( Actor& actor ) override;
+  void DoSetOnScene( Actor& actor ) override;
 
   /**
-   * @copydoc Visual::Base::DoSetOffStage
+   * @copydoc Visual::Base::DoSetOffScene
    */
-  void DoSetOffStage( Actor& actor ) override;
+  void DoSetOffScene( Actor& actor ) override;
 
   /**
    * @copydoc Visual::Base::OnSetTransform
@@ -147,15 +155,60 @@ private:
   void DoSetProperty( Property::Index index, const Property::Value& value );
 
   /**
-   * @brief Event callback from rasterize thread. This is called after the first frame is ready.
+   * @brief Called when the texture upload is completed.
    */
-  void OnResourceReady();
+  void OnUploadCompleted();
 
   /**
    * @brief Event callback from rasterize thread. This is called after the animation is finished.
    */
   void OnAnimationFinished();
 
+  /**
+   * @brief Send animation data to the rasterize thread.
+   */
+  void SendAnimationData();
+
+  /**
+   * @brief Set the vector image size.
+   */
+  void SetVectorImageSize();
+
+  /**
+   * @brief Stop the animation.
+   */
+  void StopAnimation();
+
+  /**
+   * @brief Trigger rasterization of the vector content.
+   */
+  void TriggerVectorRasterization();
+
+  /**
+   * @brief Callback when the world scale factor changes.
+   */
+  void OnScaleNotification( PropertyNotification& source );
+
+  /**
+   * @brief Callback when the size changes.
+   */
+  void OnSizeNotification( PropertyNotification& source );
+
+  /**
+   * @brief Callback when the visibility of the actor is changed.
+   */
+  void OnControlVisibilityChanged( Actor actor, bool visible, DevelActor::VisibilityChange::Type type );
+
+  /**
+   * @brief Callback when the visibility of the window is changed.
+   */
+  void OnWindowVisibilityChanged( Window window, bool visible );
+
+  /**
+   * @brief Callback when the event is processed.
+   */
+  void OnProcessEvents();
+
   // Undefined
   AnimatedVectorImageVisual( const AnimatedVectorImageVisual& visual ) = delete;
 
@@ -163,12 +216,19 @@ private:
   AnimatedVectorImageVisual& operator=( const AnimatedVectorImageVisual& visual ) = delete;
 
 private:
-  ImageVisualShaderFactory&                    mImageVisualShaderFactory;
   VisualUrl                                    mUrl;
-  VectorRasterizeThread                        mVectorRasterizeThread;
+  VectorAnimationTask::AnimationData           mAnimationData;
+  VectorAnimationTaskPtr                       mVectorAnimationTask;
+  ImageVisualShaderFactory&                    mImageVisualShaderFactory;
+  PropertyNotification                         mScaleNotification;
+  PropertyNotification                         mSizeNotification;
   Vector2                                      mVisualSize;
+  Vector2                                      mVisualScale;
   WeakHandle< Actor >                          mPlacementActor;
-  DevelAnimatedVectorImageVisual::Action::Type mActionStatus;
+  DevelImageVisual::PlayState::Type            mPlayState;
+  CallbackBase*                                mEventCallback;    // Not owned
+  bool                                         mRendererAdded;
+  bool                                         mCoreShutdown;
 };
 
 } // namespace Internal