ios bridging header fixes

flutter_filament_federated/flutter_filament/ios/Classes/ResourceBuffer.c

@@ -1,4 +1,4 @@
-#include "ResourceBuffer.h"
+#include "ResourceBuffer.hpp"
 
 ResourceLoaderWrapper *make_resource_loader(LoadFilamentResourceFromOwner loadFn, FreeFilamentResourceFromOwner freeFn, void *const owner)
 {

flutter_filament_federated/flutter_filament/ios/flutter_filament.podspec

@@ -13,8 +13,8 @@ A new flutter plugin project.
   s.license          = { :file => '../LICENSE' }
   s.author           = { 'Your Company' => 'email@example.com' }
   s.source           = { :path => '.' }
-  s.source_files = 'Classes/*', 'include/SwiftFlutterFilamentPlugin-Bridging-Header.h', 'include/ResourceBuffer.h'
-  s.public_header_files = 'include/SwiftFlutterFilamentPlugin-Bridging-Header.h', 'include/ResourceBuffer.h'
+  s.source_files = 'Classes/*', 'include/SwiftFlutterFilamentPlugin-Bridging-Header.h','include/ResourceBuffer.hpp', 'src/ResourceBuffer.c'
+  s.public_header_files = 'include/SwiftFlutterFilamentPlugin-Bridging-Header.h', 'include/ResourceBuffer.hpp'
   s.dependency 'Flutter' 
   s.platform = :ios, '13.0'
   s.static_framework = true

flutter_filament_federated/flutter_filament/ios/include/ResourceBuffer.h

@@ -1 +0,0 @@
-../../../dart_filament/native/include/ResourceBuffer.h

flutter_filament_federated/flutter_filament/ios/include/ResourceBuffer.hpp

@@ -0,0 +1,91 @@
+#ifndef RESOURCE_BUFFER_H
+#define RESOURCE_BUFFER_H
+
+#include <stdint.h>
+#include <stdlib.h>
+
+//
+// A ResourceBuffer is a unified interface for working with
+// binary assets across various platforms.
+// This is simply:
+// 1) a pointer to some data
+// 2) the length of the data
+// 3) an ID that can be passed back to the native platform to release the underlying asset when needed.
+//
+struct ResourceBuffer
+{
+  const void *const data;
+  const int32_t size;
+  const int32_t id;
+};
+
+typedef struct ResourceBuffer ResourceBuffer;
+typedef ResourceBuffer (*LoadFilamentResource)(const char *uri);
+typedef ResourceBuffer (*LoadFilamentResourceFromOwner)(const char *const, void *const owner);
+typedef void (*FreeFilamentResource)(ResourceBuffer);
+typedef void (*FreeFilamentResourceFromOwner)(ResourceBuffer, void *const owner);
+
+struct ResourceLoaderWrapper
+{
+  LoadFilamentResource loadResource;
+  FreeFilamentResource freeResource;
+  LoadFilamentResourceFromOwner loadFromOwner;
+  FreeFilamentResourceFromOwner freeFromOwner;
+  void *owner;
+};
+typedef struct ResourceLoaderWrapper ResourceLoaderWrapper;
+
+
+#if defined(__cplusplus)
+
+namespace flutter_filament {
+
+struct ResourceLoaderWrapperImpl : public ResourceLoaderWrapper
+{
+
+  ResourceLoaderWrapperImpl(LoadFilamentResource loader, FreeFilamentResource freeResource)
+  {
+    loadFromOwner = nullptr;
+    freeFromOwner = nullptr;
+    loadResource = loader;
+    freeResource = freeResource;
+    owner = nullptr;
+  }
+
+  ResourceLoaderWrapperImpl(LoadFilamentResourceFromOwner loader, FreeFilamentResourceFromOwner freeResource, void * owner)
+  {
+    loadResource = nullptr;
+    freeResource = nullptr;
+    loadFromOwner = loader;
+    freeFromOwner = freeResource;
+    owner = owner;
+  }
+
+  ResourceBuffer load(const char *uri) const
+  {
+    if (loadFromOwner)
+    {
+      auto rb = loadFromOwner(uri, owner);
+      return rb;
+    }
+    auto rb = loadResource(uri);
+    return rb;
+  }
+
+  void free(ResourceBuffer rb) const
+  {
+    if (freeFromOwner)
+    {
+      freeFromOwner(rb, owner);
+    }
+    else
+    {
+      freeResource(rb);
+    }
+  }
+};
+
+}
+#endif
+
+#endif

flutter_filament_federated/flutter_filament/ios/include/SwiftFlutterFilamentPlugin-Bridging-Header.h

@@ -1,6 +1,19 @@
 #ifndef SwiftFlutterFilamentPlugin_Bridging_Header_h
 #define SwiftFlutterFilamentPlugin_Bridging_Header_h
 
-#include "ResourceBuffer.h"
+#include <stdint.h>
 
-#endif
+#include "ResourceBuffer.hpp"
+
+ResourceLoaderWrapper *make_resource_loader(LoadFilamentResourceFromOwner loadFn, FreeFilamentResourceFromOwner freeFn, void *const owner);
+
+// ResourceLoaderWrapper *make_resource_loader(LoadFilamentResourceFromOwner loadFn, FreeFilamentResourceFromOwner freeFn, void *const owner)
+// {
+//     ResourceLoaderWrapper *rlw = (ResourceLoaderWrapper *)malloc(sizeof(ResourceLoaderWrapper));
+//     rlw->loadFromOwner = loadFn;
+//     rlw->freeFromOwner = freeFn;
+//     rlw->owner = owner;
+//     return rlw;
+// }
+
+#endif