@babylonjs/react-native 0.4.0-alpha.4 → 0.4.0-alpha.43

package/ios/BabylonNativeInterop.mm

@@ -1,16 +1,13 @@
 #import "BabylonNativeInterop.h"
-#import "BabylonNative.h"
+#import "../shared/BabylonNative.h"
 
 #import <React/RCTBridge+Private.h>
 #import <jsi/jsi.h>
+#include <ReactCommon/CallInvoker.h>
 
 #import <Foundation/Foundation.h>
 
-#import <functional>
 #import <memory>
-#import <vector>
-#import <unordered_map>
-#import <mutex>
 
 using namespace facebook;
 
@@ -27,144 +24,107 @@ namespace {
 
 @implementation BabylonNativeInterop
 
-static RCTBridge* currentBridge;
-static MTKView* currentView;
-static std::unique_ptr<Babylon::Native> currentNativeInstance;
-static std::unordered_map<void*, std::vector<RCTPromiseResolveBlock>> initializationPromises;
-static std::mutex mapMutex;
-static NSMutableArray* activeTouches;
+static NSMutableArray* activeTouches = [NSMutableArray new];
 
-+ (void)setView:(RCTBridge*)bridge jsRunLoop:(NSRunLoop*)jsRunLoop mktView:(MTKView*)mtkView {
-    const int width = static_cast<int>(mtkView.bounds.size.width * UIScreen.mainScreen.scale);
-    const int height = static_cast<int>(mtkView.bounds.size.height * UIScreen.mainScreen.scale);
-    if (width != 0 && height != 0) {
-        // NOTE: jsRunLoop should only be null when remote debugging is enabled.
-        //       In this case, we can just use the main loop, because we are only
-        //       going to set an error state (which can happen on any thread).
-        if (!jsRunLoop) {
-            jsRunLoop = NSRunLoop.mainRunLoop;
-        }
-
-        [jsRunLoop performBlock:^{
-            if (bridge != currentBridge) {
-                [BabylonNativeInterop setCurrentNativeInstance:bridge mtkView:mtkView width:width height:height];
-            } else if (currentNativeInstance) {
-                if (mtkView != currentView) {
-                    [BabylonNativeInterop setCurrentView:mtkView];
-                    currentNativeInstance->Refresh((__bridge void*)currentView, width, height);
-                } else {
-                    // NOTE: This will cause Metal API Validation to fail if it is enabled when the debugger is attached, which stops app execution.
-                    // For now, be sure to disable Metal API Validation under Product->Scheme->Edit Scheme.
-                    currentNativeInstance->Resize(width, height);
-                }
-            }
-        }];
-    }
++ (void)initialize:(RCTBridge*)bridge {
+    auto jsCallInvoker{ bridge.jsCallInvoker };
+    auto jsDispatcher{ [jsCallInvoker{ std::move(jsCallInvoker) }](std::function<void()> func)
+    {
+        jsCallInvoker->invokeAsync([func{ std::move(func) }]
+        {
+            func();
+        });
+    } };
+
+    Babylon::Initialize(*GetJSIRuntime(bridge), std::move(jsDispatcher));
+
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+        name:RCTBridgeWillInvalidateModulesNotification
+        object:bridge.parentBridge];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+        selector:@selector(onBridgeWillInvalidate:)
+        name:RCTBridgeWillInvalidateModulesNotification
+        object:bridge.parentBridge];
 }
 
-+ (void)reportTouchEvent:(NSSet<UITouch*>*)touches withEvent:(UIEvent*)event {
-    if (currentNativeInstance) {
-        for (UITouch* touch in touches) {
-            if (touch.view == currentView) {
-                const CGFloat scale = UIScreen.mainScreen.scale;
-                const CGPoint pointerPosition = [touch locationInView:currentView];
-                const uint32_t x = static_cast<uint32_t>(pointerPosition.x * scale);
-                const uint32_t y = static_cast<uint32_t>(pointerPosition.y * scale);
-
-                switch (touch.phase) {
-                    case UITouchPhaseBegan: {
-                        NSUInteger pointerId = [activeTouches indexOfObject:[NSNull null]];
-                        if (pointerId == NSNotFound) {
-                            pointerId = [activeTouches count];
-                            [activeTouches addObject:touch];
-                        } else {
-                            [activeTouches replaceObjectAtIndex:pointerId withObject:touch];
-                        }
-                        currentNativeInstance->SetPointerButtonState(static_cast<uint32_t>(pointerId), 0, true, x, y);
-                        break;
-                    }
-
-                    case UITouchPhaseMoved: {
-                        NSUInteger pointerId = [activeTouches indexOfObject:touch];
-                        currentNativeInstance->SetPointerPosition(static_cast<uint32_t>(pointerId), x, y);
-                        break;
-                    }
-
-                    case UITouchPhaseEnded:
-                    case UITouchPhaseCancelled: {
-                        NSUInteger pointerId = [activeTouches indexOfObject:touch];
-                        [activeTouches replaceObjectAtIndex:pointerId withObject:[NSNull null]];
-                        currentNativeInstance->SetPointerButtonState(static_cast<uint32_t>(pointerId), 0, false, x, y);
-                        break;
-                    }
-
-                    default:
-                        break;
-                }
-            }
-        }
-    }
+// NOTE: This happens during dev mode reload, when the JS engine is being shutdown and restarted.
++ (void)onBridgeWillInvalidate:(NSNotification*)notification
+{
+    Babylon::Deinitialize();
 }
 
-+ (void)whenInitialized:(RCTBridge*)bridge resolve:(RCTPromiseResolveBlock)resolve {
-    const std::lock_guard<std::mutex> lock(mapMutex);
-    if (bridge == currentBridge) {
-        resolve([NSNumber numberWithUnsignedLong:reinterpret_cast<uintptr_t>(currentNativeInstance.get())]);
-    } else {
-        initializationPromises[(__bridge void*)bridge].push_back(resolve);
++ (void)updateView:(MTKView*)mtkView {
+    const CGFloat scale = mtkView.contentScaleFactor;
+    const int width = static_cast<int>(mtkView.bounds.size.width * scale);
+    const int height = static_cast<int>(mtkView.bounds.size.height * scale);
+    if (width != 0 && height != 0) {
+        Babylon::UpdateView((__bridge void*)mtkView, width, height);
     }
 }
 
-+ (void)reset {
-    if (currentNativeInstance) {
-        currentNativeInstance->Reset();
-    }
++ (void)renderView {
+    Babylon::RenderView();
 }
 
-+ (void)setCurrentView:(MTKView*)mtkView {
-    currentView = mtkView;
-    activeTouches = [NSMutableArray new];
++ (void)resetView {
+    Babylon::ResetView();
 }
 
-+ (void)setCurrentNativeInstance:(RCTBridge*)bridge mtkView:(MTKView*)mtkView width:(int)width height:(int)height {
-    [BabylonNativeInterop setCurrentView:mtkView];
++ (void)updateXRView:(MTKView*)mtkView {
+    Babylon::UpdateXRView((__bridge void*)mtkView);
+}
 
-    {
-        const std::lock_guard<std::mutex> lock(mapMutex);
-
-        if (bridge != currentBridge) {
-            if (currentBridge == nil || currentBridge.parentBridge != bridge.parentBridge) {
-                [[NSNotificationCenter defaultCenter] addObserver:self
-                    selector:@selector(onBridgeWillInvalidate:)
-                    name:RCTBridgeWillInvalidateModulesNotification
-                    object:bridge.parentBridge];
-            }
++ (bool)isXRActive {
+    return Babylon::IsXRActive();
+}
 
-            currentBridge = bridge;
-        }
++ (void)reportTouchEvent:(MTKView*)mtkView touches:(NSSet<UITouch*>*)touches event:(UIEvent*)event {
+    for (UITouch* touch in touches) {
+        if (touch.view == mtkView) {
+            const CGFloat scale = mtkView.contentScaleFactor;
+            const CGPoint pointerPosition = [touch locationInView:mtkView];
+            const uint32_t x = static_cast<uint32_t>(pointerPosition.x * scale);
+            const uint32_t y = static_cast<uint32_t>(pointerPosition.y * scale);
+
+            switch (touch.phase) {
+                case UITouchPhaseBegan: {
+                    // The activeTouches array only grows, it does not shrink (to keep indices constant since they are used as pointer ids),
+                    // so look for an unused (null) array element and reuse it if found. Otherwise, add a new entry to the array.
+                    NSUInteger pointerId = [activeTouches indexOfObject:[NSNull null]];
+                    if (pointerId != NSNotFound) {
+                        [activeTouches replaceObjectAtIndex:pointerId withObject:touch];
+                    } else {
+                        pointerId = [activeTouches count];
+                        [activeTouches addObject:touch];
+                    }
+                    Babylon::SetTouchButtonState(static_cast<uint32_t>(pointerId), true, x, y);
+                    break;
+                }
 
-        currentNativeInstance.reset();
+                case UITouchPhaseMoved: {
+                    NSUInteger pointerId = [activeTouches indexOfObject:touch];
+                    if (pointerId != NSNotFound) {
+                        Babylon::SetTouchPosition(static_cast<uint32_t>(pointerId), x, y);
+                    }
+                    break;
+                }
 
-        jsi::Runtime* jsiRuntime = GetJSIRuntime(currentBridge);
-        if (jsiRuntime) {
-            currentNativeInstance = std::make_unique<Babylon::Native>(*jsiRuntime, currentBridge.jsCallInvoker, (__bridge void*)mtkView, width, height);
-        }
-    }
+                case UITouchPhaseEnded:
+                case UITouchPhaseCancelled: {
+                    NSUInteger pointerId = [activeTouches indexOfObject:touch];
+                    if (pointerId != NSNotFound) {
+                        [activeTouches replaceObjectAtIndex:pointerId withObject:[NSNull null]];
+                        Babylon::SetTouchButtonState(static_cast<uint32_t>(pointerId), false, x, y);
+                    }
+                    break;
+                }
 
-    auto initializationPromisesIterator = initializationPromises.find((__bridge void*)currentBridge);
-    if (initializationPromisesIterator != initializationPromises.end()) {
-        for (RCTPromiseResolveBlock resolve : initializationPromisesIterator->second) {
-            resolve([NSNumber numberWithUnsignedLong:reinterpret_cast<uintptr_t>(currentNativeInstance.get())]);
+                default:
+                    break;
+            }
         }
-
-        initializationPromises.erase(initializationPromisesIterator);
     }
 }
 
-// NOTE: This happens during dev mode reload, when the JS engine is being shutdown and restarted.
-+ (void)onBridgeWillInvalidate:(NSNotification*)notification
-{
-    currentNativeInstance.reset();
-}
-
 @end

package/ios/EngineViewManager.mm

@@ -2,6 +2,7 @@
 
 #import <React/RCTViewManager.h>
 #import <React/RCTUIManager.h>
+#import <ReactCommon/CallInvoker.h>
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
@@ -14,14 +15,13 @@
 @end
 
 @implementation EngineView {
-    RCTBridge* bridge;
-    NSRunLoop* runLoop;
+    const RCTBridge* bridge;
+    MTKView* xrView;
 }
 
-- (instancetype)init:(RCTBridge*)_bridge runLoop:(NSRunLoop*)_runLoop {
+- (instancetype)init:(RCTBridge*)_bridge {
     if (self = [super initWithFrame:CGRectZero device:MTLCreateSystemDefaultDevice()]) {
         bridge = _bridge;
-        runLoop = _runLoop;
 
         super.translatesAutoresizingMaskIntoConstraints = false;
         super.colorPixelFormat = MTLPixelFormatBGRA8Unorm_sRGB;
@@ -32,23 +32,45 @@
 
 - (void)setBounds:(CGRect)bounds {
     [super setBounds:bounds];
-    [BabylonNativeInterop setView:bridge jsRunLoop:runLoop mktView:self];
+    [BabylonNativeInterop updateView:self];
 }
 
 - (void)touchesBegan:(NSSet<UITouch*>*)touches withEvent:(UIEvent*)event {
-    [BabylonNativeInterop reportTouchEvent:touches withEvent:event];
+    [BabylonNativeInterop reportTouchEvent:self touches:touches event:event];
 }
 
 - (void)touchesMoved:(NSSet<UITouch*>*)touches withEvent:(UIEvent*)event {
-    [BabylonNativeInterop reportTouchEvent:touches withEvent:event];
+    [BabylonNativeInterop reportTouchEvent:self touches:touches event:event];
 }
 
 - (void)touchesEnded:(NSSet<UITouch*>*)touches withEvent:(UIEvent*)event {
-    [BabylonNativeInterop reportTouchEvent:touches withEvent:event];
+    [BabylonNativeInterop reportTouchEvent:self touches:touches event:event];
 }
 
 - (void)touchesCancelled:(NSSet<UITouch*>*)touches withEvent:(UIEvent*)event {
-    [BabylonNativeInterop reportTouchEvent:touches withEvent:event];
+    [BabylonNativeInterop reportTouchEvent:self touches:touches event:event];
+}
+
+- (void)drawRect:(CGRect)rect {
+    if ([BabylonNativeInterop isXRActive]) {
+        if (!xrView) {
+            xrView = [[MTKView alloc] initWithFrame:self.bounds device:self.device];
+            xrView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+            xrView.userInteractionEnabled = false;
+            [self addSubview:xrView];
+            [BabylonNativeInterop updateXRView:xrView];
+        }
+    } else if (xrView) {
+        [BabylonNativeInterop updateXRView:nil];
+        [xrView removeFromSuperview];
+        xrView = nil;
+    }
+
+    [BabylonNativeInterop renderView];
+}
+
+-(void)dealloc {
+    [BabylonNativeInterop updateXRView:nil];
 }
 
 - (void)takeSnapshot {
@@ -63,7 +85,7 @@
         // Grab the image from the graphics context, and convert into a base64 encoded JPG.
         UIImage* capturedImage = UIGraphicsGetImageFromCurrentImageContext();
         UIGraphicsEndImageContext();
-        NSData* jpgData = UIImageJPEGRepresentation(capturedImage, 1.0f);
+        NSData* jpgData = UIImageJPEGRepresentation(capturedImage, .8f);
         NSString* encodedData = [jpgData base64EncodedStringWithOptions:0];
         
         // Fire the onSnapshotDataReturned event if hooked up.
@@ -79,9 +101,7 @@
 @interface EngineViewManager : RCTViewManager
 @end
 
-@implementation EngineViewManager {
-    NSRunLoop* runLoop;
-}
+@implementation EngineViewManager
 
 RCT_EXPORT_MODULE(EngineViewManager)
 
@@ -98,13 +118,8 @@ RCT_EXPORT_METHOD(takeSnapshot:(nonnull NSNumber*) reactTag) {
     }];
 }
 
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(setJSThread) {
-    runLoop = [NSRunLoop currentRunLoop];
-    return nil;
-}
-
 - (UIView*)view {
-    return [[EngineView alloc] init:self.bridge runLoop:runLoop];
+    return [[EngineView alloc] init:self.bridge];
 }
 
 @end