rngine 0.8.2 → 0.8.3

package/android/src/main/java/com/margelo/nitro/rngine/ImageLoaderHelper.kt

@@ -0,0 +1,56 @@
+package com.margelo.nitro.rngine
+
+import android.util.Log
+import androidx.annotation.Keep
+import com.margelo.nitro.NitroModules
+import java.io.IOException
+import java.net.URL
+
+@Keep
+object ImageLoaderHelper {
+  @JvmStatic
+  fun loadFromUrl(uri: String): ByteArray {
+    Log.d("ImageLoaderHelper", "loadFromUrl: fetching $uri")
+    return try {
+      val bytes = URL(uri).openStream().use { it.readBytes() }
+      Log.d("ImageLoaderHelper", "loadFromUrl: success, ${bytes.size} bytes for $uri")
+      bytes
+    } catch (e: IOException) {
+      Log.e("ImageLoaderHelper", "loadFromUrl: network/IO failure for $uri", e)
+      throw e
+    } catch (e: Exception) {
+      Log.e("ImageLoaderHelper", "loadFromUrl: unexpected failure for $uri", e)
+      throw e
+    }
+  }
+
+  @JvmStatic
+  fun loadFromResource(uri: String): ByteArray {
+    Log.d("ImageLoaderHelper", "loadFromResource: resolving resource for '$uri'")
+    val context = NitroModules.applicationContext
+    if (context == null) {
+      Log.e(
+        "ImageLoaderHelper",
+        "loadFromResource: applicationContext is null, NitroModules not initialized?"
+      )
+      throw IllegalStateException("No Context available!")
+    }
+    var resId = context.resources.getIdentifier(uri, "raw", context.packageName)
+    if (resId == 0) {
+      resId = context.resources.getIdentifier(uri, "drawable", context.packageName)
+    }
+    if (resId == 0) {
+      Log.e("ImageLoaderHelper", "loadFromResource: no resource found for '$uri'")
+      throw IllegalStateException("Could not resolve raw resource for asset: $uri")
+    }
+    Log.d("ImageLoaderHelper", "loadFromResource: resolved '$uri' -> resId=$resId")
+    return try {
+      val bytes = context.resources.openRawResource(resId).use { it.readBytes() }
+      Log.d("ImageLoaderHelper", "loadFromResource: success, ${bytes.size} bytes for '$uri'")
+      bytes
+    } catch (e: Exception) {
+      Log.e("ImageLoaderHelper", "loadFromResource: failed reading resId=$resId for '$uri'", e)
+      throw e
+    }
+  }
+}

package/lib/module/GameMethods.js

@@ -81,9 +81,9 @@ const loadAsset = async asset => {
       if (!assetUri) {
         throw new Error(`loadAssets: could not resolve asset URI for ${asset}`);
       }
-      const isSvgLoaded = await gameMethods.loadSvg(asset, assetUri);
-      if (!isSvgLoaded) {
-        throw new Error('loadAssets: Failed to load svg asset');
+      const isLoaded = await gameMethods.loadImage(asset, assetUri);
+      if (!isLoaded) {
+        throw new Error('loadAssets: Failed to load image asset');
       }
       return asset;
   }

package/lib/module/GameMethods.js.map

@@ -1 +1 @@
-{"version":3,"names":["gameMethods","Image","configure","world","screen","entities","systems","paused","nativeSystems","system","push","collisions","onTick","e","c","start","Date","now","finish","setWorld","setScreen","setEntities","setSystems","pause","resume","spawn","entityArray","Array","isArray","despawn","id","update","updates","entityUpdateArray","assetCache","WeakMap","nextId","loadAsset","asset","Error","has","get","assetId","set","isLottieLoaded","loadLottie","JSON","stringify","isAssetLoaded","assetUri","resolveAssetSource","uri","isSvgLoaded","loadSvg","loadAssets","assets","keys","Object","result","key"],"sourceRoot":"../../src","sources":["GameMethods.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["gameMethods","Image","configure","world","screen","entities","systems","paused","nativeSystems","system","push","collisions","onTick","e","c","start","Date","now","finish","setWorld","setScreen","setEntities","setSystems","pause","resume","spawn","entityArray","Array","isArray","despawn","id","update","updates","entityUpdateArray","assetCache","WeakMap","nextId","loadAsset","asset","Error","has","get","assetId","set","isLottieLoaded","loadLottie","JSON","stringify","isAssetLoaded","assetUri","resolveAssetSource","uri","isLoaded","loadImage","loadAssets","assets","keys","Object","result","key"],"sourceRoot":"../../src","sources":["GameMethods.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/GameMethods.nitro.d.ts

@@ -15,7 +15,7 @@ interface GameMethods extends HybridObject<{
     update(updates: EntityUpdate[]): void;
     isAssetLoaded(id: number): boolean;
     loadLottie(id: number, jsonStr: string): Promise<boolean>;
-    loadSvg(id: number, svgUri: string): Promise<boolean>;
+    loadImage(id: number, imageUri: string): Promise<boolean>;
 }
 export declare const gameMethods: GameMethods;
 export {};

package/lib/typescript/src/GameMethods.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GameMethods.nitro.d.ts","sourceRoot":"","sources":["../../../src/GameMethods.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EACV,MAAM,EACN,YAAY,EACZ,MAAM,EACN,MAAM,EACN,KAAK,EACN,MAAM,eAAe,CAAC;AAGvB,UAAU,WAAY,SAAQ,YAAY,CAAC;IACzC,GAAG,EAAE,KAAK,CAAC;IACX,OAAO,EAAE,KAAK,CAAC;CAChB,CAAC;IACA,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAC7B,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACtC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACpC,KAAK,IAAI,IAAI,CAAC;IACd,MAAM,IAAI,IAAI,CAAC;IACf,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAChC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,MAAM,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAEtC,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1D,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACvD;AAED,eAAO,MAAM,WAAW,aACqC,CAAC"}
+{"version":3,"file":"GameMethods.nitro.d.ts","sourceRoot":"","sources":["../../../src/GameMethods.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EACV,MAAM,EACN,YAAY,EACZ,MAAM,EACN,MAAM,EACN,KAAK,EACN,MAAM,eAAe,CAAC;AAGvB,UAAU,WAAY,SAAQ,YAAY,CAAC;IACzC,GAAG,EAAE,KAAK,CAAC;IACX,OAAO,EAAE,KAAK,CAAC;CAChB,CAAC;IACA,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAC7B,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACtC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACpC,KAAK,IAAI,IAAI,CAAC;IACd,MAAM,IAAI,IAAI,CAAC;IACf,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAChC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,MAAM,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAEtC,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1D,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC3D;AAED,eAAO,MAAM,WAAW,aACqC,CAAC"}

package/nitrogen/generated/shared/c++/HybridGameMethodsSpec.cpp

@@ -25,7 +25,7 @@ namespace margelo::nitro::rngine {
       prototype.registerHybridMethod("update", &HybridGameMethodsSpec::update);
       prototype.registerHybridMethod("isAssetLoaded", &HybridGameMethodsSpec::isAssetLoaded);
       prototype.registerHybridMethod("loadLottie", &HybridGameMethodsSpec::loadLottie);
-      prototype.registerHybridMethod("loadSvg", &HybridGameMethodsSpec::loadSvg);
+      prototype.registerHybridMethod("loadImage", &HybridGameMethodsSpec::loadImage);
     });
   }
 

package/nitrogen/generated/shared/c++/HybridGameMethodsSpec.hpp

@@ -75,7 +75,7 @@ namespace margelo::nitro::rngine {
       virtual void update(const std::vector<EntityUpdate>& updates) = 0;
       virtual bool isAssetLoaded(double id) = 0;
       virtual std::shared_ptr<Promise<bool>> loadLottie(double id, const std::string& jsonStr) = 0;
-      virtual std::shared_ptr<Promise<bool>> loadSvg(double id, const std::string& svgUri) = 0;
+      virtual std::shared_ptr<Promise<bool>> loadImage(double id, const std::string& imageUri) = 0;
 
     protected:
       // Hybrid Setup

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rngine",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "description": "React Native 2D game engine powered by Nitro Modules",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/shared/GameMethods.cpp

@@ -2,6 +2,7 @@
 #include "EntityUpdate.hpp"
 #include "GameLoop.hpp"
 #include "GameRenderer.hpp"
+#include "include/core/SkImage.h"
 #include "include/core/SkStream.h"
 #include <android/log.h>
 #include <fbjni/fbjni.h>
@@ -176,9 +177,9 @@ bool GameMethods::isAssetLoaded(double id) {
   auto &gameRenderer = GameRenderer::getInstance();
 
   if (id > 0) {
-    auto &svgCache = gameRenderer.getSvgCacheInternal();
-    auto it = svgCache.find(id);
-    return it != svgCache.end();
+    auto &imageCache = gameRenderer.getImageCacheInternal();
+    auto it = imageCache.find(id);
+    return it != imageCache.end();
   }
 
   if (id < 0) {
@@ -213,53 +214,86 @@ GameMethods::loadLottie(double id, const std::string &jsonStr) {
   });
 };
 
-std::shared_ptr<Promise<bool>> GameMethods::loadSvg(double id,
-                                                    const std::string &svgUri) {
+std::shared_ptr<Promise<bool>>
+GameMethods::loadImage(double id, const std::string &imageUri) {
   return Promise<bool>::async([=]() -> bool {
-    std::string svgStr;
+    __android_log_print(ANDROID_LOG_DEBUG, "GameMethods",
+                        "loadImage: start id=%.0f uri=%s", id,
+                        imageUri.c_str());
+    std::string imageStr;
 
     using namespace facebook::jni;
 
-    ThreadScope::WithClassLoader([&] {
-      static const auto helperClass =
-          findClassStatic("com/margelo/nitro/rngine/SvgLoaderHelper");
-
-      local_ref<JArrayByte> byteArray;
-
-      if (svgUri.rfind("http://", 0) == 0 || svgUri.rfind("https://", 0) == 0) {
-        static const auto method =
-            helperClass->getStaticMethod<JArrayByte(local_ref<JString>)>(
-                "loadFromUrl");
-        byteArray = method(helperClass, make_jstring(svgUri));
-      } else {
-        static const auto method =
-            helperClass->getStaticMethod<JArrayByte(local_ref<JString>)>(
-                "loadFromResource");
-        byteArray = method(helperClass, make_jstring(svgUri));
-      }
+    try {
+      ThreadScope::WithClassLoader([&] {
+        static const auto helperClass =
+            findClassStatic("com/margelo/nitro/rngine/ImageLoaderHelper");
+
+        local_ref<JArrayByte> byteArray;
+
+        if (imageUri.rfind("http://", 0) == 0 ||
+            imageUri.rfind("https://", 0) == 0) {
+          static const auto method =
+              helperClass->getStaticMethod<JArrayByte(local_ref<JString>)>(
+                  "loadFromUrl");
+          byteArray = method(helperClass, make_jstring(imageUri));
+        } else {
+          static const auto method =
+              helperClass->getStaticMethod<JArrayByte(local_ref<JString>)>(
+                  "loadFromResource");
+          byteArray = method(helperClass, make_jstring(imageUri));
+        }
+
+        if (!byteArray) {
+          throw std::runtime_error("Failed to load image bytes for: " +
+                                   imageUri);
+        }
+
+        size_t len = byteArray->size();
+        imageStr.resize(len);
+        byteArray->getRegion(0, len,
+                             reinterpret_cast<int8_t *>(imageStr.data()));
+      });
+    } catch (const std::exception &e) {
+      __android_log_print(ANDROID_LOG_ERROR, "GameMethods",
+                          "loadImage: JNI fetch failed id=%.0f: %s", id,
+                          e.what());
+      return false;
+    }
 
-      if (!byteArray) {
-        throw std::runtime_error("Failed to load SVG bytes for: " + svgUri);
-      }
+    __android_log_print(ANDROID_LOG_DEBUG, "GameMethods",
+                        "loadImage: fetched %zu bytes id=%.0f", imageStr.size(),
+                        id);
 
-      size_t len = byteArray->size();
-      svgStr.resize(len);
-      byteArray->getRegion(0, len, reinterpret_cast<int8_t *>(svgStr.data()));
-    });
+    auto &gameRenderer = GameRenderer::getInstance();
+    auto &imageCache = gameRenderer.getImageCacheInternal();
 
-    auto stream = SkMemoryStream::MakeDirect(svgStr.data(), svgStr.size());
+    auto stream = SkMemoryStream::MakeDirect(imageStr.data(), imageStr.size());
     auto svgDom = SkSVGDOM::MakeFromStream(*stream);
 
-    if (!svgDom) {
-      return false;
+    if (svgDom) {
+      __android_log_print(ANDROID_LOG_DEBUG, "GameMethods",
+                          "loadImage: parsed as SVG id=%.0f", id);
+      imageCache[id] = std::move(svgDom);
+      return true;
     }
 
-    auto &gameRenderer = GameRenderer::getInstance();
-    auto &svgCache = gameRenderer.getSvgCacheInternal();
+    auto data = SkData::MakeWithCopy(imageStr.data(), imageStr.size());
+    auto raster = SkImages::DeferredFromEncodedData(std::move(data));
 
-    svgCache[id] = std::move(svgDom);
+    if (raster) {
+      __android_log_print(ANDROID_LOG_DEBUG, "GameMethods",
+                          "loadImage: parsed as raster id=%.0f", id);
+      imageCache[id] = std::move(raster);
+      return true;
+    }
 
-    return true;
+    __android_log_print(ANDROID_LOG_ERROR, "GameMethods",
+                        "loadImage: both SVG parse and raster decode failed "
+                        "id=%.0f",
+                        id);
+
+    return false;
   });
 };
 } // namespace margelo::nitro::rngine

package/shared/GameMethods.hpp

@@ -31,7 +31,7 @@ public:
   std::shared_ptr<Promise<bool>>
   loadLottie(double id, const std::string &jsonStr) override;
 
-  std::shared_ptr<Promise<bool>> loadSvg(double id,
-                                         const std::string &svgUri) override;
+  std::shared_ptr<Promise<bool>> loadImage(double id,
+                                           const std::string &svgUri) override;
 };
 } // namespace margelo::nitro::rngine

package/shared/GameRenderer.cpp

@@ -10,6 +10,7 @@
 #include "include/core/SkColorSpace.h"
 #include "include/core/SkPaint.h"
 #include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
 #include "include/core/SkSurface.h"
 
 #include "include/gpu/ganesh/GrBackendSurface.h"
@@ -19,6 +20,7 @@
 
 #include "include/gpu/ganesh/gl/GrGLDirectContext.h"
 #include "include/gpu/ganesh/gl/GrGLInterface.h"
+#include "modules/svg/include/SkSVGDOM.h"
 
 #include <EGL/egl.h>
 #include <GLES3/gl3.h>
@@ -151,29 +153,58 @@ void GameRenderer::render(const Screen &screen,
   if (screen.asset.has_value() && screen.asset.value() != 0) {
     double assetId = screen.asset.value();
 
-    auto svgIt = _svgCache.find(assetId);
-    if (svgIt != _svgCache.end() && svgIt->second) {
-      auto &svgDom = svgIt->second;
-
-      SkSize intrinsicSize = svgDom->containerSize();
-      if (intrinsicSize.isEmpty()) {
-        svgDom->setContainerSize(SkSize::Make(virtualWidth, virtualHeight));
-        intrinsicSize = SkSize::Make(virtualWidth, virtualHeight);
-      }
+    auto imageIt = _imageCache.find(assetId);
+    if (imageIt != _imageCache.end()) {
+      std::visit(
+          [&](const auto image) {
+            using T = std::decay_t<decltype(image)>;
+            if constexpr (std::is_same_v<T, sk_sp<SkSVGDOM>>) {
+              SkSize intrinsicSize = image->containerSize();
+
+              if (intrinsicSize.isEmpty()) {
+                image->setContainerSize(
+                    SkSize::Make(virtualWidth, virtualHeight));
+                intrinsicSize = SkSize::Make(virtualWidth, virtualHeight);
+              }
 
-      float scaleX = virtualWidth / intrinsicSize.width();
-      float scaleY = virtualHeight / intrinsicSize.height();
+              float scaleX = virtualWidth / intrinsicSize.width();
+              float scaleY = virtualHeight / intrinsicSize.height();
 
-      canvas->save();
-      if (screen.flipH.has_value() || screen.flipV.has_value()) {
-        canvas->translate(virtualWidth / 2.f, virtualHeight / 2.f);
-        canvas->scale(screen.flipH.value_or(false) ? -1.f : 1.f,
-                      screen.flipV.value_or(false) ? -1.f : 1.f);
-        canvas->translate(-virtualWidth / 2.f, -virtualHeight / 2.f);
-      }
-      canvas->scale(scaleX, scaleY);
-      svgDom->render(canvas);
-      canvas->restore();
+              canvas->save();
+              if (screen.flipH.has_value() || screen.flipV.has_value()) {
+                canvas->translate(virtualWidth / 2.f, virtualHeight / 2.f);
+                canvas->scale(screen.flipH.value_or(false) ? -1.f : 1.f,
+                              screen.flipV.value_or(false) ? -1.f : 1.f);
+                canvas->translate(-virtualWidth / 2.f, -virtualHeight / 2.f);
+              }
+              canvas->scale(scaleX, scaleY);
+              image->render(canvas);
+              canvas->restore();
+            } else {
+              float intrinsicW = static_cast<float>(image->width());
+              float intrinsicH = static_cast<float>(image->height());
+              if (intrinsicW <= 0.f || intrinsicH <= 0.f)
+                return;
+
+              float scaleX = virtualWidth / intrinsicW;
+              float scaleY = virtualHeight / intrinsicH;
+
+              canvas->save();
+              if (screen.flipH.has_value() || screen.flipV.has_value()) {
+                canvas->translate(virtualWidth / 2.f, virtualHeight / 2.f);
+                canvas->scale(screen.flipH.value_or(false) ? -1.f : 1.f,
+                              screen.flipV.value_or(false) ? -1.f : 1.f);
+                canvas->translate(-virtualWidth / 2.f, -virtualHeight / 2.f);
+              }
+              canvas->scale(scaleX, scaleY);
+
+              SkSamplingOptions sampling(SkFilterMode::kLinear,
+                                         SkMipmapMode::kLinear);
+              canvas->drawImage(image, 0.f, 0.f, sampling);
+              canvas->restore();
+            }
+          },
+          imageIt->second);
     } else {
       auto lottieIt = _lottieCache.find(assetId);
       if (lottieIt != _lottieCache.end() && lottieIt->second) {
@@ -246,23 +277,43 @@ void GameRenderer::render(const Screen &screen,
           canvas->translate(-width / 2.f, -height / 2.f);
         }
 
-        auto svgIt = _svgCache.find(assetId);
-        if (svgIt != _svgCache.end() && svgIt->second) {
-          auto &svgDom = svgIt->second;
-
-          SkSize intrinsicSize = svgDom->containerSize();
-          if (intrinsicSize.isEmpty()) {
-            svgDom->setContainerSize(SkSize::Make(width, height));
-            intrinsicSize = SkSize::Make(width, height);
-          }
-
-          float scaleX = width / intrinsicSize.width();
-          float scaleY = height / intrinsicSize.height();
-
-          canvas->save();
-          canvas->scale(scaleX, scaleY);
-          svgDom->render(canvas);
-          canvas->restore();
+        auto imageIt = _imageCache.find(assetId);
+        if (imageIt != _imageCache.end()) {
+          std::visit(
+              [&](const auto image) {
+                using T = std::decay_t<decltype(image)>;
+                if constexpr (std::is_same_v<T, sk_sp<SkSVGDOM>>) {
+                  SkSize intrinsicSize = image->containerSize();
+                  if (intrinsicSize.isEmpty()) {
+                    image->setContainerSize(SkSize::Make(width, height));
+                    intrinsicSize = SkSize::Make(width, height);
+                  }
+
+                  float scaleX = width / intrinsicSize.width();
+                  float scaleY = height / intrinsicSize.height();
+
+                  canvas->save();
+                  canvas->scale(scaleX, scaleY);
+                  image->render(canvas);
+                  canvas->restore();
+                } else {
+                  float intrinsicW = static_cast<float>(image->width());
+                  float intrinsicH = static_cast<float>(image->height());
+                  if (intrinsicW <= 0.f || intrinsicH <= 0.f)
+                    return;
+
+                  float scaleX = width / intrinsicW;
+                  float scaleY = height / intrinsicH;
+
+                  canvas->save();
+                  canvas->scale(scaleX, scaleY);
+                  SkSamplingOptions sampling(SkFilterMode::kLinear,
+                                             SkMipmapMode::kLinear);
+                  canvas->drawImage(image, 0.f, 0.f, sampling);
+                  canvas->restore();
+                }
+              },
+              imageIt->second);
         } else {
           auto lottieIt = _lottieCache.find(assetId);
           if (lottieIt != _lottieCache.end() && lottieIt->second) {

package/shared/GameRenderer.hpp

@@ -1,6 +1,7 @@
 #pragma once
 #include "Entity.hpp"
 #include "Screen.hpp"
+#include "include/core/SkImage.h"
 #include "include/core/SkSurface.h"
 #include "include/gpu/ganesh/GrDirectContext.h"
 #include "modules/skottie/include/Skottie.h"
@@ -21,9 +22,11 @@ public:
 
   ~GameRenderer();
 
-  std::map<double, sk_sp<SkSVGDOM>> &getSvgCacheInternal() {
-    return _svgCache;
+  std::map<double, std::variant<sk_sp<SkSVGDOM>, sk_sp<SkImage>>> &
+  getImageCacheInternal() {
+    return _imageCache;
   };
+
   std::map<double, sk_sp<skottie::Animation>> &getLottieCacheInternal() {
     return _lottieCache;
   };
@@ -52,8 +55,8 @@ private:
   int _height{0};
   bool _initialized{false};
 
-  std::map<double, sk_sp<SkSVGDOM>> _svgCache;
   std::map<double, sk_sp<skottie::Animation>> _lottieCache;
+  std::map<double, std::variant<sk_sp<SkSVGDOM>, sk_sp<SkImage>>> _imageCache;
 
   bool isEntityVisible(const Entity &entity, float screenWidth,
                        float screenHeight);

package/src/GameMethods.nitro.ts

@@ -24,7 +24,7 @@ interface GameMethods extends HybridObject<{
 
   isAssetLoaded(id: number): boolean;
   loadLottie(id: number, jsonStr: string): Promise<boolean>;
-  loadSvg(id: number, svgUri: string): Promise<boolean>;
+  loadImage(id: number, imageUri: string): Promise<boolean>;
 }
 
 export const gameMethods =

package/src/GameMethods.ts

@@ -89,9 +89,9 @@ const loadAsset = async (asset: unknown) => {
       if (!assetUri) {
         throw new Error(`loadAssets: could not resolve asset URI for ${asset}`);
       }
-      const isSvgLoaded = await gameMethods.loadSvg(asset, assetUri);
-      if (!isSvgLoaded) {
-        throw new Error('loadAssets: Failed to load svg asset');
+      const isLoaded = await gameMethods.loadImage(asset, assetUri);
+      if (!isLoaded) {
+        throw new Error('loadAssets: Failed to load image asset');
       }
       return asset;
   }

package/android/src/main/java/com/margelo/nitro/rngine/SvgLoaderHelper.kt

@@ -1,24 +0,0 @@
-package com.margelo.nitro.rngine
-
-import androidx.annotation.Keep
-import com.margelo.nitro.NitroModules
-import java.net.URL
-
-@Keep
-object SvgLoaderHelper {
-  @JvmStatic
-  fun loadFromUrl(uri: String): ByteArray {
-    return URL(uri).openStream().use { it.readBytes() }
-  }
-
-  @JvmStatic
-  fun loadFromResource(uri: String): ByteArray {
-    val context = NitroModules.applicationContext
-      ?: throw IllegalStateException("No Context available!")
-    val resId = context.resources.getIdentifier(uri, "raw", context.packageName)
-    if (resId == 0) {
-      throw IllegalStateException("Could not resolve raw resource for asset: $uri")
-    }
-    return context.resources.openRawResource(resId).use { it.readBytes() }
-  }
-}