Fix compile error when we use rive

Since <rive/rive_types.hpp> use #define DEBUG
It will "overwrite" our debug.h's Debug::DebugPriority::DEBUG.

Until resolve this issue, let we define debug.h before rive_tizen.hpp

Change-Id: Ie1184be284da80a0a5e602bfef09947f3529c5c2
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>

diff --git a/dali-extension/internal/rive-animation-view/animation-renderer/rive-animation-renderer.h b/dali-extension/internal/rive-animation-view/animation-renderer/rive-animation-renderer.h
old mode 100755 (executable)
new mode 100644 (file)
index edfa5f1..f8dac09
--- a/dali-extension/internal/rive-animation-view/animation-renderer/rive-animation-renderer.h
+++ b/dali-extension/internal/rive-animation-view/animation-renderer/rive-animation-renderer.h
@@ -2,7 +2,7 @@
 #define DALI_EXTENSION_INTERNAL_RIVE_ANIMATION_RENDERER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -19,18 +19,19 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/native-image-source-queue.h>
+#include <dali/devel-api/threading/mutex.h>
+#include <dali/integration-api/debug.h> ///< note : Debug::DebugPriority::DEBUG can be removed due to <rive/rive_types.hpp>.
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/rendering/renderer.h>
-#include <dali/devel-api/threading/mutex.h>
-#include <dali/devel-api/adaptor-framework/native-image-source-queue.h>
-#include <memory>
 #include <tbm_surface.h>
 #include <tbm_surface_queue.h>
+#include <memory>
 
 // RIVE - INCLUDES
-#include <rive_tizen.hpp>
 #include <rive/animation/linear_animation_instance.hpp>
 #include <rive/artboard.hpp>
+#include <rive_tizen.hpp>
 
 // INTERNAL INCLUDES
 #include <dali-extension/internal/rive-animation-view/animation-renderer/rive-animation-renderer-event-handler.h>
@@ -200,31 +201,29 @@ public:
   UploadCompletedSignalType& UploadCompletedSignal();
 
 protected: // Implementation of RiveAnimationRendererEventHandler
-
   /**
    * @copydoc Dali::Plugin::RiveAnimationRendererEventHandler::NotifyEvent()
    */
   void NotifyEvent() override;
 
 private:
-
   /**
    * @brief Structure used to manage rive animations.
    */
   struct Animation
   {
   public:
-     Animation(rive::LinearAnimationInstance *animationInstance, const std::string& animationName, bool animationEnable)
-     : instance(animationInstance),
-       name(animationName),
-       enable(animationEnable),
-       elapsed(-1.0f)
-     {
-     }
-     std::unique_ptr<rive::LinearAnimationInstance> instance;
-     const std::string& name;
-     bool enable;
-     float elapsed;
+    Animation(rive::LinearAnimationInstance* animationInstance, const std::string& animationName, bool animationEnable)
+    : instance(animationInstance),
+      name(animationName),
+      enable(animationEnable),
+      elapsed(-1.0f)
+    {
+    }
+    std::unique_ptr<rive::LinearAnimationInstance> instance;
+    const std::string&                             name;
+    bool                                           enable;
+    float                                          elapsed;
   };
 
   /**
@@ -248,30 +247,29 @@ private:
   void ClearRiveAnimations();
 
 private:
-
-  std::string                            mUrl;                   ///< The content file path
-  mutable Dali::Mutex                    mMutex;                 ///< Mutex
-  Dali::Renderer                         mRenderer;              ///< Renderer
-  Dali::Texture                          mTexture;               ///< Texture
-  Dali::Texture                          mRenderedTexture;       ///< Rendered Texture
-  Dali::Texture                          mPreviousTexture;       ///< Previous rendered texture
-  NativeImageSourceQueuePtr              mTargetSurface;         ///< The target surface
-  UploadCompletedSignalType              mUploadCompletedSignal; ///< Upload completed signal
-  tbm_surface_queue_h                    mTbmQueue;              ///< Tbm surface queue handle
-  rive::Artboard                         *mArtboard;             ///< Rive artboard handle
-  std::vector<Animation>                 mAnimations;            ///< Rive animations
-  rive::LinearAnimation                  *mAnimation;            ///< Rive animation handle
-  uint32_t                               mStartFrameNumber;      ///< The start frame number
-  uint32_t                               mTotalFrameNumber;      ///< The total frame number
-  uint32_t                               mWidth;                 ///< The width of the surface
-  uint32_t                               mHeight;                ///< The height of the surface
-  uint32_t                               mDefaultWidth;          ///< The width of the surface
-  uint32_t                               mDefaultHeight;         ///< The height of the surface
-  float                                  mFrameRate;             ///< The frame rate of the content
-  bool                                   mResourceReady;         ///< Whether the resource is ready
-  bool                                   mShaderChanged;         ///< Whether the shader is changed to support native image
-  bool                                   mResourceReadyTriggered;///< Whether the resource ready is triggered
-  RiveTizen                              *mRiveTizenAdapter;     ///< Rive Tizen Adapter
+  std::string               mUrl;                    ///< The content file path
+  mutable Dali::Mutex       mMutex;                  ///< Mutex
+  Dali::Renderer            mRenderer;               ///< Renderer
+  Dali::Texture             mTexture;                ///< Texture
+  Dali::Texture             mRenderedTexture;        ///< Rendered Texture
+  Dali::Texture             mPreviousTexture;        ///< Previous rendered texture
+  NativeImageSourceQueuePtr mTargetSurface;          ///< The target surface
+  UploadCompletedSignalType mUploadCompletedSignal;  ///< Upload completed signal
+  tbm_surface_queue_h       mTbmQueue;               ///< Tbm surface queue handle
+  rive::Artboard*           mArtboard;               ///< Rive artboard handle
+  std::vector<Animation>    mAnimations;             ///< Rive animations
+  rive::LinearAnimation*    mAnimation;              ///< Rive animation handle
+  uint32_t                  mStartFrameNumber;       ///< The start frame number
+  uint32_t                  mTotalFrameNumber;       ///< The total frame number
+  uint32_t                  mWidth;                  ///< The width of the surface
+  uint32_t                  mHeight;                 ///< The height of the surface
+  uint32_t                  mDefaultWidth;           ///< The width of the surface
+  uint32_t                  mDefaultHeight;          ///< The height of the surface
+  float                     mFrameRate;              ///< The frame rate of the content
+  bool                      mResourceReady;          ///< Whether the resource is ready
+  bool                      mShaderChanged;          ///< Whether the shader is changed to support native image
+  bool                      mResourceReadyTriggered; ///< Whether the resource ready is triggered
+  RiveTizen*                mRiveTizenAdapter;       ///< Rive Tizen Adapter
 };
 
 } // namespace Internal