rlottie: now loadFromData() api takes resourcePath for loading extern…

…al resource
Samsung · Mar 5, 2019 · b7d4886 · b7d4886
1 parent 8047001
commit b7d4886
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 13 deletions.
diff --git a/example/lottieview.cpp b/example/lottieview.cpp
@@ -369,9 +369,9 @@ void LottieView::setFilePath(const char *filePath)
     }
 }
 
-void LottieView::loadFromData(const std::string &jsonData, const std::string &key)
+void LottieView::loadFromData(const std::string &jsonData, const std::string &key, const std::string &resourcePath)
 {
-    if (mPlayer = Animation::loadFromData(jsonData, key)) {
+    if (mPlayer = Animation::loadFromData(jsonData, key, resourcePath)) {
         mFrameRate = mPlayer->frameRate();
         mTotalFrame = mPlayer->totalFrame();
     } else {

diff --git a/example/lottieview.h b/example/lottieview.h
@@ -49,7 +49,7 @@ class LottieView
     void setSize(int w, int h);
     void setPos(int x, int y);
     void setFilePath(const char *filePath);
-    void loadFromData(const std::string &jsonData, const std::string &key);
+    void loadFromData(const std::string &jsonData, const std::string &key, const std::string &resourcePath="");
     void show();
     void hide();
     void loop(bool loop);

diff --git a/inc/rlottie.h b/inc/rlottie.h
@@ -143,7 +143,7 @@ class LOT_EXPORT Animation {
      *  @internal
      */
     static std::unique_ptr<Animation>
-    loadFromData(std::string jsonData, const std::string &key);
+    loadFromData(std::string jsonData, const std::string &key, const std::string &resourcePath="");
 
     /**
      *  @brief Returns default framerate of the Lottie resource.

diff --git a/inc/rlottie_capi.h b/inc/rlottie_capi.h
@@ -49,14 +49,15 @@ LOT_EXPORT Lottie_Animation *lottie_animation_from_file(const char *path);
  *
  *  @param[in] data The JSON string data.
  *  @param[in] key the string that will be used to cache the JSON string data.
+ *  @param[in] resource_path the path that will be used to load external resource needed by the JSON data.
  *
  *  @return Animation object that can build the contents of the
  *          Lottie resource represented by JSON string data.
  *
  *  @ingroup Lottie_Animation
  *  @internal
  */
-LOT_EXPORT Lottie_Animation *lottie_animation_from_data(const char *data, const char *key);
+LOT_EXPORT Lottie_Animation *lottie_animation_from_data(const char *data, const char *key, const char *resource_path);
 
 /**
  *  @brief Free given Animation object resource.

diff --git a/src/binding/c/lottieanimation_capi.cpp b/src/binding/c/lottieanimation_capi.cpp
@@ -41,9 +41,9 @@ LOT_EXPORT Lottie_Animation_S *lottie_animation_from_file(const char *path)
     }
 }
 
-LOT_EXPORT Lottie_Animation_S *lottie_animation_from_data(const char *data, const char *key)
+LOT_EXPORT Lottie_Animation_S *lottie_animation_from_data(const char *data, const char *key, const char *resourcePath)
 {
-    if (auto animation = Animation::loadFromData(data, key) ) {
+    if (auto animation = Animation::loadFromData(data, key, resourcePath) ) {
         Lottie_Animation_S *handle = new Lottie_Animation_S();
         handle->mAnimation = std::move(animation);
         return handle;

diff --git a/src/lottie/lottieanimation.cpp b/src/lottie/lottieanimation.cpp
@@ -198,15 +198,16 @@ std::future<Surface> AnimationImpl::renderAsync(size_t frameNo, Surface &&surfac
  * @param path  add the details
  */
 std::unique_ptr<Animation>
-Animation::loadFromData(std::string jsonData, const std::string &key)
+Animation::loadFromData(std::string jsonData, const std::string &key, const std::string &resourcePath)
 {
     if (jsonData.empty()) {
         vWarning << "jason data is empty";
         return nullptr;
     }
 
     LottieLoader loader;
-    if (loader.loadFromData(std::move(jsonData), key)) {
+    if (loader.loadFromData(std::move(jsonData), key,
+                            (resourcePath.empty() ? " " : resourcePath))) {
         auto animation = std::unique_ptr<Animation>(new Animation);
         animation->d->init(loader.model());
         return animation;

diff --git a/src/lottie/lottieloader.cpp b/src/lottie/lottieloader.cpp
@@ -90,14 +90,14 @@ bool LottieLoader::load(const std::string &path)
     return true;
 }
 
-bool LottieLoader::loadFromData(std::string &&jsonData, const std::string &key)
+bool LottieLoader::loadFromData(std::string &&jsonData, const std::string &key, const std::string &resourcePath)
 {
     LottieFileCache &fileCache = LottieFileCache::get();
 
     mModel = fileCache.find(key);
     if (mModel) return true;
 
-    LottieParser parser(const_cast<char *>(jsonData.c_str()));
+    LottieParser parser(const_cast<char *>(jsonData.c_str()), resourcePath.c_str());
     mModel = parser.model();
     fileCache.add(key, mModel);
 

diff --git a/src/lottie/lottieloader.h b/src/lottie/lottieloader.h
@@ -27,7 +27,7 @@ class LottieLoader
 {
 public:
    bool load(const std::string &filePath);
-   bool loadFromData(std::string &&jsonData, const std::string &key);
+   bool loadFromData(std::string &&jsonData, const std::string &key, const std::string &resourcePath);
    std::shared_ptr<LOTModel> model();
 private:
    std::shared_ptr<LOTModel>    mModel;

diff --git a/src/lottie/lottieparser.h b/src/lottie/lottieparser.h
@@ -25,7 +25,7 @@ class LottieParserImpl;
 class LottieParser {
 public:
     ~LottieParser();
-    LottieParser(char* str, const char *dir_path="");
+    LottieParser(char* str, const char *dir_path);
     std::shared_ptr<LOTModel> model();
 private:
    LottieParserImpl   *d;