More asset handling goodies in rive artboard

Author: kunitoki

modules/yup_core/yup_core.h

@@ -57,7 +57,7 @@
     linuxLibs:          rt dl pthread
     androidLibs:        log android
     androidSearchpaths: {ANDROID_NDK}/sources/android/cpufeatures
-    mingwLibs:          ws2_32 uuid wininet version kernel32 user32 wsock32 advapi32 ole32 oleaut32 imm32 comdlg32 shlwapi rpcrt4 winmm
+    mingwLibs:          ws2_32 uuid wininet version kernel32 user32 wsock32 advapi32 secur32 ole32 oleaut32 imm32 comdlg32 shlwapi rpcrt4 winmm pathcch
 
   END_YUP_MODULE_DECLARATION
 

modules/yup_gui/artboard/yup_ArtboardFile.cpp

@@ -22,6 +22,39 @@
 namespace yup
 {
 
+namespace
+{
+
+//==============================================================================
+
+class LambdaAssetLoader : public rive::FileAssetLoader
+{
+public:
+    LambdaAssetLoader (const ArtboardFile::AssetLoadCallback& assetCallback)
+        : assetCallback (assetCallback)
+    {
+    }
+
+    bool loadContents (rive::FileAsset& asset,
+                       rive::Span<const uint8_t> inBandBytes,
+                       rive::Factory* factory) override
+    {
+        jassert (factory != nullptr);
+
+        ArtboardFile::AssetInfo assetInfo;
+        assetInfo.uniqueName = String (asset.uniqueName());
+        assetInfo.uniquePath = String (asset.uniqueFilename());
+        assetInfo.extension = String (asset.fileExtension());
+
+        return assetCallback (assetInfo, Span<const uint8>{ inBandBytes.data(), inBandBytes.size() }, *factory);
+    }
+
+private:
+    ArtboardFile::AssetLoadCallback assetCallback;
+};
+
+} // namespace
+
 //==============================================================================
 
 ArtboardFile::ArtboardFile (std::unique_ptr<rive::File> rivFile)
@@ -44,6 +77,11 @@ rive::File* ArtboardFile::getRiveFile()
 //==============================================================================
 
 ArtboardFile::LoadResult ArtboardFile::load (const File& file, rive::Factory& factory)
+{
+    return load (file, factory, nullptr);
+}
+
+ArtboardFile::LoadResult ArtboardFile::load (const File& file, rive::Factory& factory, const AssetLoadCallback& assetCallback)
 {
     if (! file.existsAsFile())
         return LoadResult::fail ("Failed to find artboard file to load");
@@ -52,19 +90,39 @@ ArtboardFile::LoadResult ArtboardFile::load (const File& file, rive::Factory& fa
     if (is == nullptr || ! is->openedOk())
         return LoadResult::fail ("Failed to open artboard file for reading");
 
-    return load (*is, factory);
+    return load (*is, factory, assetCallback);
 }
 
+//==============================================================================
+
 ArtboardFile::LoadResult ArtboardFile::load (InputStream& is, rive::Factory& factory)
+{
+    return load (is, factory, nullptr);
+}
+
+ArtboardFile::LoadResult ArtboardFile::load (InputStream& is, rive::Factory& factory, const AssetLoadCallback& assetCallback)
 {
     yup::MemoryBlock mb;
     is.readIntoMemoryBlock (mb);
 
     rive::ImportResult result;
-    auto rivFile = rive::File::import (
-        { static_cast<const uint8_t*> (mb.getData()), mb.getSize() },
-        std::addressof (factory),
-        std::addressof (result));
+    std::unique_ptr<rive::File> rivFile;
+
+    if (assetCallback != nullptr)
+    {
+        rivFile = rive::File::import (
+            { static_cast<const uint8_t*> (mb.getData()), mb.getSize() },
+            std::addressof (factory),
+            std::addressof (result),
+            rive::make_rcp<LambdaAssetLoader> (assetCallback));
+    }
+    else
+    {
+        rivFile = rive::File::import (
+            { static_cast<const uint8_t*> (mb.getData()), mb.getSize() },
+            std::addressof (factory),
+            std::addressof (result));
+    }
 
     if (result == rive::ImportResult::malformed)
         return LoadResult::fail ("Malformed artboard file");

modules/yup_gui/artboard/yup_ArtboardFile.h

@@ -32,9 +32,21 @@ class Artboard;
 class YUP_API ArtboardFile
 {
 public:
+    //==============================================================================
+
+    struct AssetInfo
+    {
+        AssetInfo() = default;
+
+        String uniqueName;
+        File uniquePath;
+        String extension;
+    };
+
     //==============================================================================
     /** The result of loading a Rive file. */
     using LoadResult = ResultValue<std::shared_ptr<ArtboardFile>>;
+    using AssetLoadCallback = std::function<bool (const AssetInfo&, Span<const uint8>, rive::Factory& factory)>;
 
     /** Loads a Rive file from a file.
 
@@ -45,6 +57,15 @@ class YUP_API ArtboardFile
     */
     static LoadResult load (const File& file, rive::Factory& factory);
 
+    /** Loads a Rive file from a file.
+
+        @param file The file to load.
+        @param factory The factory to use to create the Rive file.
+
+        @return The result of loading the Rive file.
+    */
+    static LoadResult load (const File& file, rive::Factory& factory, const AssetLoadCallback& assetCallback);
+
     /** Loads a Rive file from an input stream.
 
         @param is The input stream to load the Rive file from.
@@ -54,6 +75,16 @@ class YUP_API ArtboardFile
     */
     static LoadResult load (InputStream& is, rive::Factory& factory);
 
+    /** Loads a Rive file from an input stream.
+
+        @param is The input stream to load the Rive file from.
+        @param factory The factory to use to create the Rive file.
+        @param assetCallback The callback that will be invoked when loading  to use to create the Rive file.
+
+        @return The result of loading the Rive file.
+    */
+    static LoadResult load (InputStream& is, rive::Factory& factory, const AssetLoadCallback& assetCallback);
+
     //==============================================================================
     /** Returns the underlying Rive file. */
     const rive::File* getRiveFile() const;

modules/yup_gui/yup_gui.cpp

@@ -35,6 +35,8 @@
 //==============================================================================
 
 #include <rive/layout.hpp>
+#include <rive/file_asset_loader.hpp>
+#include <rive/assets/file_asset.hpp>
 #include <rive/custom_property_number.hpp>
 #include <rive/custom_property_boolean.hpp>
 #include <rive/custom_property_string.hpp>