Adds Multipeer Worldmap sending between peers as well as sending JSON between peers. Fixes podspec to work with autolinking.

.gitignore

@@ -4,6 +4,7 @@ logs
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.DS_Store
 
 # Runtime data
 pids

ios/RCTARKit.h

@@ -12,6 +12,7 @@
 
 #import "RCTARKitDelegate.h"
 #import "RCTARKitNodes.h"
+#import "RCTMultiPeer.h"
 
 typedef void (^RCTBubblingEventBlock)(NSDictionary *body);
 typedef void (^RCTARKitResolve)(id result);
@@ -22,16 +23,19 @@ typedef void (^RCTARKitReject)(NSString *code, NSString *message, NSError *error
 
 + (instancetype)sharedInstance;
 + (bool)isInitialized;
+- (instancetype)initWithARViewAndBrowser:(ARSCNView *)arView multipeer:(MultipeerConnectivity *)multipeer;
 - (instancetype)initWithARView:(ARSCNView *)arView;
 
 
 @property (nonatomic, strong) NSMutableArray<id<RCTARKitTouchDelegate>> *touchDelegates;
 @property (nonatomic, strong) NSMutableArray<id<RCTARKitRendererDelegate>> *rendererDelegates;
 @property (nonatomic, strong) NSMutableArray<id<RCTARKitSessionDelegate>> *sessionDelegates;
+@property (nonatomic, strong) NSMutableArray<id<MultipeerConnectivityDelegate>> *multipeerDelegate;
 
 
 #pragma mark - Properties
 @property (nonatomic, strong) ARSCNView *arView;
+@property (nonatomic, strong) MultipeerConnectivity *multipeer;
 @property (nonatomic, strong) RCTARKitNodes *nodeManager;
 
 @property (nonatomic, assign) BOOL debug;
@@ -60,6 +64,14 @@ typedef void (^RCTARKitReject)(NSString *code, NSString *message, NSError *error
 @property (nonatomic, copy) RCTBubblingEventBlock onEvent;
 @property (nonatomic, copy) RCTBubblingEventBlock onARKitError;
 
+@property (nonatomic, copy) RCTBubblingEventBlock onPeerConnected;
+@property (nonatomic, copy) RCTBubblingEventBlock onPeerConnecting;
+@property (nonatomic, copy) RCTBubblingEventBlock onPeerDisconnected;
+
+@property (nonatomic, copy) RCTBubblingEventBlock onMultipeerJsonDataReceived;
+
+
+
 
 @property NSMutableDictionary *planes; // plane detected
 
@@ -70,6 +82,7 @@ typedef void (^RCTARKitReject)(NSString *code, NSString *message, NSError *error
 - (void)resume;
 - (void)reset;
 - (void)hitTestPlane:(CGPoint)tapPoint types:(ARHitTestResultType)types resolve:(RCTARKitResolve)resolve reject:(RCTARKitReject)reject;
+- (void)getCurrentWorldMap:(RCTARKitResolve)resolve reject:(RCTARKitReject)reject;
 - (void)hitTestSceneObjects:(CGPoint)tapPoint resolve:(RCTARKitResolve) resolve reject:(RCTARKitReject)reject;
 - (SCNVector3)projectPoint:(SCNVector3)point;
 - (float)getCameraDistanceToPoint:(SCNVector3)point;

ios/RCTARKit.m

@@ -8,15 +8,17 @@
 
 #import "RCTARKit.h"
 #import "RCTConvert+ARKit.h"
+#import "RCTMultiPeer.h"
 
 @import CoreLocation;
 
-@interface RCTARKit () <ARSCNViewDelegate, ARSessionDelegate, UIGestureRecognizerDelegate> {
+@interface RCTARKit () <ARSCNViewDelegate, ARSessionDelegate, UIGestureRecognizerDelegate, MultipeerConnectivityDelegate> {
     RCTARKitResolve _resolve;
 }
 
 @property (nonatomic, strong) ARSession* session;
 @property (nonatomic, strong) ARWorldTrackingConfiguration *configuration;
+@property (nonatomic, strong) ARWorldMap *worldMap;
 
 @end
 
@@ -49,15 +51,17 @@ + (instancetype)sharedInstance {
     dispatch_once_on_main_thread(&onceToken, ^{
         if (instance == nil) {
             ARSCNView *arView = [[ARSCNView alloc] init];
+            MultipeerConnectivity *multipeer = [[MultipeerConnectivity alloc] init];
             instance = [[self alloc] initWithARView:arView];
+            multipeer.delegate = instance;
+            instance.multipeer = multipeer;
         }
     });
 
     return instance;
 }
 
 - (bool)isMounted {
-
     return self.superview != nil;
 }
 
@@ -102,7 +106,55 @@ - (instancetype)initWithARView:(ARSCNView *)arView {
     return self;
 }
 
-
+- (void)receivedDataHandler:(NSData *)data PeerID:(MCPeerID *)peerID
+{
+    id parsedJSON;
+    @try {
+        NSError *error = nil;
+        parsedJSON = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
+    } @catch (NSException *exception) {
+        // TODO: make a onMultipeerDataFailure callback
+    } @finally {
+
+    }
+
+    if (parsedJSON) {
+        if (self.onMultipeerJsonDataReceived) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                self.onMultipeerJsonDataReceived(@{
+                                       @"data": parsedJSON,
+                                       });
+            });
+        }
+    } else {
+            id unarchived = [NSKeyedUnarchiver unarchivedObjectOfClass:[ARWorldMap classForKeyedUnarchiver] fromData:data error:nil];
+
+            if ([unarchived isKindOfClass:[ARWorldMap class]]) {
+                NSLog(@"[unarchived class]====%@",[unarchived class]);
+                ARWorldMap *worldMap = unarchived;
+                self.configuration = [[ARWorldTrackingConfiguration alloc] init];
+                self.configuration.worldAlignment = ARWorldAlignmentGravity;
+                self.configuration.planeDetection = ARPlaneDetectionHorizontal|ARPlaneDetectionVertical;
+                self.configuration.initialWorldMap = worldMap;
+                [self.arView.session runWithConfiguration:self.configuration options:ARSessionRunOptionResetTracking|ARSessionRunOptionRemoveExistingAnchors];
+
+                return;
+            }
+
+            unarchived = [NSKeyedUnarchiver unarchivedObjectOfClass:[ARAnchor classForKeyedUnarchiver] fromData:data error:nil];
+
+            if ([unarchived isKindOfClass:[ARAnchor class]]) {
+                NSLog(@"[unarchived class]====%@",[unarchived class]);
+                ARAnchor *anchor = unarchived;
+
+                [self.arView.session addAnchor:anchor];
+
+                return;
+            }
+
+            NSLog(@"unknown data recieved from \(%@)",peerID.displayName);
+    }
+}
 
 
 - (void)layoutSubviews {
@@ -128,6 +180,19 @@ - (void)session:(ARSession *)session didFailWithError:(NSError *)error {
     }
 
 }
+
+- (void)getCurrentWorldMap:(RCTARKitResolve)resolve reject:(RCTARKitReject)reject {
+    [self.arView.session getCurrentWorldMapWithCompletionHandler:^(ARWorldMap * _Nullable worldMap, NSError * _Nullable error) {
+        NSLog(@"got the current world map!!!");
+        if (error) {
+            NSLog(@"error====%@",error);
+        }
+
+        NSData *data = [NSKeyedArchiver archivedDataWithRootObject:worldMap requiringSecureCoding:true error:nil];
+        [[ARKit sharedInstance].multipeer sendToAllPeers:data];
+    }];
+}
+
 - (void)reset {
     if (ARWorldTrackingConfiguration.isSupported) {
         [self.session runWithConfiguration:self.configuration options:ARSessionRunOptionRemoveExistingAnchors | ARSessionRunOptionResetTracking];
@@ -157,7 +222,7 @@ - (BOOL)debug {
 - (void)setDebug:(BOOL)debug {
     if (debug) {
         self.arView.showsStatistics = YES;
-        self.arView.debugOptions = ARSCNDebugOptionShowWorldOrigin | ARSCNDebugOptionShowFeaturePoints;
+        self.arView.debugOptions = ARSCNDebugOptionShowFeaturePoints;
     } else {
         self.arView.showsStatistics = NO;
         self.arView.debugOptions = SCNDebugOptionNone;

ios/RCTARKit.podspec

@@ -0,0 +1,18 @@
+require 'json'
+version = JSON.parse(File.read('../package.json'))["version"]
+
+Pod::Spec.new do |s|
+
+  s.name           = "RCTARKit"
+  s.version        = version
+  s.summary        = "ARKit for react native"
+  s.homepage       = "https://github.com/react-native-ar/react-native-arkit"
+  s.license        = "MIT"
+  s.author         = { "macrozone" => "https://github.com/macrozone" }
+  s.platforms      = { :ios => "9.0", :tvos => "9.0" }
+  s.source         = { :git => "https://github.com/react-native-ar/react-native-arkit"", :tag => #{s.version}" }
+  s.source_files   = '**/*.{h,m}'
+  s.preserve_paths = "**/*.js"
+  s.dependency 'React'
+
+end

ios/RCTARKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

ios/RCTARKitManager.m

@@ -12,7 +12,11 @@
 #import <UIKit/UIKit.h>
 #import <Photos/Photos.h>
 #import "color-grabber.h"
+#import "RCTMultiPeer.h"
 
+@interface RCTARKitManager () <MCBrowserViewControllerDelegate>
+
+@end
 @implementation RCTARKitManager
 
 RCT_EXPORT_MODULE()
@@ -172,13 +176,21 @@ - (NSDictionary *)constantsToExport
 RCT_EXPORT_VIEW_PROPERTY(onAnchorUpdated, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onAnchorRemoved, RCTBubblingEventBlock)
 
+RCT_EXPORT_VIEW_PROPERTY(onMultipeerJsonDataReceived, RCTBubblingEventBlock)
+
+// TODO: Option to lock these three below down for host only
+RCT_EXPORT_VIEW_PROPERTY(onPeerConnected, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onPeerConnecting, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onPeerDisconnected, RCTBubblingEventBlock)
+
 RCT_EXPORT_VIEW_PROPERTY(onTrackingState, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onFeaturesDetected, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onLightEstimation, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onTapOnPlaneUsingExtent, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onTapOnPlaneNoExtent, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onEvent, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onARKitError, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(worldMap, NSObject);
 
 RCT_EXPORT_METHOD(pause:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [[ARKit sharedInstance] pause];
@@ -199,6 +211,50 @@ - (NSDictionary *)constantsToExport
     resolve(@([ARKit isInitialized]));
 }
 
+RCT_EXPORT_METHOD(openMultipeerBrowser:(NSString *)serviceType resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [[ARKit sharedInstance].multipeer openMultipeerBrowser:serviceType];
+}
+
+RCT_EXPORT_METHOD(startBrowsingForPeers:(NSString *)serviceType resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [[ARKit sharedInstance].multipeer startBrowsingForPeers:serviceType];
+}
+
+RCT_EXPORT_METHOD(getFrontOfCameraPosition:resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    resolve(@{@"frontOfCamera": [ARKit sharedInstance].nodeManager.frontOfCamera});
+}
+
+RCT_EXPORT_METHOD(getFrontOfCamera:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    resolve(@{
+              @"x": @([ARKit sharedInstance].nodeManager.frontOfCamera.position.x),
+              @"y": @([ARKit sharedInstance].nodeManager.frontOfCamera.position.y),
+              @"z": @([ARKit sharedInstance].nodeManager.frontOfCamera.position.z)
+              });
+}
+
+RCT_EXPORT_METHOD(advertiseReadyToJoinSession:(NSString *)serviceType resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [[ARKit sharedInstance].multipeer advertiseReadyToJoinSession:serviceType];
+}
+
+// TODO: Should be optionally to only be available to host
+RCT_EXPORT_METHOD(sendDataToAllPeers:(NSDictionary *)data resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self sendDataToAll:data callback:resolve];
+}
+
+// TODO: Should be optional to lock it down so peers can only send to host
+RCT_EXPORT_METHOD(sendDataToPeer:(NSDictionary *)data recipientId:(NSString *)recipientId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self sendData:recipientId data:data callback:resolve];
+}
+
+// TODO: Should be optional to only be available to host
+RCT_EXPORT_METHOD(sendWorldmapData:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [[ARKit sharedInstance] getCurrentWorldMap:resolve reject:reject];
+}
+
+// TODO: Should be optional to only be available to host
+RCT_EXPORT_METHOD(getAllConnectedPeers:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    //TODO: get all peer ids
+}
+
 RCT_EXPORT_METHOD(isMounted:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     if( [ARKit isInitialized]) {
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -228,6 +284,34 @@ - (NSDictionary *)constantsToExport
     [[ARKit sharedInstance] hitTestSceneObjects:point resolve:resolve reject:reject];
 }
 
+- (void)sendDataToAll:(NSDictionary *)data callback:(RCTResponseSenderBlock)callback {
+        NSError *error = nil;
+        NSData *jsonData = [NSJSONSerialization dataWithJSONObject:data options:0 error:&error];
+        [[ARKit sharedInstance].multipeer.session sendData:jsonData toPeers:[RCTARKit sharedInstance].multipeer.session.connectedPeers withMode:MCSessionSendDataReliable error:&error];
+    NSLog(@"Sending data...");
+        if (error == nil) {
+            callback(@[[NSNull null]]);
+        }
+        else {
+            callback(@[[error description]]);
+        }
+}
+
+- (void)sendData:(NSString *)recipient data:(NSDictionary *)data callback:(RCTResponseSenderBlock)callback {
+        NSError *error = nil;
+        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"peerUUID == %@", recipient];
+        NSArray *recipients = [[RCTARKit sharedInstance].multipeer.session.connectedPeers filteredArrayUsingPredicate:predicate];
+        NSData *jsonData = [NSJSONSerialization dataWithJSONObject:data options:0 error:&error];
+        [[ARKit sharedInstance].multipeer.session sendData:jsonData toPeers:recipients withMode:MCSessionSendDataReliable error:&error];
+    NSLog(@"Sending data...");
+        if (error == nil) {
+            callback(@[[NSNull null]]);
+        }
+        else {
+            callback(@[[error description]]);
+        }
+}
+
 
 
 
@@ -398,4 +482,24 @@ - (void)storeImage:(UIImage *)image options:(NSDictionary *)options reject:(RCTP
     resolve(@{});
 }
 
+- (void)browserViewControllerDidFinish:(nonnull MCBrowserViewController *)browserViewController {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        UIViewController *rootViewController = [UIApplication sharedApplication].delegate.window.rootViewController;
+
+        [rootViewController dismissViewControllerAnimated:YES completion:^{
+
+        }];
+    });
+}
+
+- (void)browserViewControllerWasCancelled:(nonnull MCBrowserViewController *)browserViewController {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        UIViewController *rootViewController = [UIApplication sharedApplication].delegate.window.rootViewController;
+
+        [rootViewController dismissViewControllerAnimated:YES completion:^{
+
+        }];
+    });
+}
+
 @end

ios/RCTARKitNodes.m

@@ -15,7 +15,7 @@ @implementation SCNNode (ReferenceFrame)
 @dynamic referenceFrame;
 @end
 
-CGFloat focDistance = 0.2f;
+CGFloat focDistance = 0.45f;
 
 
 @interface RCTARKitNodes () <RCTARKitSessionDelegate>