fix: Fix Choreographer breaking

package/android/src/main/cpp/Filament.cpp

@@ -1,4 +1,5 @@
 #include "FilamentInstaller.h"
+#include "JChoreographer.h"
 #include "JFilamentProxy.h"
 #include "JFilamentView.h"
 #include "JSurfaceProvider.h"
@@ -11,5 +12,6 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
     margelo::JFilamentProxy::registerNatives();
     margelo::JSurfaceProvider::registerNatives();
     margelo::JFilamentView::registerNatives();
+    margelo::JChoreographer::registerNatives();
   });
 }

package/android/src/main/cpp/java-bindings/JChoreographer.cpp

@@ -10,8 +10,6 @@ namespace margelo {
 void JChoreographer::registerNatives() {
   registerHybrid({
       makeNativeMethod("initHybrid", JChoreographer::initHybrid),
-      makeNativeMethod("start", JChoreographer::start),
-      makeNativeMethod("stop", JChoreographer::stop),
       makeNativeMethod("onFrame", JChoreographer::onFrameLong),
   });
 }

package/android/src/main/java/com/margelo/filament/FilamentChoreographer.java

@@ -14,29 +14,36 @@ public class FilamentChoreographer {
     @Keep
     private final HybridData mHybridData;
     private final Choreographer choreographer;
-    private final Choreographer.FrameCallback frameCallback;
     private boolean isRunning;
 
     public FilamentChoreographer() {
         mHybridData = initHybrid();
         choreographer = Choreographer.getInstance();
-        frameCallback = timestamp -> {
-            if (!isRunning) return;
-            onFrame(timestamp);
-        };
     }
 
+    private void onFrameCallback(long timestamp) {
+        if (!isRunning) return;
+        onFrame(timestamp);
+        choreographer.postFrameCallback(this::onFrameCallback);
+    }
+
+    /** @noinspection unused */
+    @DoNotStrip
+    @Keep
     private synchronized void start() {
         if (!isRunning) {
             isRunning = true;
-            choreographer.postFrameCallback(frameCallback);
+            choreographer.postFrameCallback(this::onFrameCallback);
         }
     }
 
+    /** @noinspection unused */
+    @DoNotStrip
+    @Keep
     private synchronized void stop() {
         if (isRunning) {
             isRunning = false;
-            choreographer.removeFrameCallback(frameCallback);
+            choreographer.removeFrameCallback(this::onFrameCallback);
         }
     }
 

package/cpp/Choreographer.cpp

@@ -7,7 +7,9 @@
 namespace margelo {
 
 void Choreographer::loadHybridMethods() {
-  registerHybridMethod("setOnFrameCallback", &Choreographer::addOnFrameListener, this);
+  registerHybridMethod("addOnFrameListener", &Choreographer::addOnFrameListener, this);
+  registerHybridMethod("start", &Choreographer::start, this);
+  registerHybridMethod("stop", &Choreographer::stop, this);
 }
 
 std::shared_ptr<Listener> Choreographer::addOnFrameListener(Choreographer::OnFrameCallback onFrameCallback) {

package/cpp/FilamentProxy.cpp

@@ -22,6 +22,7 @@ void FilamentProxy::loadHybridMethods() {
   registerHybridMethod("loadModel", &FilamentProxy::loadModel, this);
   registerHybridMethod("findFilamentView", &FilamentProxy::findFilamentView, this);
   registerHybridMethod("createTestObject", &FilamentProxy::createTestObject, this);
+  registerHybridMethod("createChoreographer", &FilamentProxy::createChoreographer, this);
 }
 
 } // namespace margelo

package/cpp/Listener.h

@@ -11,7 +11,7 @@ namespace margelo {
 
 class Listener : public HybridObject {
 public:
-  Listener(Listener&& listener): _remove(std::move(listener._remove)), _isRemoved(listener._isRemoved) {}
+  Listener(Listener&& listener) : _remove(std::move(listener._remove)), _isRemoved(listener._isRemoved) {}
   explicit Listener(std::function<void()> remove);
   ~Listener();
   void remove();

package/src/index.tsx

@@ -1,8 +1,10 @@
+import { testChoreographer } from './test/TestChoreographer'
 import { testHybridObject } from './test/TestHybridObject'
 
 export * from './FilamentView'
 
 const TEST_HYBRID_OBJECT = true
 if (__DEV__ && TEST_HYBRID_OBJECT) {
   testHybridObject()
+  testChoreographer().catch(console.error)
 }

package/src/native/FilamentProxy.ts

@@ -1,5 +1,15 @@
 import { FilamentNativeModule } from './FilamentNativeModule'
 
+interface Listener {
+  remove(): void
+}
+
+interface Choreographer {
+  addOnFrameListener(onFrame: (timestamp: number) => void): Listener
+  start(): void
+  stop(): void
+}
+
 interface TestHybridObject {
   int: number
   string: string
@@ -17,7 +27,10 @@ export interface TFilamentProxy {
    * @param path A web URL (http:// or https://), local file (file://) or resource ID.
    */
   loadModel(path: string): number
-
+  /**
+   * Create a new Choreographer instance running on the caller Thread.
+   */
+  createChoreographer(): Choreographer
   /**
    * @private
    */

package/src/test/TestChoreographer.ts

@@ -0,0 +1,29 @@
+import { FilamentProxy } from '../native/FilamentProxy'
+
+function timeout(ms: number): Promise<void> {
+  return new Promise((resolve) => {
+    setTimeout(() => resolve(), ms)
+  })
+}
+
+export async function testChoreographer() {
+  console.log('Creating Choreographer...')
+  const choreographer = FilamentProxy.createChoreographer()
+  console.log('Created Choreographer!', choreographer, 'Adding onFrame listener...')
+
+  let calls = 0
+  choreographer.addOnFrameListener((timestamp) => {
+    console.log(`Choreographer::onFrame(${timestamp})`)
+    calls++
+  })
+  choreographer.start()
+  await timeout(500)
+  console.log(`onFrame called ${calls} times in 500ms! Stopping...`)
+  const finalCalls = calls
+  choreographer.stop()
+  await timeout(500)
+  if (finalCalls > calls) {
+    throw new Error(`Choreographer::onFrame has been called ${finalCalls - calls} times after stoppingg!`)
+  }
+  console.log('Choreographer successfully stopped!')
+}