fix: android implementation

BabylonJS · Nov 20, 2024 · e93f7b8 · e93f7b8
1 parent f69e13a
commit e93f7b8
Show file tree

Hide file tree

Showing 9 changed files with 3,232 additions and 10,659 deletions.
diff --git a/Apps/BRNPlayground/android/gradle.properties b/Apps/BRNPlayground/android/gradle.properties
@@ -40,8 +40,9 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
 # Note that this is incompatible with web debugging.
-newArchEnabled=false
+newArchEnabled=true
 hermesEnabled=true
+bridgelessEnabled=true
 
 # Uncomment the line below if building react-native from source
 #ANDROID_NDK_VERSION=26.1.10909125

diff --git a/Apps/BRNPlayground/package-lock.json b/Apps/BRNPlayground/package-lock.json
diff --git a/Apps/BRNPlayground/package.json b/Apps/BRNPlayground/package.json
@@ -22,7 +22,7 @@
     "@babylonjs/react-native": "file:../../Modules/@babylonjs/react-native",
     "@babylonjs/react-native-iosandroid": "file:../../Modules/@babylonjs/react-native-iosandroid",
     "@babylonjs/react-native-windows": "file:../../Modules/@babylonjs/react-native-windows",
-    "@react-native-community/slider": "^4.2.2",
+    "@react-native-community/slider": "^4.5.5",
     "react": "18.2.0",
     "react-native": "0.73.5",
     "react-native-macos": "^0.73.0",

diff --git a/...react-native-iosandroid/android/src/fabric/java/com/babylonreactnative/BabylonModule.java b/...react-native-iosandroid/android/src/fabric/java/com/babylonreactnative/BabylonModule.java
@@ -8,7 +8,7 @@
 
 @ReactModule(name = BabylonModule.NAME)
 public final class BabylonModule extends NativeBabylonModuleSpec {
-    static final String NAME = "EngineViewNativeComponent";
+    static final String NAME = "BabylonModule";
 
     BabylonModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -17,22 +17,22 @@ public final class BabylonModule extends NativeBabylonModuleSpec {
     @NonNull
     @Override
     public String getName() {
-       return BabylonModule.NAME;
+        return BabylonModule.NAME;
     }
 
     @Override
     public void initialize(Promise promise) {
-//        this.getReactApplicationContext().runOnJSQueueThread(() -> {
-//            BabylonNativeInterop.initialize(this.getReactApplicationContext());
-//            promise.resolve(null);
-//        });
+        this.getReactApplicationContext().runOnJSQueueThread(() -> {
+            BabylonNativeInterop.initialize(this.getReactApplicationContext());
+            promise.resolve(null);
+        });
     }
 
     @Override
     public void resetView(Promise promise) {
-//        this.getReactApplicationContext().runOnUiQueueThread(() -> {
-//            BabylonNativeInterop.resetView();
-//            promise.resolve(null);
-//        });
+        this.getReactApplicationContext().runOnUiQueueThread(() -> {
+            BabylonNativeInterop.resetView();
+            promise.resolve(null);
+        });
     }
 }
diff --git a/...t-native-iosandroid/android/src/fabric/java/com/babylonreactnative/EngineViewManager.java b/...t-native-iosandroid/android/src/fabric/java/com/babylonreactnative/EngineViewManager.java
@@ -1,11 +1,8 @@
 package com.babylonreactnative;
 
-import android.view.View;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
@@ -40,11 +37,11 @@ protected EngineView createViewInstance(@NonNull ThemedReactContext reactContext
         return new EngineView(reactContext);
     }
 
-//    @Override
-//    public void onDropViewInstance(@NonNull EngineView view) {
-//        super.onDropViewInstance(view);
-//        // TODO: Native view specific cleanup
-//    }
+    @Override
+    public void onDropViewInstance(@NonNull EngineView view) {
+        super.onDropViewInstance(view);
+        // TODO: Native view specific cleanup
+    }
 
     @Override
     public void setIsTransparent(EngineView view, boolean value) {

diff --git a/.../react-native-iosandroid/android/src/main/java/com/babylonreactnative/BabylonPackage.java b/.../react-native-iosandroid/android/src/main/java/com/babylonreactnative/BabylonPackage.java
@@ -1,20 +1,13 @@
 package com.babylonreactnative;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
-import com.facebook.react.BaseReactPackage;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.TurboReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.module.model.ReactModuleInfo;
-import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.uimanager.ViewManager;
 
 public class BabylonPackage implements ReactPackage {
@@ -27,6 +20,8 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
     @NonNull
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+        // We have two implementations of EngineViewManager, one per architecture.
+        // Implementation source code is determined by the sourceSets in the build.gradle file.
         return Arrays.<ViewManager>asList(new EngineViewManager());
     }
 }
diff --git a/Modules/@babylonjs/react-native/EngineView.tsx b/Modules/@babylonjs/react-native/EngineView.tsx
@@ -9,6 +9,7 @@ export interface EngineViewProps extends NativeEngineViewProps {
     camera?: Camera;
     displayFrameRate?: boolean;
     isTransparent?: boolean;
+    androidView?: "TextureView" | "SurfaceView" | "SurfaceViewZTopMost" | "SurfaceViewZMediaOverlay";
     antiAliasing?: 0 | 1 | 2 | 4 | 8 | 16;
     onInitialized?: (view: EngineViewCallbacks) => void;
 }