From dda9a61f20b19e82038a96107188c098dccfd3f3 Mon Sep 17 00:00:00 2001
From: Nick Fisher <nick.fisher@avinium.com>
Date: Thu, 6 Jun 2024 22:10:56 +0800
Subject: [PATCH] rename Android C++ glue file

---
 .../android/src/main/cpp/FilamentAndroid.cpp  | 21 -------------
 .../src/main/cpp/FlutterFilamentAndroid.cpp   | 31 +++++++++++++++++++
 2 files changed, 31 insertions(+), 21 deletions(-)
 delete mode 100644 flutter_filament_federated/flutter_filament/android/src/main/cpp/FilamentAndroid.cpp
 create mode 100644 flutter_filament_federated/flutter_filament/android/src/main/cpp/FlutterFilamentAndroid.cpp

diff --git a/flutter_filament_federated/flutter_filament/android/src/main/cpp/FilamentAndroid.cpp b/flutter_filament_federated/flutter_filament/android/src/main/cpp/FilamentAndroid.cpp
deleted file mode 100644
index 1e0c4695..00000000
--- a/flutter_filament_federated/flutter_filament/android/src/main/cpp/FilamentAndroid.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <android/native_window_jni.h>
-#include <android/native_activity.h>
-
-extern "C" {
-
-  #include "FlutterFilamentFFIApi.h"
-
-  void* get_native_window_from_surface(
-    jobject surface,
-    JNIEnv* env
-  ) {
-    void* window = ANativeWindow_fromSurface(env, surface);
-    return window;
-  }
-
-  // this does nothing, but we need it for JNA to return the correct pointer 
-  FilamentRenderCallback make_render_callback_fn_pointer(FilamentRenderCallback callback) {
-    return callback;
-  }
-  
-}
diff --git a/flutter_filament_federated/flutter_filament/android/src/main/cpp/FlutterFilamentAndroid.cpp b/flutter_filament_federated/flutter_filament/android/src/main/cpp/FlutterFilamentAndroid.cpp
new file mode 100644
index 00000000..b8cf0189
--- /dev/null
+++ b/flutter_filament_federated/flutter_filament/android/src/main/cpp/FlutterFilamentAndroid.cpp
@@ -0,0 +1,31 @@
+#include <android/native_window_jni.h>
+#include <android/native_activity.h>
+
+#include "DartFilamentFFIApi.h"
+
+extern "C" {
+  void* get_native_window_from_surface(
+    jobject surface,
+    JNIEnv* env
+  ) {
+    void* window = ANativeWindow_fromSurface(env, surface);
+    return window;
+  }
+
+  ResourceLoaderWrapper* make_resource_loader_wrapper_android(LoadFilamentResourceFromOwner loadFn, FreeFilamentResourceFromOwner freeFn, void* owner) {
+    ResourceLoaderWrapper *rlw = (ResourceLoaderWrapper *)malloc(sizeof(ResourceLoaderWrapper));
+    rlw->loadToOut = nullptr;
+    rlw->freeResource = nullptr;
+    rlw->loadResource = nullptr;
+    rlw->loadFromOwner = loadFn;
+    rlw->freeFromOwner = freeFn;
+    rlw->owner = owner;
+    return rlw;
+  }
+
+  // this does nothing, but we need it for JNA to return the correct pointer 
+  FilamentRenderCallback make_render_callback_fn_pointer(FilamentRenderCallback callback) {
+    return callback;
+  }
+  
+}