fix: make RNF compatible with RNWC CxxTurboModule (#197)

Author: hannojg

package/android/CMakeLists.txt

@@ -1,7 +1,7 @@
 project(RNFilament)
 cmake_minimum_required(VERSION 3.9.0)
 
-set(PACKAGE_NAME "RNFilament")
+set(PACKAGE_NAME "react-native-filament")
 set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
 set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_CXX_STANDARD 17)
@@ -125,15 +125,23 @@ target_link_libraries(
     EGL # <-- OpenGL (EGL)
 )
 
-# We have a hard dependency on react-native-worklets-core, so fail if its not found
-find_package(react-native-worklets-core REQUIRED CONFIG)
-message("RN Filament: react-native-worklets core found! Enabling Worklets support...")
-message("RN Filament: react-native-worklets-core found in ${react-native-worklets-core_DIR}")
-
-target_link_libraries(
-    ${PACKAGE_NAME}
-    react-native-worklets-core::rnworklets # <-- react-native-worklets-core
-)
+# Link with RNWC:
+if (IS_OLD_ARCHITECTURE_ENABLED)
+    # On the old arch RNWC publishes a prefab that we need to find (and it has a different name):
+    find_package(react-native-worklets-core REQUIRED CONFIG)
+    message("RN Filament: react-native-worklets core found! Enabling Worklets support...")
+    message("RN Filament: react-native-worklets-core found in ${react-native-worklets-core_DIR}")
+    target_link_libraries(
+        ${PACKAGE_NAME}
+        react-native-worklets-core::rnworklets
+    )
+else ()
+    target_link_libraries(
+            ${PACKAGE_NAME}
+            react_codegen_rnfilament # link against the codegen generated library of rnf (needed so this module is compiled correctly)
+            react-native-worklets-core
+    )
+endif()
 add_definitions(-DHAS_WORKLETS=1)
 
 # Filament (local CMake project as a git submodule)

package/android/build.gradle

@@ -93,19 +93,26 @@ android {
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
-    externalNativeBuild {
-      cmake {
-        cppFlags "-O2 -frtti -fexceptions -Wall -Wno-unused-variable -fstack-protector-all"
-        arguments "-DANDROID_STL=c++_shared",
-            "-DRNF_ENABLE_LOGS=${enableLogs ? "ON" : "OFF"}",
-            "-DNODE_MODULES_DIR=${nodeModules}"
+    // On the old arch, we need to build the c++ module ourselves
+    if (!isNewArchitectureEnabled()) {
+      externalNativeBuild {
+        cmake {
+          cppFlags "-O2 -frtti -fexceptions -Wall -Wno-unused-variable -fstack-protector-all"
+          arguments "-DANDROID_STL=c++_shared",
+                  "-DRNF_ENABLE_LOGS=${enableLogs ? "ON" : "OFF"}",
+                  "-DNODE_MODULES_DIR=${nodeModules}",
+                  "-DIS_OLD_ARCHITECTURE_ENABLED=ON"
+        }
       }
     }
   }
 
-  externalNativeBuild {
-    cmake {
-      path "CMakeLists.txt"
+  // On the old arch, we need to build the c++ module ourselves
+  if (!isNewArchitectureEnabled()) {
+    externalNativeBuild {
+      cmake {
+        path "CMakeLists.txt"
+      }
     }
   }
 

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

@@ -6,7 +6,7 @@
 
 public class FilamentModuleImpl {
     static {
-        System.loadLibrary("RNFilament");
+        System.loadLibrary("react-native-filament");
     }
 
     private @Nullable FilamentProxy proxy = null;

package/android/src/newarch/com/margelo/filament/FilamentViewManager.java

@@ -16,10 +16,6 @@
 
 @ReactModule(name = FilamentViewManager.NAME)
 public class FilamentViewManager extends ViewGroupManager<FilamentView> implements FilamentViewManagerInterface<FilamentView> {
-    static {
-        System.loadLibrary("RNFilament");
-    }
-
     public static final String NAME = "FilamentView";
 
     private final FilamentViewManagerDelegate<FilamentView, FilamentViewManager> mDelegate;

package/android/src/oldarch/com/margelo/filament/FilamentViewManager.java

@@ -14,10 +14,6 @@
 
 @ReactModule(name = FilamentViewManager.NAME)
 public class FilamentViewManager extends ViewGroupManager<FilamentView> {
-    static {
-        System.loadLibrary("RNFilament");
-    }
-
     public FilamentViewManager(ReactApplicationContext reactContext) {
         super();
     }

package/cpp/RNFFilamentProxy.h

@@ -24,8 +24,14 @@
 #include <ReactCommon/CallInvoker.h>
 
 #ifdef HAS_WORKLETS
+#if __has_include(<react-native-worklets-core/WKTJsiWorkletContext.h>)
+// Old arch & CocoaPod headers on apple
 #include <react-native-worklets-core/WKTJsiWorkletContext.h>
+#else
+// New arch android, where RNWC and RNF c++ modules are build inside the app's project
+#include "WKTJsiWorkletContext.h"
 #endif
+#endif // HAS_WORKLETS
 
 namespace margelo {
 
@@ -83,7 +89,6 @@ class FilamentProxy : public HybridObject {
                                               std::optional<std::unordered_map<std::string, int>> arguments = std::nullopt);
   std::shared_ptr<BulletWrapper> createBullet();
   bool getHasWorklets();
-  //  std::shared_ptr<ChoreographerWrapper> createChoreographerWrapper();
   jsi::Value createChoreographerWrapper(jsi::Runtime& runtime, const jsi::Value& thisValue, const jsi::Value* args, size_t count);
 
 #if HAS_WORKLETS

package/example/AppExampleFabric/ios/Podfile.lock

@@ -935,7 +935,7 @@ PODS:
   - React-Mapbuffer (0.74.1):
     - glog
     - React-debug
-  - react-native-filament (0.41.1):
+  - react-native-filament (0.42.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -949,16 +949,16 @@ PODS:
     - React-featureflags
     - React-graphics
     - React-ImageManager
-    - react-native-filament/camutils (= 0.41.1)
-    - react-native-filament/filamat (= 0.41.1)
-    - react-native-filament/filament (= 0.41.1)
-    - react-native-filament/gltfio_core (= 0.41.1)
-    - react-native-filament/image (= 0.41.1)
-    - react-native-filament/ktxreader (= 0.41.1)
-    - react-native-filament/math (= 0.41.1)
-    - react-native-filament/tsl (= 0.41.1)
-    - react-native-filament/uberz (= 0.41.1)
-    - react-native-filament/utils (= 0.41.1)
+    - react-native-filament/camutils (= 0.42.0)
+    - react-native-filament/filamat (= 0.42.0)
+    - react-native-filament/filament (= 0.42.0)
+    - react-native-filament/gltfio_core (= 0.42.0)
+    - react-native-filament/image (= 0.42.0)
+    - react-native-filament/ktxreader (= 0.42.0)
+    - react-native-filament/math (= 0.42.0)
+    - react-native-filament/tsl (= 0.42.0)
+    - react-native-filament/uberz (= 0.42.0)
+    - react-native-filament/utils (= 0.42.0)
     - react-native-worklets-core
     - React-NativeModulesApple
     - React-RCTFabric
@@ -967,7 +967,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-filament/camutils (0.41.1):
+  - react-native-filament/camutils (0.42.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -990,7 +990,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-filament/filamat (0.41.1):
+  - react-native-filament/filamat (0.42.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1014,7 +1014,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-filament/filament (0.41.1):
+  - react-native-filament/filament (0.42.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1038,7 +1038,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-filament/gltfio_core (0.41.1):
+  - react-native-filament/gltfio_core (0.42.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1063,7 +1063,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-filament/image (0.41.1):
+  - react-native-filament/image (0.42.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1086,7 +1086,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-filament/ktxreader (0.41.1):
+  - react-native-filament/ktxreader (0.42.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1110,7 +1110,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-filament/math (0.41.1):
+  - react-native-filament/math (0.42.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1132,7 +1132,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-filament/tsl (0.41.1):
+  - react-native-filament/tsl (0.42.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1154,7 +1154,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-filament/uberz (0.41.1):
+  - react-native-filament/uberz (0.42.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1179,7 +1179,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-filament/utils (0.41.1):
+  - react-native-filament/utils (0.42.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1311,13 +1311,27 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-worklets-core (1.3.3):
-    - RCT-Folly
+  - react-native-worklets-core (2.0.0-beta.4):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Codegen
     - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
+    - Yoga
   - React-nativeconfig (0.74.1)
   - React-NativeModulesApple (0.74.1):
     - glog
@@ -1862,10 +1876,10 @@ SPEC CHECKSUMS:
   React-jsitracing: 233d1a798fe0ff33b8e630b8f00f62c4a8115fbc
   React-logger: 7e7403a2b14c97f847d90763af76b84b152b6fce
   React-Mapbuffer: 11029dcd47c5c9e057a4092ab9c2a8d10a496a33
-  react-native-filament: 2f63b053f508bb398e9215235a688bd06bf3ecee
+  react-native-filament: 8620e1fe4866598ac5d7c5e85120af5446113583
   react-native-safe-area-context: 7f54ad0a774de306ab790c70d9d950321e5c5449
   react-native-video: ef5d99175a532dbe6cbcb33c849a2d1ecc9bac2e
-  react-native-worklets-core: 80d4a9b195d3e806c5e02942cfb5a43c6f99d02d
+  react-native-worklets-core: f5cdd75d46976ffa253adce0701218313de9cf09
   React-nativeconfig: b0073a590774e8b35192fead188a36d1dca23dec
   React-NativeModulesApple: df46ff3e3de5b842b30b4ca8a6caae6d7c8ab09f
   React-perflogger: 3d31e0d1e8ad891e43a09ac70b7b17a79773003a

package/example/AppExampleFabric/package.json

@@ -22,7 +22,7 @@
     "react-native-safe-area-context": "^4.10.1",
     "react-native-screens": "^3.31.1",
     "react-native-video": "^6.1.2",
-    "react-native-worklets-core": "^1.3.3",
+    "react-native-worklets-core": "^2.0.0-beta.4",
     "shared": "workspace:^"
   },
   "devDependencies": {