rngine 0.9.0 → 0.10.0

package/lib/typescript/src/GameEngine.d.ts

@@ -1,4 +1,4 @@
-import type { GameEngineMethods, GameEngineProps } from './GameEngine.nitro';
+import type { GameEngineMethods, GameEngineProps } from './GameEngine.nitro.js';
 /**
  * A game engine view component that renders the game world.
  * Size it using the style prop like any other React Native view.

package/lib/typescript/src/GameEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GameEngine.d.ts","sourceRoot":"","sources":["../../../src/GameEngine.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE7E;;;;;;;;GAQG;;AACH,wBAGE"}
+{"version":3,"file":"GameEngine.d.ts","sourceRoot":"","sources":["../../../src/GameEngine.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,uBAAoB,CAAC;AAE7E;;;;;;;;GAQG;;AACH,wBAGE"}

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

@@ -1,5 +1,5 @@
-import type { Entity, EntityUpdate, ScreenUpdate } from './nativeTypes';
-import type { Config } from './types';
+import type { Entity, EntityUpdate, ScreenUpdate } from './nativeTypes.js';
+import type { Config } from './types.js';
 /** Sets up the game engine with the given configuration. Call this before anything else. */
 export declare const configure: ({ world, screen, entities, systems, paused, }: Config) => void;
 /** Pauses the game loop. Systems will stop running. */

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

@@ -1 +1 @@
-{"version":3,"file":"GameMethods.d.ts","sourceRoot":"","sources":["../../../src/GameMethods.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAU,MAAM,eAAe,CAAC;AAChF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGtC,4FAA4F;AAC5F,eAAO,MAAM,SAAS,GAAI,+CAMvB,MAAM,SAyBR,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,KAAK,YAA4B,CAAC;AAE/C,6BAA6B;AAC7B,eAAO,MAAM,MAAM,YAA6B,CAAC;AAEjD,0EAA0E;AAC1E,eAAO,MAAM,KAAK,GAAI,UAAU,MAAM,GAAG,MAAM,EAAE,SAGhD,CAAC;AAEF,2HAA2H;AAC3H,eAAO,MAAM,OAAO,GAAI,IAAI,MAAM,SAA4B,CAAC;AAE/D,+HAA+H;AAC/H,eAAO,MAAM,YAAY,GAAI,cAAc,YAAY,SAEtD,CAAC;AAEF,oGAAoG;AACpG,eAAO,MAAM,cAAc,GAAI,eAAe,YAAY,EAAE,SAE3D,CAAC;AAEF,gEAAgE;AAChE,eAAO,MAAM,YAAY,GAAI,cAAc,YAAY,SAEtD,CAAC;AA2CF;;yEAEyE;AACzE,eAAO,MAAM,UAAU,GAAU,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChE,QAAQ,CAAC,KACR,OAAO,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,GAAE,CASpC,CAAC"}
+{"version":3,"file":"GameMethods.d.ts","sourceRoot":"","sources":["../../../src/GameMethods.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAU,MAAM,kBAAe,CAAC;AAChF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAS,CAAC;AAGtC,4FAA4F;AAC5F,eAAO,MAAM,SAAS,GAAI,+CAMvB,MAAM,SAyBR,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,KAAK,YAA4B,CAAC;AAE/C,6BAA6B;AAC7B,eAAO,MAAM,MAAM,YAA6B,CAAC;AAEjD,0EAA0E;AAC1E,eAAO,MAAM,KAAK,GAAI,UAAU,MAAM,GAAG,MAAM,EAAE,SAGhD,CAAC;AAEF,2HAA2H;AAC3H,eAAO,MAAM,OAAO,GAAI,IAAI,MAAM,SAA4B,CAAC;AAE/D,+HAA+H;AAC/H,eAAO,MAAM,YAAY,GAAI,cAAc,YAAY,SAEtD,CAAC;AAEF,oGAAoG;AACpG,eAAO,MAAM,cAAc,GAAI,eAAe,YAAY,EAAE,SAE3D,CAAC;AAEF,gEAAgE;AAChE,eAAO,MAAM,YAAY,GAAI,cAAc,YAAY,SAEtD,CAAC;AA2CF;;yEAEyE;AACzE,eAAO,MAAM,UAAU,GAAU,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChE,QAAQ,CAAC,KACR,OAAO,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,GAAE,CASpC,CAAC"}

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

@@ -1,5 +1,5 @@
 import type { HybridObject } from 'react-native-nitro-modules';
-import type { Entity, EntityUpdate, System, Screen, World, ScreenUpdate } from './nativeTypes';
+import type { Entity, EntityUpdate, System, Screen, World, ScreenUpdate } from './nativeTypes.js';
 interface GameMethods extends HybridObject<{
     ios: 'c++';
     android: 'c++';

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,EACL,YAAY,EACb,MAAM,eAAe,CAAC;AAGvB,UAAU,WAAY,SAAQ,YAAY,CAAC;IACzC,GAAG,EAAE,KAAK,CAAC;IACX,OAAO,EAAE,KAAK,CAAC;CAChB,CAAC;IACA,4BAA4B;IAC5B,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;IAEpC,2BAA2B;IAC3B,KAAK,IAAI,IAAI,CAAC;IACd,MAAM,IAAI,IAAI,CAAC;IAEf,4BAA4B;IAC5B,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAChC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAEpD,4BAA4B;IAC5B,YAAY,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAE/C,oBAAoB;IACpB,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"}
+{"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,EACL,YAAY,EACb,MAAM,kBAAe,CAAC;AAGvB,UAAU,WAAY,SAAQ,YAAY,CAAC;IACzC,GAAG,EAAE,KAAK,CAAC;IACX,OAAO,EAAE,KAAK,CAAC;CAChB,CAAC;IACA,4BAA4B;IAC5B,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;IAEpC,2BAA2B;IAC3B,KAAK,IAAI,IAAI,CAAC;IACd,MAAM,IAAI,IAAI,CAAC;IAEf,4BAA4B;IAC5B,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAChC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAEpD,4BAA4B;IAC5B,YAAY,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAE/C,oBAAoB;IACpB,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/lib/typescript/src/index.d.ts

@@ -1,6 +1,6 @@
-import GameEngine from './GameEngine';
-export * from './GameMethods';
-export * from './types';
-export type { World, Screen, Entity, CollisionPair, Collision, EntityUpdate, SystemContext, } from './nativeTypes';
+import GameEngine from './GameEngine.js';
+export * from './GameMethods.js';
+export * from './types.js';
+export type { World, Screen, Entity, CollisionPair, Collision, EntityUpdate, SystemContext, } from './nativeTypes.js';
 export { GameEngine };
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,cAAc,CAAC;AAEtC,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,YAAY,EACV,KAAK,EACL,MAAM,EACN,MAAM,EACN,aAAa,EACb,SAAS,EACT,YAAY,EACZ,aAAa,GACd,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,iBAAc,CAAC;AAEtC,cAAc,kBAAe,CAAC;AAC9B,cAAc,YAAS,CAAC;AACxB,YAAY,EACV,KAAK,EACL,MAAM,EACN,MAAM,EACN,aAAa,EACb,SAAS,EACT,YAAY,EACZ,aAAa,GACd,MAAM,kBAAe,CAAC;AACvB,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/lib/typescript/src/types.d.ts

@@ -1,4 +1,4 @@
-import type { System as NativeSystem, Screen, Entity, World, SystemContext } from './nativeTypes';
+import type { System as NativeSystem, Screen, Entity, World, SystemContext } from './nativeTypes.js';
 export type System = Omit<NativeSystem, 'onTick'> & {
     /** Called every tick with the resolved entities and collisions. */
     onTick: (systemContext: SystemContext) => void;

package/lib/typescript/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,IAAI,YAAY,EACtB,MAAM,EACN,MAAM,EACN,KAAK,EACL,aAAa,EACd,MAAM,eAAe,CAAC;AAEvB,MAAM,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,GAAG;IAClD,mEAAmE;IACnE,MAAM,EAAE,CAAC,aAAa,EAAE,aAAa,KAAK,IAAI,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,6CAA6C;IAC7C,KAAK,EAAE,KAAK,CAAC;IACb,wCAAwC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,8GAA8G;IAC9G,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,wDAAwD;IACxD,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,IAAI,YAAY,EACtB,MAAM,EACN,MAAM,EACN,KAAK,EACL,aAAa,EACd,MAAM,kBAAe,CAAC;AAEvB,MAAM,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,GAAG;IAClD,mEAAmE;IACnE,MAAM,EAAE,CAAC,aAAa,EAAE,aAAa,KAAK,IAAI,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,6CAA6C;IAC7C,KAAK,EAAE,KAAK,CAAC;IACb,wCAAwC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,8GAA8G;IAC9G,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,wDAAwD;IACxD,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC"}

package/nitrogen/generated/android/c++/views/JHybridGameEngineStateUpdater.cpp

@@ -15,38 +15,55 @@ namespace margelo::nitro::rngine::views {
 using namespace facebook;
 using ConcreteStateData = react::ConcreteState<HybridGameEngineState>;
 
-void JHybridGameEngineStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                                           jni::alias_ref<JHybridGameEngineSpec::JavaPart> javaView,
-                                           jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface) {
-  std::shared_ptr<JHybridGameEngineSpec> hybridView = javaView->getJHybridGameEngineSpec();
-
+std::shared_ptr<const HybridGameEngineProps> JHybridGameEngineStateUpdater::getPropsFromStateWrapper(
+    jni::alias_ref<JStateWrapper::javaobject> stateWrapper) {
+  if (stateWrapper.get() == nullptr) {
+    return nullptr;
+  }
   // Get concrete StateWrapperImpl from passed StateWrapper interface object
-  jobject rawStateWrapper = stateWrapperInterface.get();
-  if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) [[unlikely]] {
-      throw std::runtime_error("StateWrapper is not a StateWrapperImpl");
+  jobject rawStateWrapper = stateWrapper.get();
+  if (!stateWrapper->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) [[unlikely]] {
+    throw std::runtime_error("StateWrapper is not a StateWrapperImpl");
+  }
+  auto stateWrapperImpl = jni::alias_ref<react::StateWrapperImpl::javaobject>{
+    static_cast<react::StateWrapperImpl::javaobject>(rawStateWrapper)
+  };
+  std::shared_ptr<const react::State> state = stateWrapperImpl->cthis()->getState();
+  if (state == nullptr) {
+    return nullptr;
   }
-  auto stateWrapper = jni::alias_ref<react::StateWrapperImpl::javaobject>{
-            static_cast<react::StateWrapperImpl::javaobject>(rawStateWrapper)};
-  std::shared_ptr<const react::State> state = stateWrapper->cthis()->getState();
   auto concreteState = std::static_pointer_cast<const ConcreteStateData>(state);
   const HybridGameEngineState& data = concreteState->getData();
-  const std::shared_ptr<HybridGameEngineProps>& props = data.getProps();
+  const std::shared_ptr<const HybridGameEngineProps>& props = data.getProps();
   if (props == nullptr) [[unlikely]] {
-    // Props aren't set yet!
     throw std::runtime_error("HybridGameEngineState's data doesn't contain any props!");
   }
+  return props;
+}
+
+void JHybridGameEngineStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
+                                           jni::alias_ref<JHybridGameEngineSpec::JavaPart> javaView,
+                                           jni::alias_ref<JStateWrapper::javaobject> newState,
+                                           jni::alias_ref<JStateWrapper::javaobject> oldState) {
+  std::shared_ptr<JHybridGameEngineSpec> hybridView = javaView->getJHybridGameEngineSpec();
+  std::shared_ptr<const HybridGameEngineProps> newProps = getPropsFromStateWrapper(newState);
+  std::shared_ptr<const HybridGameEngineProps> oldProps = getPropsFromStateWrapper(oldState);
+  if (newProps == nullptr) [[unlikely]] {
+    throw std::runtime_error("Current StateWrapper doesn't contain any props!");
+  }
 
-  // Update all props if they are dirty
+  // Update only props that differ from the previous State snapshot.
   
 
   // Update hybridRef if it changed
-  if (props->hybridRef.isDirty) {
+  if (oldProps == nullptr
+        ? newProps->hybridRef.isProvided()
+        : !newProps->hybridRef.hasSameValue(oldProps->hybridRef)) {
     // hybridRef changed - call it with new this
-    const auto& maybeFunc = props->hybridRef.value;
+    const auto& maybeFunc = newProps->hybridRef.get();
     if (maybeFunc.has_value()) {
       maybeFunc.value()(hybridView);
     }
-    props->hybridRef.isDirty = false;
   }
 }
 

package/nitrogen/generated/android/c++/views/JHybridGameEngineStateUpdater.hpp

@@ -31,7 +31,12 @@ public:
 public:
   static void updateViewProps(jni::alias_ref<jni::JClass> /* class */,
                               jni::alias_ref<JHybridGameEngineSpec::JavaPart> view,
-                              jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface);
+                              jni::alias_ref<JStateWrapper::javaobject> newState,
+                              jni::alias_ref<JStateWrapper::javaobject> oldState);
+
+private:
+  static std::shared_ptr<const HybridGameEngineProps> getPropsFromStateWrapper(
+      jni::alias_ref<JStateWrapper::javaobject> stateWrapper);
 
 public:
   static void registerNatives() {

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngine/HybridGameEngineSpec.kt

@@ -10,6 +10,7 @@ package com.margelo.nitro.rngine
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
+import dalvik.annotation.optimization.FastNative
 import com.margelo.nitro.core.HybridObject
 import com.margelo.nitro.views.HybridView
 
@@ -41,6 +42,7 @@ abstract class HybridGameEngineSpec: HybridView() {
   @Keep
   protected open class CxxPart(javaPart: HybridGameEngineSpec): HybridObject.CxxPart(javaPart) {
     // C++ JHybridGameEngineSpec::CxxPart::initHybrid(...)
+    @FastNative
     external override fun initHybrid(): HybridData
   }
   override fun createCxxPart(): CxxPart {

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngine/views/HybridGameEngineManager.kt

@@ -20,6 +20,14 @@ import com.margelo.nitro.rngine.*
  * Represents the React Native `ViewManager` for the "GameEngine" Nitro HybridView.
  */
 public class HybridGameEngineManager: SimpleViewManager<View>() {
+  /**
+   * Represents the View and its last state snapshot (mutable)
+   */
+  private class HybridViewHolder(
+    val hybridView: GameEngine,
+    var lastState: StateWrapper? = null,
+  )
+
   init {
     if (RecyclableView::class.java.isAssignableFrom(GameEngine::class.java)) {
       // Enable view recycling
@@ -34,33 +42,41 @@ public class HybridGameEngineManager: SimpleViewManager<View>() {
   override fun createViewInstance(reactContext: ThemedReactContext): View {
     val hybridView = GameEngine(reactContext)
     val view = hybridView.view
-    view.setTag(associated_hybrid_view_tag, hybridView)
+    view.setTag(associated_hybrid_view_tag, HybridViewHolder(hybridView))
     return view
   }
 
   override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
-    val hybridView = getHybridView(view)
+    val holder = getHybridViewHolder(view)
       ?: throw Error("Couldn't find view $view in local views table!")
+    val hybridView = holder.hybridView
+    val oldState = holder.lastState
+    val newState = stateWrapper
 
     // 1. Update each prop individually
     hybridView.beforeUpdate()
-    HybridGameEngineStateUpdater.updateViewProps(hybridView, stateWrapper)
+    HybridGameEngineStateUpdater.updateViewProps(hybridView, newState, oldState)
     hybridView.afterUpdate()
+    holder.lastState = newState
 
     // 2. Continue in base View props
-    return super.updateState(view, props, stateWrapper)
+    return super.updateState(view, props, newState)
   }
 
   override fun onDropViewInstance(view: View) {
-    val hybridView = getHybridView(view)
-    hybridView?.onDropView()
+    val holder = getHybridViewHolder(view)
+    holder?.lastState = null
+    holder?.hybridView?.onDropView()
     return super.onDropViewInstance(view)
   }
 
   protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
-    super.prepareToRecycleView(reactContext, view)
-    val hybridView = getHybridView(view)
+    val preparedView = super.prepareToRecycleView(reactContext, view)
+      ?: return null
+    val holder = getHybridViewHolder(preparedView)
       ?: return null
+    val hybridView = holder.hybridView
+    holder.lastState = null
 
     @Suppress("USELESS_IS_CHECK")
     if (hybridView is RecyclableView) {
@@ -74,7 +90,7 @@ public class HybridGameEngineManager: SimpleViewManager<View>() {
     }
   }
 
-  private fun getHybridView(view: View): GameEngine? {
-    return view.getTag(associated_hybrid_view_tag) as? GameEngine
+  private fun getHybridViewHolder(view: View): HybridViewHolder? {
+    return view.getTag(associated_hybrid_view_tag) as? HybridViewHolder
   }
 }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngine/views/HybridGameEngineStateUpdater.kt

@@ -14,10 +14,10 @@ internal class HybridGameEngineStateUpdater {
   companion object {
     /**
      * Updates the props for [view] through C++.
-     * The [state] prop is expected to contain [view]'s props as wrapped Fabric state.
+     * The [newState] prop is expected to contain [view]'s props as wrapped Fabric state.
      */
     @Suppress("KotlinJniMissingFunction")
     @JvmStatic
-    external fun updateViewProps(view: HybridGameEngineSpec, state: StateWrapper)
+    external fun updateViewProps(view: HybridGameEngineSpec, newState: StateWrapper, oldState: StateWrapper?)
   }
 }

package/nitrogen/generated/ios/c++/views/HybridGameEngineComponent.mm

@@ -37,6 +37,7 @@ using namespace margelo::nitro::rngine::views;
 
 @implementation HybridGameEngineComponent {
   std::shared_ptr<HybridGameEngineSpecSwift> _hybridView;
+  BOOL _didDropView;
 }
 
 + (void) load {
@@ -50,6 +51,7 @@ using namespace margelo::nitro::rngine::views;
 
 - (instancetype) init {
   if (self = [super init]) {
+    _props = HybridGameEngineShadowNode::defaultSharedProps();
     std::shared_ptr<HybridGameEngineSpec> hybridView = Rngine::RngineAutolinking::createGameEngine();
     _hybridView = std::dynamic_pointer_cast<HybridGameEngineSpecSwift>(hybridView);
     [self updateView];
@@ -69,31 +71,50 @@ using namespace margelo::nitro::rngine::views;
   [self setContentView:view];
 }
 
+- (void) notifyOnDropView {
+  // A recycled component can later be invalidated. Notify only once per mount.
+  if (_didDropView) {
+    return;
+  }
+  Rngine::HybridGameEngineSpec_cxx& swiftPart = _hybridView->getSwiftPart();
+  swiftPart.onDropView();
+  _didDropView = YES;
+}
+
 - (void) updateProps:(const std::shared_ptr<const react::Props>&)props
             oldProps:(const std::shared_ptr<const react::Props>&)oldProps {
+  // A props update marks a newly mounted or still-active component.
+  _didDropView = NO;
+
   // 1. Downcast props
-  const auto& newViewPropsConst = *std::static_pointer_cast<HybridGameEngineProps const>(props);
-  auto& newViewProps = const_cast<HybridGameEngineProps&>(newViewPropsConst);
+  const auto& newViewProps = *std::static_pointer_cast<const HybridGameEngineProps>(props);
+  const auto* oldViewProps = static_cast<const HybridGameEngineProps*>(oldProps.get());
   Rngine::HybridGameEngineSpec_cxx& swiftPart = _hybridView->getSwiftPart();
 
-  // 2. Update each prop individually
-  swiftPart.beforeUpdate();
-
-  
-
-  swiftPart.afterUpdate();
-
-  // 3. Update hybridRef if it changed
-  if (newViewProps.hybridRef.isDirty) {
-    // hybridRef changed - call it with new this
-    const auto& maybeFunc = newViewProps.hybridRef.value;
-    if (maybeFunc.has_value()) {
-      maybeFunc.value()(_hybridView);
+  // 2. Update only props that differ from the previous Props snapshot.
+  const bool hasTransactionPropChanges = oldViewProps == nullptr
+      ? newViewProps.hasAnyProvidedProps()
+      : !newViewProps.hasSameProps(*oldViewProps);
+  if (hasTransactionPropChanges) {
+    swiftPart.beforeUpdate();
+
+    
+
+    // Update hybridRef if it changed
+    if (oldViewProps == nullptr
+          ? newViewProps.hybridRef.isProvided()
+          : !newViewProps.hybridRef.hasSameValue(oldViewProps->hybridRef)) {
+      // hybridRef changed - call it with new this
+      const auto& maybeFunc = newViewProps.hybridRef.get();
+      if (maybeFunc.has_value()) {
+        maybeFunc.value()(_hybridView);
+      }
     }
-    newViewProps.hybridRef.isDirty = false;
+
+    swiftPart.afterUpdate();
   }
 
-  // 4. Continue in base class
+  // 3. Continue in base class
   [super updateProps:props oldProps:oldProps];
 }
 
@@ -102,6 +123,7 @@ using namespace margelo::nitro::rngine::views;
 }
 
 - (void)prepareForRecycle {
+  [self notifyOnDropView];
   [super prepareForRecycle];
   Rngine::HybridGameEngineSpec_cxx& swiftPart = _hybridView->getSwiftPart();
   swiftPart.maybePrepareForRecycle();
@@ -109,8 +131,7 @@ using namespace margelo::nitro::rngine::views;
 
 #ifdef ENABLE_RCT_COMPONENT_VIEW_INVALIDATE
 - (void)invalidate {
-  Rngine::HybridGameEngineSpec_cxx& swiftPart = _hybridView->getSwiftPart();
-  swiftPart.onDropView();
+  [self notifyOnDropView];
   [super invalidate];
 }
 #endif

package/nitrogen/generated/shared/c++/views/HybridGameEngineComponent.cpp

@@ -7,35 +7,20 @@
 
 #include "HybridGameEngineComponent.hpp"
 
-#include <string>
-#include <exception>
-#include <utility>
-#include <NitroModules/NitroDefines.hpp>
-#include <NitroModules/JSIConverter.hpp>
-#include <NitroModules/PropNameIDCache.hpp>
-#include <react/renderer/core/RawValue.h>
-#include <react/renderer/core/ShadowNode.h>
-#include <react/renderer/core/ComponentDescriptor.h>
-#include <react/renderer/components/view/ViewProps.h>
+#include <NitroModules/NitroHash.hpp>
+#include <NitroModules/ReactProp.hpp>
 
 namespace margelo::nitro::rngine::views {
 
+  using namespace facebook;
+
   extern const char HybridGameEngineComponentName[] = "GameEngine";
 
   HybridGameEngineProps::HybridGameEngineProps(const react::PropsParserContext& context,
                                                const HybridGameEngineProps& sourceProps,
                                                const react::RawProps& rawProps):
     react::ViewProps(context, sourceProps, rawProps, filterObjectKeys),
-    hybridRef([&]() -> CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridGameEngineSpec>& /* ref */)>>> {
-      try {
-        const react::RawValue* rawValue = rawProps.at("hybridRef", nullptr, nullptr);
-        if (rawValue == nullptr) return sourceProps.hybridRef;
-        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridGameEngineSpec>& /* ref */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, PropNameIDCache::get(*runtime, "f")), sourceProps.hybridRef);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("GameEngine.hybridRef: ") + exc.what());
-      }
-    }()) { }
+    hybridRef(nitro::ReactProp<std::optional<std::function<void(const std::shared_ptr<HybridGameEngineSpec>& /* ref */)>>>::fromRawValue("GameEngine", "hybridRef", rawProps, sourceProps.hybridRef)) { }
 
   bool HybridGameEngineProps::filterObjectKeys(const std::string& propName) {
     switch (hashString(propName)) {
@@ -44,29 +29,4 @@ namespace margelo::nitro::rngine::views {
     }
   }
 
-  HybridGameEngineComponentDescriptor::HybridGameEngineComponentDescriptor(const react::ComponentDescriptorParameters& parameters)
-    : ConcreteComponentDescriptor(parameters,
-                                  react::RawPropsParser(/* enableJsiParser */ true)) {}
-
-  std::shared_ptr<const react::Props> HybridGameEngineComponentDescriptor::cloneProps(const react::PropsParserContext& context,
-                                                                                      const std::shared_ptr<const react::Props>& props,
-                                                                                      react::RawProps rawProps) const {
-    // 1. Prepare raw props parser
-    rawProps.parse(rawPropsParser_);
-    // 2. Copy props with Nitro's cached copy constructor
-    return HybridGameEngineShadowNode::Props(context, /* & */ rawProps, props);
-  }
-
-#ifdef ANDROID
-  void HybridGameEngineComponentDescriptor::adopt(react::ShadowNode& shadowNode) const {
-    // This is called immediately after `ShadowNode` is created, cloned or in progress.
-    // On Android, we need to wrap props in our state, which gets routed through Java and later unwrapped in JNI/C++.
-    auto& concreteShadowNode = static_cast<HybridGameEngineShadowNode&>(shadowNode);
-    const std::shared_ptr<const HybridGameEngineProps>& constProps = concreteShadowNode.getConcreteSharedProps();
-    const std::shared_ptr<HybridGameEngineProps>& props = std::const_pointer_cast<HybridGameEngineProps>(constProps);
-    HybridGameEngineState state{props};
-    concreteShadowNode.setStateData(std::move(state));
-  }
-#endif
-
 } // namespace margelo::nitro::rngine::views

package/nitrogen/generated/shared/c++/views/HybridGameEngineComponent.hpp

@@ -7,14 +7,15 @@
 
 #pragma once
 
-#include <optional>
-#include <NitroModules/NitroDefines.hpp>
-#include <NitroModules/NitroHash.hpp>
-#include <NitroModules/CachedProp.hpp>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <NitroModules/ReactProp.hpp>
+#include <NitroModules/ViewComponentDescriptor.hpp>
+#include <NitroModules/ViewPropsHolderState.hpp>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/RawProps.h>
+
+#include <string>
 
 #include <memory>
 #include "HybridGameEngineSpec.hpp"
@@ -41,7 +42,17 @@ namespace margelo::nitro::rngine::views {
                           const react::RawProps& rawProps);
 
   public:
-    CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridGameEngineSpec>& /* ref */)>>> hybridRef;
+    nitro::ReactProp<std::optional<std::function<void(const std::shared_ptr<HybridGameEngineSpec>& /* ref */)>>> hybridRef;
+
+    [[nodiscard]]
+    bool hasSameProps(const HybridGameEngineProps& other) const noexcept {
+      return hybridRef.hasSameValue(other.hybridRef);
+    }
+
+    [[nodiscard]]
+    bool hasAnyProvidedProps() const noexcept {
+      return hybridRef.isProvided();
+    }
 
   private:
     static bool filterObjectKeys(const std::string& propName);
@@ -50,32 +61,7 @@ namespace margelo::nitro::rngine::views {
   /**
    * State for the "GameEngine" View.
    */
-  class HybridGameEngineState final {
-  public:
-    HybridGameEngineState() = default;
-    explicit HybridGameEngineState(const std::shared_ptr<HybridGameEngineProps>& props):
-      _props(props) {}
-
-  public:
-    [[nodiscard]]
-    const std::shared_ptr<HybridGameEngineProps>& getProps() const {
-      return _props;
-    }
-
-  public:
-#ifdef ANDROID
-  HybridGameEngineState(const HybridGameEngineState& /* previousState */, folly::dynamic /* data */) {}
-  folly::dynamic getDynamic() const {
-    throw std::runtime_error("HybridGameEngineState does not support folly!");
-  }
-  react::MapBuffer getMapBuffer() const {
-    throw std::runtime_error("HybridGameEngineState does not support MapBuffer!");
-  };
-#endif
-
-  private:
-    std::shared_ptr<HybridGameEngineProps> _props;
-  };
+  using HybridGameEngineState = nitro::ViewPropsHolderState<HybridGameEngineProps>;
 
   /**
    * The Shadow Node for the "GameEngine" View.
@@ -88,21 +74,7 @@ namespace margelo::nitro::rngine::views {
   /**
    * The Component Descriptor for the "GameEngine" View.
    */
-  class HybridGameEngineComponentDescriptor final: public react::ConcreteComponentDescriptor<HybridGameEngineShadowNode> {
-  public:
-    explicit HybridGameEngineComponentDescriptor(const react::ComponentDescriptorParameters& parameters);
-
-  public:
-    /**
-     * A faster path for cloning props - reuses the caching logic from `HybridGameEngineProps`.
-     */
-    std::shared_ptr<const react::Props> cloneProps(const react::PropsParserContext& context,
-                                                   const std::shared_ptr<const react::Props>& props,
-                                                   react::RawProps rawProps) const override;
-#ifdef ANDROID
-    void adopt(react::ShadowNode& shadowNode) const override;
-#endif
-  };
+  using HybridGameEngineComponentDescriptor = nitro::ViewComponentDescriptor<HybridGameEngineShadowNode>;
 
   /* The actual view for "GameEngine" needs to be implemented in platform-specific code. */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rngine",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "React Native 2D game engine powered by Nitro Modules",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -28,9 +28,6 @@
     "!android/gradlew",
     "!android/gradlew.bat",
     "!android/local.properties",
-    "!**/__tests__",
-    "!**/__fixtures__",
-    "!**/__mocks__",
     "!**/.*"
   ],
   "scripts": {
@@ -39,11 +36,7 @@
     "prepare": "bob build && node scripts/nitrogen-patch.js",
     "nitrogen": "nitrogen",
     "typecheck": "tsc",
-    "lint": "eslint \"**/*.{js,ts,tsx}\"",
-    "test": "jest",
-    "release": "release-it --only-version",
-    "web": "vite",
-    "build:web": "vite build"
+    "lint": "eslint \"**/*.{js,ts,tsx}\""
   },
   "keywords": [
     "react-native",
@@ -64,39 +57,33 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@commitlint/config-conventional": "^20.5.0",
-    "@eslint/compat": "^2.0.3",
-    "@eslint/eslintrc": "^3.3.5",
+    "@commitlint/config-conventional": "^21.2.3",
+    "@eslint/compat": "^2.1.1",
+    "@eslint/eslintrc": "^3.3.7",
     "@eslint/js": "^10.0.1",
-    "@jest/globals": "^30.0.0",
-    "@react-native/babel-preset": "0.85.0",
-    "@react-native/eslint-config": "0.85.0",
-    "@react-native/jest-preset": "0.85.0",
-    "@release-it/conventional-changelog": "^10.0.6",
-    "@types/react": "^19.2.0",
-    "commitlint": "^20.5.0",
+    "@react-native/babel-preset": "^0.87.1",
+    "@react-native/eslint-config": "^0.87.1",
+    "@types/react": "^19.3.0",
+    "commitlint": "^21.2.3",
     "del-cli": "^7.0.0",
-    "eslint": "^9.39.4",
+    "eslint": "9.39.5",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-ft-flow": "^3.0.11",
-    "eslint-plugin-prettier": "^5.5.5",
-    "jest": "^30.3.0",
-    "lefthook": "^2.1.4",
-    "nitrogen": "^0.35.3",
-    "prettier": "^3.8.1",
+    "eslint-plugin-prettier": "^5.5.6",
+    "lefthook": "^2.1.14",
+    "nitrogen": "^0.37.1",
+    "prettier": "^3.9.8",
     "react": "19.2.3",
-    "react-native": "0.85.0",
-    "react-native-builder-bob": "^0.41.0",
-    "react-native-nitro-modules": "^0.35.3",
-    "react-native-web": "~0.21.1",
-    "release-it": "^19.2.4",
-    "turbo": "^2.8.21",
+    "react-native": "0.85.3",
+    "react-native-builder-bob": "^0.43.1",
+    "react-native-nitro-modules": "^0.37.1",
+    "turbo": "^2.11.2",
     "typescript": "^6.0.2"
   },
   "peerDependencies": {
     "react": "*",
     "react-native": "*",
-    "react-native-nitro-modules": "^0.35.3"
+    "react-native-nitro-modules": "^0.37.1"
   },
   "workspaces": [
     "example"
@@ -134,50 +121,21 @@
     "trailingComma": "es5",
     "useTabs": false
   },
-  "jest": {
-    "preset": "@react-native/jest-preset",
-    "modulePathIgnorePatterns": [
-      "<rootDir>/example/node_modules",
-      "<rootDir>/lib/"
-    ]
-  },
   "commitlint": {
     "extends": [
       "@commitlint/config-conventional"
     ]
   },
-  "release-it": {
-    "git": {
-      "commitMessage": "chore: release ${version}",
-      "tagName": "v${version}"
-    },
-    "npm": {
-      "publish": true
-    },
-    "github": {
-      "release": true
-    },
-    "plugins": {
-      "@release-it/conventional-changelog": {
-        "preset": {
-          "name": "angular"
-        }
-      }
-    }
-  },
   "create-react-native-library": {
     "type": "nitro-view",
     "languages": "kotlin-swift",
     "tools": [
       "eslint",
-      "jest",
-      "lefthook",
-      "release-it",
-      "vite"
+      "lefthook"
     ],
     "version": "0.61.0"
   },
   "dependencies": {
-    "react-native-skia-android": "^152.0.0"
+    "react-native-skia-android": "^154.0.0"
   }
 }

package/shared/GameLoop.cpp

@@ -71,6 +71,8 @@ void GameLoop::runGameLoop() {
   auto &gameRenderer = GameRenderer::getInstance();
 
   while (_isRunning) {
+    gameRenderer.processPendingTasks();
+
     double targetDeltaTime;
     {
       std::lock_guard<std::mutex> lock(_worldMutex);

package/shared/GameRenderer.cpp

@@ -43,63 +43,85 @@ GameRenderer::~GameRenderer() {
 }
 
 void GameRenderer::onSurfaceCreated(ANativeWindow *window) {
-  __android_log_print(ANDROID_LOG_INFO, "GameRenderer", "onSurfaceCreated");
 
-  _nativeWindow = window;
+  std::lock_guard<std::mutex> lock(_taskMutex);
+  _taskQueue.push([this, window]() {
+    __android_log_print(ANDROID_LOG_INFO, "GameRenderer", "onSurfaceCreated");
 
-  if (!_initialized) {
-    if (!initializeEGL()) {
-      __android_log_print(ANDROID_LOG_ERROR, "GameRenderer",
-                          "onSurfaceCreated: EGL initialization failed");
-      return;
+    _nativeWindow = window;
+
+    if (!_initialized) {
+      if (!initializeEGL()) {
+        __android_log_print(ANDROID_LOG_ERROR, "GameRenderer",
+                            "onSurfaceCreated: EGL initialization failed");
+        return;
+      }
+      _initialized = true;
     }
-    _initialized = true;
-  }
 
-  if (!createEGLSurface()) {
-    __android_log_print(ANDROID_LOG_ERROR, "GameRenderer",
-                        "onSurfaceCreated: EGL surface creation failed");
-  }
+    if (!createEGLSurface()) {
+      __android_log_print(ANDROID_LOG_ERROR, "GameRenderer",
+                          "onSurfaceCreated: EGL surface creation failed");
+    }
+  });
 }
 
 void GameRenderer::onSurfaceChanged(int width, int height) {
-  _width = width;
-  _height = height;
-  _surface = nullptr;
-
-  __android_log_print(ANDROID_LOG_INFO, "GameRenderer",
-                      "onSurfaceChanged: Width: %d, Height: %d", _width,
-                      _height);
+  std::lock_guard<std::mutex> lock(_taskMutex);
+  _taskQueue.push([this, width, height]() {
+    _width = width;
+    _height = height;
+    _surface = nullptr;
+
+    __android_log_print(ANDROID_LOG_INFO, "GameRenderer",
+                        "onSurfaceChanged: Width: %d, Height: %d", _width,
+                        _height);
+  });
 }
 
 void GameRenderer::onSurfaceDestroyed() {
-  if (_eglDisplay != EGL_NO_DISPLAY) {
-    eglMakeCurrent(_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+  std::lock_guard<std::mutex> lock(_taskMutex);
+  _taskQueue.push([this]() {
+    if (_eglDisplay != EGL_NO_DISPLAY) {
+      eglMakeCurrent(_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE,
+                     EGL_NO_CONTEXT);
+
+      if (_eglSurface != EGL_NO_SURFACE) {
+        eglDestroySurface(_eglDisplay, _eglSurface);
+        _eglSurface = EGL_NO_SURFACE;
+      }
+    }
 
-    if (_eglSurface != EGL_NO_SURFACE) {
-      eglDestroySurface(_eglDisplay, _eglSurface);
-      _eglSurface = EGL_NO_SURFACE;
+    if (_nativeWindow) {
+      ANativeWindow_release(_nativeWindow);
+      _nativeWindow = nullptr;
     }
-  }
 
-  if (_nativeWindow) {
-    ANativeWindow_release(_nativeWindow);
-    _nativeWindow = nullptr;
-  }
+    _surface = nullptr;
+    _width = 0;
+    _height = 0;
+
+    __android_log_print(ANDROID_LOG_INFO, "GameRenderer", "onSurfaceDestroyed");
+  });
+}
 
-  _surface = nullptr;
-  _width = 0;
-  _height = 0;
+void GameRenderer::processPendingTasks() {
+  std::queue<std::function<void()>> tasksToProcess;
 
-  __android_log_print(ANDROID_LOG_INFO, "GameRenderer", "onSurfaceDestroyed");
+  {
+    std::lock_guard<std::mutex> lock(_taskMutex);
+    std::swap(tasksToProcess, _taskQueue);
+  }
+
+  while (!tasksToProcess.empty()) {
+    tasksToProcess.front()(); // Executes on the game loop thread
+    tasksToProcess.pop();
+  }
 }
 
 void GameRenderer::render(const Screen &screen,
                           const std::map<std::string, Entity> &entities) {
 
-  __android_log_print(ANDROID_LOG_DEBUG, "GameRenderer",
-                      "render: called, entities=%zu", entities.size());
-
   if (!_grContext || _eglSurface == EGL_NO_SURFACE || _width == 0 ||
       _height == 0) {
     __android_log_print(ANDROID_LOG_WARN, "GameRenderer",
@@ -107,12 +129,6 @@ void GameRenderer::render(const Screen &screen,
     return;
   }
 
-  if (!eglMakeCurrent(_eglDisplay, _eglSurface, _eglSurface, _eglContext)) {
-    __android_log_print(ANDROID_LOG_ERROR, "GameRenderer",
-                        "render: eglMakeCurrent failed: 0x%x", eglGetError());
-    return;
-  }
-
   if (!_surface) {
     if (!createSkSurface()) {
       return;
@@ -228,8 +244,6 @@ void GameRenderer::render(const Screen &screen,
 
   _grContext->flushAndSubmit(_surface.get());
   eglSwapBuffers(_eglDisplay, _eglSurface);
-
-  __android_log_print(ANDROID_LOG_DEBUG, "GameRenderer", "render: complete");
 }
 
 bool GameRenderer::isEntityVisible(const Entity &entity,
@@ -342,8 +356,6 @@ bool GameRenderer::createEGLSurface() {
     }
   }
 
-  eglMakeCurrent(_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-
   __android_log_print(ANDROID_LOG_INFO, "GameRenderer",
                       "createEGLSurface: EGL surface created");
   return true;

package/shared/GameRenderer.hpp

@@ -36,6 +36,7 @@ public:
   void onSurfaceChanged(int width, int height);
   void onSurfaceDestroyed();
 
+  void processPendingTasks();
   void render(const Screen &screen,
               const std::map<std::string, Entity> &entities);
 
@@ -59,6 +60,9 @@ private:
   std::map<double, sk_sp<skottie::Animation>> _lottieCache;
   std::map<double, std::variant<sk_sp<SkSVGDOM>, sk_sp<SkImage>>> _imageCache;
 
+  std::mutex _taskMutex;
+  std::queue<std::function<void()>> _taskQueue;
+
   bool isEntityVisible(const Entity &entity, const SkRect &viewBounds);
 
   bool initializeEGL();