feat: Build iOS and link filament

Co-authored-by: Marc Rousavy <[email protected]>

Author: hannojg

package/example/ios/FilamentExample.xcodeproj/project.pbxproj

@@ -466,6 +466,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = FilamentExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -478,7 +479,7 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_BUNDLE_IDENTIFIER = com.mrousavy.FilamentExample;
 				PRODUCT_NAME = FilamentExample;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -493,6 +494,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = FilamentExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -504,7 +506,7 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_BUNDLE_IDENTIFIER = com.mrousavy.FilamentExample;
 				PRODUCT_NAME = FilamentExample;
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -580,10 +582,7 @@
 					"-DFOLLY_USE_LIBCPP=1",
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
@@ -651,10 +650,7 @@
 					"-DFOLLY_USE_LIBCPP=1",
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;

package/example/ios/FilamentExample/Info.plist

@@ -26,7 +26,6 @@
 	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
-	  <!-- Do not change NSAllowsArbitraryLoads to true, or you will risk app rejection! -->
 		<key>NSAllowsArbitraryLoads</key>
 		<false/>
 		<key>NSAllowsLocalNetworking</key>

package/example/ios/Podfile

@@ -30,6 +30,7 @@ target 'FilamentExample' do
 
   use_react_native!(
     :path => config[:reactNativePath],
+    :new_arch_enabled => false,
     # Enables Flipper.
     #
     # Note that if you have use_frameworks! enabled, Flipper will not work and

package/example/ios/Podfile.lock

@@ -9,6 +9,49 @@ PODS:
     - React-Core (= 0.73.4)
     - React-jsi (= 0.73.4)
     - ReactCommon/turbomodule/core (= 0.73.4)
+  - Filament (1.50.2):
+    - Filament/camutils (= 1.50.2)
+    - Filament/filamat (= 1.50.2)
+    - Filament/filament (= 1.50.2)
+    - Filament/filameshio (= 1.50.2)
+    - Filament/gltfio_core (= 1.50.2)
+    - Filament/image (= 1.50.2)
+    - Filament/ktxreader (= 1.50.2)
+    - Filament/math (= 1.50.2)
+    - Filament/tsl (= 1.50.2)
+    - Filament/uberz (= 1.50.2)
+    - Filament/utils (= 1.50.2)
+    - Filament/viewer (= 1.50.2)
+  - Filament/camutils (1.50.2):
+    - Filament/math
+  - Filament/filamat (1.50.2):
+    - Filament/math
+    - Filament/utils
+  - Filament/filament (1.50.2):
+    - Filament/math
+    - Filament/utils
+  - Filament/filameshio (1.50.2):
+    - Filament/filament
+  - Filament/gltfio_core (1.50.2):
+    - Filament/filament
+    - Filament/ktxreader
+    - Filament/uberz
+  - Filament/image (1.50.2):
+    - Filament/filament
+  - Filament/ktxreader (1.50.2):
+    - Filament/filament
+    - Filament/image
+  - Filament/math (1.50.2)
+  - Filament/tsl (1.50.2)
+  - Filament/uberz (1.50.2):
+    - Filament/filamat
+    - Filament/tsl
+    - Filament/utils
+  - Filament/utils (1.50.2):
+    - Filament/tsl
+  - Filament/viewer (1.50.2):
+    - Filament/filament
+    - Filament/gltfio_core
   - fmt (6.2.1)
   - glog (0.3.5)
   - hermes-engine (0.73.4):
@@ -887,6 +930,7 @@ PODS:
     - glog
     - React-debug
   - react-native-filament (0.0.1):
+    - Filament
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
@@ -1116,6 +1160,7 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
+    - Filament
     - fmt
     - libevent
     - SocketRocket
@@ -1226,6 +1271,7 @@ SPEC CHECKSUMS:
   DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
   FBLazyVector: 84f6edbe225f38aebd9deaf1540a4160b1f087d7
   FBReactNativeSpec: d0086a479be91c44ce4687a962956a352d2dc697
+  Filament: 5dd90546dd8d074ff2c03ab64cd18d06d6fab76b
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
   hermes-engine: b2669ce35fc4ac14f523b307aff8896799829fe2
@@ -1251,7 +1297,7 @@ SPEC CHECKSUMS:
   React-jsinspector: 9ac353eccf6ab54d1e0a33862ba91221d1e88460
   React-logger: 0a57b68dd2aec7ff738195f081f0520724b35dab
   React-Mapbuffer: 63913773ed7f96b814a2521e13e6d010282096ad
-  react-native-filament: dc218627465fa2bd615216810086a94220caa08a
+  react-native-filament: 457f8a2d45ec68ef004c0de3357e4457abdcd9de
   React-nativeconfig: d7af5bae6da70fa15ce44f045621cf99ed24087c
   React-NativeModulesApple: 0123905d5699853ac68519607555a9a4f5c7b3ac
   React-perflogger: 8a1e1af5733004bdd91258dcefbde21e0d1faccd
@@ -1275,6 +1321,6 @@ SPEC CHECKSUMS:
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Yoga: 64cd2a583ead952b0315d5135bf39e053ae9be70
 
-PODFILE CHECKSUM: 51dbb7d1d6cbae06f02ad898d698577809744bba
+PODFILE CHECKSUM: 064d1cdd719332a950b7df3b0ade3861fb731d25
 
 COCOAPODS: 1.14.3

package/example/src/App.tsx

@@ -6,7 +6,7 @@ import { FilamentView } from 'react-native-filament'
 export default function App() {
   return (
     <View style={styles.container}>
-      <FilamentView style={styles.box} />
+      <FilamentView style={styles.filamentView} />
     </View>
   )
 }
@@ -17,9 +17,9 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     justifyContent: 'center',
   },
-  box: {
-    width: 60,
-    height: 60,
-    marginVertical: 20,
+  filamentView: {
+    width: 350,
+    height: 350,
+    backgroundColor: 'black',
   },
 })

package/ios/src/AppleFilamentProxy.h

@@ -6,7 +6,10 @@
 //  Copyright © 2023 mrousavy. All rights reserved.
 //
 
+#pragma once
+
 #include "FilamentProxy.h"
+#include "FilamentView.h"
 #include <ReactCommon/CallInvoker.h>
 #include <jsi/jsi.h>
 
@@ -18,7 +21,8 @@ class AppleFilamentProxy : public FilamentProxy {
   ~AppleFilamentProxy();
 
 public:
-  int loadModel(const std::string& path) override;
+  int loadModel(std::string path) override;
+  std::shared_ptr<FilamentView> findFilamentView(int modelId) override;
 
 private:
   jsi::Runtime* _runtime;

package/ios/src/AppleFilamentProxy.mm

@@ -6,7 +6,14 @@
 //
 
 #import "AppleFilamentProxy.h"
+#import "AppleFilamentView.h"
+#import "FilamentMetalView.h"
+#import "FilamentView.h"
 #import <Foundation/Foundation.h>
+#import <React/RCTBridge+Private.h>
+#import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
+#import <React/RCTUtils.h>
 
 namespace margelo {
 
@@ -17,9 +24,22 @@
   // TODO(hanno): cleanup here?
 }
 
-int AppleFilamentProxy::loadModel(const std::string& path) {
+int AppleFilamentProxy::loadModel(std::string path) {
   // TODO(hanno): Implement model loading here
   return 13;
 }
 
+std::shared_ptr<FilamentView> AppleFilamentProxy::findFilamentView(int viewId) {
+  // TODO(marc): Make this async when JSIConvert can do that
+  std::shared_ptr<AppleFilamentView> result;
+  RCTUnsafeExecuteOnMainQueueSync([viewId, &result]() {
+    RCTBridge* currentBridge = [RCTBridge currentBridge]; // <-- from <React/RCTBridge+Private.h>
+    RCTUIManager* uiManager = currentBridge.uiManager;    // <-- from <React/RCTUIManager.h>
+    UIView* anonymousView = [uiManager viewForReactTag:[NSNumber numberWithInt:viewId]];
+    FilamentMetalView* view = (FilamentMetalView*)anonymousView;
+    result.reset(new AppleFilamentView(view));
+  });
+  return std::static_pointer_cast<FilamentView>(result);
+}
+
 } // namespace margelo

package/ios/src/AppleFilamentView.h

@@ -0,0 +1,28 @@
+//
+//  AppleFilamentView.h
+//  react-native-filament
+//
+//  Created by Marc Rousavy on 22.02.24.
+//
+
+#pragma once
+
+#include "FilamentMetalView.h"
+#include "FilamentView.h"
+#include "MetalSurfaceProvider.h"
+#include "SurfaceProvider.h"
+
+namespace margelo {
+
+class AppleFilamentView : public FilamentView {
+public:
+  explicit AppleFilamentView(FilamentMetalView* view);
+
+  std::shared_ptr<SurfaceProvider> getSurfaceProvider() override;
+
+private:
+  FilamentMetalView* _view;
+  std::shared_ptr<MetalSurfaceProvider> _surfaceProvider;
+};
+
+} // namespace margelo

package/ios/src/AppleFilamentView.mm

@@ -0,0 +1,20 @@
+//
+//  AppleFilamentView.cpp
+//  react-native-filament
+//
+//  Created by Marc Rousavy on 22.02.24.
+//
+
+#include "AppleFilamentView.h"
+#include "MetalSurfaceProvider.h"
+
+namespace margelo {
+
+AppleFilamentView::AppleFilamentView(FilamentMetalView* view)
+    : _view(view), _surfaceProvider(std::make_shared<MetalSurfaceProvider>(view.metalLayer)) {}
+
+std::shared_ptr<SurfaceProvider> AppleFilamentView::getSurfaceProvider() {
+  return std::static_pointer_cast<SurfaceProvider>(_surfaceProvider);
+}
+
+} // namespace margelo

package/ios/src/BlockObserver.h

@@ -0,0 +1,18 @@
+//
+//  BlockObserver.h
+//  Pods
+//
+//  Created by Marc Rousavy on 22.02.24.
+//
+
+#pragma once
+
+#import <Foundation/Foundation.h>
+
+typedef void (^ObservationBlock)(NSDictionary<NSKeyValueChangeKey, id>* change, void* context);
+
+@interface BlockObserver : NSObject
+
+- (instancetype)initWithBlock:(ObservationBlock)block;
+
+@end