Add pinch and rotate gesture functions

.gitignore

@@ -4,6 +4,7 @@ logs
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.DS_Store
 
 # Runtime data
 pids
@@ -33,7 +34,7 @@ bower_components
 build/Release
 
 # Dependency directories
-node_modules/
+node_modules
 jspm_packages/
 
 # Typescript v1 declaration files
@@ -70,9 +71,9 @@ xcuserdata/
 *.xccheckout
 
 ## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
+# Xcode
+#
 build/
-DerivedData/
-*.moved-aside
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -81,3 +82,15 @@ DerivedData/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+
+/testproject/ios/Pods/
+*.jsbundle
+.DS_Store
+

.gitmodules

@@ -1,3 +1 @@
-[submodule "ios/PocketSVG"]
-	path = ios/PocketSVG
-	url = https://github.com/pocketsvg/PocketSVG
+

ARKit.js

@@ -58,6 +58,8 @@ class ARKit extends Component {
       keyBy([
         'onTapOnPlaneUsingExtent',
         'onTapOnPlaneNoExtent',
+        'onRotationGesture',
+        'onPinchGesture',
         'onPlaneDetected',
         'onPlaneRemoved',
         'onPlaneUpdated',
@@ -238,6 +240,8 @@ ARKit.propTypes = {
   onTrackingState: PropTypes.func,
   onTapOnPlaneUsingExtent: PropTypes.func,
   onTapOnPlaneNoExtent: PropTypes.func,
+  onRotationGesture: PropTypes.func,
+  onPinchGesture: PropTypes.func,
   onEvent: PropTypes.func,
   isMounted: PropTypes.func,
   isInitialized: PropTypes.func,

README.md

@@ -229,6 +229,8 @@ An `DetectionImage` is an image or image resource group that should be detected
 
 See https://developer.apple.com/documentation/arkit/arreferenceimage?language=objc how to add these images.
 
+You can also pass in a list of URLS to detect images dynamicaly from the web `detectionImages={[{ arDetectionImages: myImages }]}`.
+
 You will then receive theses images in `onAnchorDetected/onAnchorUpdated`. See also [Planes and Anchors](#planes-and-anchors) for more details.
 
 `DetectionImage` has these properties
@@ -252,11 +254,16 @@ We probably will add the option to load images from other sources as well (PRs e
 | `onPlaneDetected` | `Anchor` | When a plane anchor is first detected.
 | `onPlaneUpdated` | `Anchor` | When a detected plane is updated
 | `onPlaneRemoved` | `Anchor` | When a detected plane is removed
+| `onRotationGesture` | `{"rotation": 1.4, "velocity": 1}` | Returns new value for Z axis of rotation when an anchor is rotated with.two fingers
+| `onPinchGesture` | `{"scale": 1.0, "velocity": 1.9}` | Returns new scale for anchor when an anchor is pinched with two fingers.
 
 See [Planes and Anchors](#planes-and-anchors) for Details about anchors
 
+#### Callbacks
 
-
+| Callback Name | Callbacks | Examples | Notes
+|---|---|---|---|
+| `addAnchorByLocation` | `onAnchorUpdated, onAnchorDetected` | `ARKit.addAnchorByLocation(name, locationLatidude, locationLongitude, landmarkLatitude, landmarkLongitude, locationHorizontalAccruacy, locationHorizontalAccruacy, locationVerticalAccuracy, landmarkVerticalAccuracy, locationAltitude, landmarkAltitude);`| ⚠️ (This function needs work and provides very inconsistent results, if you have ways to improve it please open a PR. Arkit/CoreLocation solves this problem much better if you would like to find a way to import their functions into this library. https://github.com/ProjectDent/ARKit-CoreLocation ⚠️. Pass in location information of the user and the location information of the landmark where you want the AR anchor to appear. worldAlignment Must be set as GravityAndHeading. Returns position of anchor in onAnchorUpdated callback.
 #### Planes and Anchors
 
 ARKit can detect different anchors in the real world:

components/ARImage.js

@@ -0,0 +1,24 @@
+//
+//  ARImage.js
+//
+//  Created by HippoAR on 8/12/17.
+//  Copyright © 2017 HippoAR. All rights reserved.
+//
+
+import PropTypes from 'prop-types';
+
+import { NativeModules } from 'react-native';
+
+import { material } from './lib/propTypes';
+import createArComponent from './lib/createArComponent';
+
+const ARImage = createArComponent(
+  // { mount: NativeModules.ARImageManager.mount, pick: ['id'] },
+  {
+    imageUrl: PropTypes.string,
+    material
+  },
+  []
+);
+
+export default ARImage;

components/ARShape.js

@@ -5,6 +5,8 @@ import createArComponent from './lib/createArComponent';
 
 const ARShape = createArComponent('addShape', {
   shape: PropTypes.shape({
+    width: PropTypes.number,
+    height: PropTypes.number,
     extrusion: PropTypes.number,
     pathSvg: PropTypes.string,
     pathFlatness: PropTypes.number,

components/lib/createArComponent.js

@@ -84,22 +84,22 @@ export default (mountConfig, propTypes = {}, nonUpdateablePropKeys = []) => {
   });
 
   const getNonNodeProps = props => parseMaterials(pick(props, nonNodePropKeys));
-
   const mountFunc =
     typeof mountConfig === 'string'
       ? ARGeosManager[mountConfig]
       : mountConfig.mount;
 
   const mount = (id, props, parentId) => {
     if (DEBUG) console.log(`[${id}] [${new Date().getTime()}] mount`, props);
+
     return mountFunc(
       getNonNodeProps(props),
       {
         id,
         ...pick(props, NODE_PROPS),
       },
       props.frame,
-      parentId,
+      parentId, 
     );
   };
 
@@ -126,18 +126,22 @@ export default (mountConfig, propTypes = {}, nonUpdateablePropKeys = []) => {
         const {
           transition: transitionOnMount = { duration: 0 },
         } = fullPropsOnMount;
-
+        console.log("fullpropsmount", fullPropsOnMount)
         this.doPendingTimers();
         this.mountWithProps(fullPropsOnMount).then(() => {
           this.props = propsOnMount;
           this.componentWillUpdate({ ...props, transition: transitionOnMount });
         });
       } else {
+        console.log("halfpropsmount", props)
+
         this.mountWithProps(props);
       }
     }
 
     async mountWithProps(props) {
+      console.log("parentId", this.context.arkitParentId)
+      console.log("props", props)
       return mount(this.identifier, props, this.context.arkitParentId);
     }
 

index.js

@@ -19,6 +19,7 @@ import ARShape from './components/ARShape';
 import ARSphere from './components/ARSphere';
 import ARSprite from './components/ARSprite';
 import ARText from './components/ARText';
+import ARImage from './components/ARImage';
 import ARTorus from './components/ARTorus';
 import ARTube from './components/ARTube';
 import DeviceMotion from './DeviceMotion';
@@ -37,6 +38,7 @@ ARKit.Torus = ARTorus;
 ARKit.Capsule = ARCapsule;
 ARKit.Plane = ARPlane;
 ARKit.Text = ARText;
+ARKit.Image = ARImage;
 ARKit.Model = ARModel;
 ARKit.Sprite = ARSprite;
 ARKit.Group = ARGroup;
@@ -60,6 +62,7 @@ export {
   ARCapsule,
   ARPlane,
   ARText,
+  ARImage,
   ARModel,
   ARLight,
   ARGroup,

ios/RCTARKit.h

@@ -12,6 +12,8 @@
 
 #import "RCTARKitDelegate.h"
 #import "RCTARKitNodes.h"
+#import "RCTMultiPeer.h"
+@import CoreLocation;
 
 typedef void (^RCTBubblingEventBlock)(NSDictionary *body);
 typedef void (^RCTARKitResolve)(id result);
@@ -22,16 +24,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;
@@ -46,6 +51,7 @@ typedef void (^RCTARKitReject)(NSString *code, NSString *message, NSError *error
 @property (nonatomic, copy) RCTBubblingEventBlock onPlaneRemoved;
 @property (nonatomic, copy) RCTBubblingEventBlock onPlaneUpdated;
 
+
 @property (nonatomic, copy) RCTBubblingEventBlock onAnchorDetected;
 @property (nonatomic, copy) RCTBubblingEventBlock onAnchorRemoved;
 @property (nonatomic, copy) RCTBubblingEventBlock onAnchorUpdated;
@@ -57,9 +63,21 @@ typedef void (^RCTARKitReject)(NSString *code, NSString *message, NSError *error
 @property (nonatomic, copy) RCTBubblingEventBlock onTrackingState;
 @property (nonatomic, copy) RCTBubblingEventBlock onTapOnPlaneUsingExtent;
 @property (nonatomic, copy) RCTBubblingEventBlock onTapOnPlaneNoExtent;
+
+@property (nonatomic, copy) RCTBubblingEventBlock onRotationGesture;
+@property (nonatomic, copy) RCTBubblingEventBlock onPinchGesture;
+
 @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 +88,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;
@@ -78,6 +97,8 @@ typedef void (^RCTARKitReject)(NSString *code, NSString *message, NSError *error
 - (void)focusScene;
 - (void)clearScene;
 - (NSDictionary *)readCameraPosition;
+- (void)getArAnchorPosition:(CLLocation *)location landmark:(CLLocation *)landmark anchorName:(NSString *)anchorName;
+
 - (NSDictionary *)readCamera;
 - (NSDictionary* )getCurrentLightEstimation;
 - (NSArray * )getCurrentDetectedFeaturePoints;