Skip to content

Commit

Permalink
feat: add new arch
Browse files Browse the repository at this point in the history
  • Loading branch information
okwasniewski committed Sep 23, 2024
1 parent f130f89 commit 865c6c1
Show file tree
Hide file tree
Showing 18 changed files with 345 additions and 193 deletions.
4 changes: 2 additions & 2 deletions Apps/BRNPlayground/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ require_relative '../node_modules/react-native-permissions/scripts/setup'
workspace 'BRNPlayground.xcworkspace'

options = {
:bridgeless_enabled => false,
:fabric_enabled => false,
:bridgeless_enabled => true,
:fabric_enabled => true,
:hermes_enabled => true,
}

Expand Down
66 changes: 54 additions & 12 deletions Apps/BRNPlayground/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1259,6 +1259,28 @@ PODS:
- ReactCommon/turbomodule/core
- Yoga
- react-native-slider (4.5.2):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- react-native-slider/common (= 4.5.2)
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-slider/common (4.5.2):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -1554,6 +1576,7 @@ PODS:
- React-graphics
- React-ImageManager
- React-NativeModulesApple
- React-RCTAppDelegate
- React-RCTFabric
- React-rendererdebug
- React-utils
Expand All @@ -1566,7 +1589,26 @@ PODS:
- React-jsi
- ReactTestApp-Resources (1.0.0-dev)
- RNPermissions (4.1.5):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- SocketRocket (0.7.0)
- Yoga (0.0.0)

Expand Down Expand Up @@ -1802,16 +1844,16 @@ SPEC CHECKSUMS:
React-CoreModules: 2d68c251bc4080028f2835fa47504e8f20669a21
React-cxxreact: 5f233f8ac7ea4772e49462e0ab2b0a15a4f80ab7
React-debug: fd0ed8ecd5f8a23c7daf5ceaca8aa722a4d083fd
React-defaultsnativemodule: 10f0f8bc38d8dc7d2273572cd85ed0b71298ecdd
React-domnativemodule: bfef3dda59e7030b498d0d78628f4adf414ab8e4
React-defaultsnativemodule: 1f9a0cae1ef7e05a6ea2bbec2e5eff6eb70da16a
React-domnativemodule: 38d632c6963ab2d08f5ce67808e070439bd1461c
React-Fabric: 3d0f5e2735d2f77a897ee684edeff7bb0e061919
React-FabricComponents: 68032a85a3c25c9c8d6ce676d8af9a85e2370f24
React-FabricImage: f8ac2df576703097b5b2f8d972b162cdca855aa3
React-featureflags: cf78861db9318ae29982fa8953c92d31b276c9ac
React-featureflagsnativemodule: d04eb5c3f0ac33fe70b060d97e8649bfd69c5f1e
React-featureflagsnativemodule: 99ffda7fc2cc0f9578b05b84d8b4a2e9dcb39b8b
React-graphics: 7572851bca7242416b648c45d6af87d93d29281e
React-hermes: 95c27801c60615345ee6256eafa6d597ce983b8b
React-idlecallbacksnativemodule: f5f0b760ec2739b30e315e1afee3dd3a5a93c3b6
React-idlecallbacksnativemodule: e4fd9ee09b8481dd22f1e173984e5ee2730712ce
React-ImageManager: aedf54d34d4475c66f4c3da6b8359b95bee904e4
React-jserrorhandler: 0c8949672a00f2a502c767350e591e3ec3d82fb3
React-jsi: d77bb442a4b0849063f2bd22d3c1fa71918713b7
Expand All @@ -1820,18 +1862,18 @@ SPEC CHECKSUMS:
React-jsitracing: 3935b092f85bb1e53b8cf8a00f572413648af46b
React-logger: 4072f39df335ca443932e0ccece41fbeb5ca8404
React-Mapbuffer: 714f2fae68edcabfc332b754e9fbaa8cfc68fdd4
React-microtasksnativemodule: 4943ad8f99be8ccf5a63329fa7d269816609df9e
react-native-babylon: 6234712503667b128f2a21b17d0d6dcc03c51552
react-native-slider: 97ce0bd921f40de79cead9754546d5e4e7ba44f8
React-microtasksnativemodule: 0b6b90da7f203e3015e1252ec3cba49c8ddd85ad
react-native-babylon: 5ce7247a4d0d7135ad07cbff3d1ecea6658243e4
react-native-slider: e1f4b4538f7de7417b626174874f4f58d4cf6c28
React-nativeconfig: 4a9543185905fe41014c06776bf126083795aed9
React-NativeModulesApple: 0506da59fc40d2e1e6e12a233db5e81c46face27
React-perflogger: 3bbb82f18e9ac29a1a6931568e99d6305ef4403b
React-performancetimeline: d15a723422ed500f47cb271f3175abbeb217f5ba
React-RCTActionSheet: cb2b38a53d03ec22f1159c89667b86c2c490d92d
React-RCTAnimation: 6836c87c7364f471e9077fda80b7349bc674be33
React-RCTAppDelegate: 2f11edfa7302451c792591f9a7838ca86cdcec34
React-RCTAppDelegate: 603240f6a7d7eefeeffe4e29dd0be70dc35208cf
React-RCTBlob: 516dbbd38397f5013394fdd1cc65408cc82e37a1
React-RCTFabric: b281a52c2b9726b0c64880e1535f2100013d5f7c
React-RCTFabric: 7298604d497db4fe445cd704bd1097636643ee89
React-RCTImage: 1b2c2c1716db859ffff2d7a06a30b0ec5c677fc5
React-RCTLinking: 59c07577767e705b0ab95d11e5ad74c61bf2a022
React-RCTNetwork: f9a827e7d6bc428e0d99cd1fbe0427854354b8c1
Expand All @@ -1849,13 +1891,13 @@ SPEC CHECKSUMS:
React-utils: f2afa6acd905ca2ce7bb8ffb4a22f7f8a12534e8
ReactCodegen: ff95a93d5ab5d9b2551571886271478eaa168565
ReactCommon: 289214026502e6a93484f4a46bcc0efa4f3f2864
ReactNativeHost: c66372f767ef829c03a9b5ba0e3355db51c2902d
ReactNativeHost: a27bb5af1c4d73dd3e80cc7ce295407f414e0e8c
ReactTestApp-DevSupport: 946bdd9e86ef05a3201d4f5af3166659f39564d0
ReactTestApp-Resources: 7db90c026cccdf40cfa495705ad436ccc4d64154
RNPermissions: 5a2dafe37c8e0a3fa1d6e0783a1490b1b7fd92d6
RNPermissions: d6c457e463b72e1d84e10474cd6645931338f8e5
SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
Yoga: 4ef80d96a5534f0e01b3055f17d1e19a9fc61b63

PODFILE CHECKSUM: c0272fe43d76243a8a0abcc5781bde0430d39023
PODFILE CHECKSUM: 777c486daf104b2094434716417a60c0da74e09e

COCOAPODS: 1.15.2
1 change: 0 additions & 1 deletion Apps/BRNPlayground/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions Modules/@babylonjs/react-native-iosandroid/ios/BabylonEngineView.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#pragma once
#import <UIKit/UIKit.h>
#import <MetalKit/MetalKit.h>
#import <React/RCTBridge.h>
#import <React/RCTComponent.h>

@interface EngineView : MTKView

@property (nonatomic, copy) RCTDirectEventBlock onSnapshotDataReturned;
@property (nonatomic, assign) BOOL isTransparent;
@property (nonatomic, assign) NSNumber* antiAliasing;

- (void)setMSAA:(NSNumber*)value;
- (void)takeSnapshot;
- (void)setIsTransparentFlag:(NSNumber*)isTransparentFlag;

@end
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
#import "BabylonEngineView.h"
#include "BabylonNativeInterop.h"

@implementation EngineView {
MTKView* xrView;
}

- (instancetype)init {
if (self = [super initWithFrame:CGRectZero device:MTLCreateSystemDefaultDevice()]) {
super.translatesAutoresizingMaskIntoConstraints = false;
super.colorPixelFormat = MTLPixelFormatBGRA8Unorm_sRGB;
super.depthStencilPixelFormat = MTLPixelFormatDepth32Float;
}
return self;
}

- (void)setIsTransparentFlag:(NSNumber*)isTransparentFlag {
BOOL isTransparent = [isTransparentFlag intValue] == 1;
if(isTransparent){
[self setOpaque:NO];
} else {
[self setOpaque:YES];
}
self.isTransparent = isTransparent;
}

- (void)setMSAA:(NSNumber*)value {
[BabylonNativeInterop updateMSAA:value];
}

- (void)setBounds:(CGRect)bounds {
[super setBounds:bounds];
[BabylonNativeInterop updateView:self];
}

- (void)touchesBegan:(NSSet<UITouch*>*)touches withEvent:(UIEvent*)event {
[BabylonNativeInterop reportTouchEvent:self touches:touches event:event];
}

- (void)touchesMoved:(NSSet<UITouch*>*)touches withEvent:(UIEvent*)event {
[BabylonNativeInterop reportTouchEvent:self touches:touches event:event];
}

- (void)touchesEnded:(NSSet<UITouch*>*)touches withEvent:(UIEvent*)event {
[BabylonNativeInterop reportTouchEvent:self touches:touches event:event];
}

- (void)touchesCancelled:(NSSet<UITouch*>*)touches withEvent:(UIEvent*)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 {
// We must take the screenshot on the main thread otherwise we might fail to get a valid handle on the view's image.
dispatch_async(dispatch_get_main_queue(), ^{
// Start the graphics context.
UIGraphicsBeginImageContextWithOptions(self.bounds.size, YES /* opaque */, 0.0f);

// Draw the current state of the view into the graphics context.
[self drawViewHierarchyInRect:self.bounds afterScreenUpdates:NO];

// Grab the image from the graphics context, and convert into a base64 encoded JPG.
UIImage* capturedImage = UIGraphicsGetImageFromCurrentImageContext();
UIGraphicsEndImageContext();
NSData* jpgData = UIImageJPEGRepresentation(capturedImage, .8f);
NSString* encodedData = [jpgData base64EncodedStringWithOptions:0];

// Fire the onSnapshotDataReturned event if hooked up.
if (self.onSnapshotDataReturned != nil) {
self.onSnapshotDataReturned(@{ @"data":encodedData});
}
});
}

@end
24 changes: 22 additions & 2 deletions Modules/@babylonjs/react-native-iosandroid/ios/BabylonModule.mm
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,25 @@

#import <React/RCTBridgeModule.h>
#import <ReactCommon/CallInvoker.h>
#import <React/RCTInvalidating.h>

#ifdef RCT_NEW_ARCH_ENABLED
#import <BabylonModuleSpec/BabylonModuleSpec.h>
#endif

#import <Foundation/Foundation.h>

@interface RCTBridge (RCTTurboModule)
@interface RCTBridge (CallInvoker)
- (std::shared_ptr<facebook::react::CallInvoker>)jsCallInvoker;
@end

@interface BabylonModule : NSObject <RCTBridgeModule>
@interface BabylonModule : NSObject <RCTBridgeModule, RCTInvalidating>
@end

#ifdef RCT_NEW_ARCH_ENABLED
@interface BabylonModule () <NativeBabylonModuleSpec>
@end
#endif // RCT_NEW_ARCH_ENABLED

@implementation BabylonModule

Expand All @@ -32,4 +42,14 @@ @implementation BabylonModule
});
}

- (void)invalidate {
[BabylonNativeInterop invalidate];
}

#ifdef RCT_NEW_ARCH_ENABLED
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params {
return std::make_shared<facebook::react::NativeBabylonModuleSpecJSI>(params);
}
#endif // RCT_NEW_ARCH_ENABLED

@end
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

@interface BabylonNativeInterop : NSObject
+ (void)initialize:(RCTBridge*)bridge;
+ (void)invalidate;
+ (void)updateView:(MTKView*)mtkView;
+ (void)updateMSAA:(NSNumber*)value;
+ (void)renderView;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,11 @@ + (void)initialize:(RCTBridge*)bridge {
} };

BabylonNative::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];
}

// NOTE: This happens during dev mode reload, when the JS engine is being shutdown and restarted.
+ (void)onBridgeWillInvalidate:(NSNotification*)notification
// It's called by RCTInvalidating.
+ (void)invalidate
{
BabylonNative::Deinitialize();
}
Expand Down
Loading

0 comments on commit 865c6c1

Please sign in to comment.