add new hierarchy array on ids, fix again cleaning bug

react-native-ar · Nov 12, 2017 · 97ba3aa · 97ba3aa
1 parent 39896c8
commit 97ba3aa
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 6 deletions.
diff --git a/ARKit.js b/ARKit.js
@@ -32,7 +32,7 @@ const TRACKING_STATES_COLOR = ['red', 'orange', 'green'];
 
 // clear scene on start (not on mount)
 // this is only needed if you reload the app (in dev mode)
-ARKitManager.clearScene();
+let firstMount = false;
 
 class ARKit extends Component {
   state = {
@@ -43,6 +43,11 @@ class ARKit extends Component {
 
   componentDidMount() {
     ARKitManager.resume();
+    if (!firstMount) {
+      ARKitManager.clearScene();
+    } else {
+      firstMount = true;
+    }
   }
 
   componentWillUnmount() {

diff --git a/components/ARText.js b/components/ARText.js
@@ -12,7 +12,7 @@ import { NativeModules } from 'react-native';
 import createArComponent from './lib/createArComponent';
 
 const ARText = createArComponent(
-  { mount: NativeModules.ARTextManager.mount, pick: ['text', 'font'] },
+  { mount: NativeModules.ARTextManager.mount, pick: ['id', 'text', 'font'] },
   {
     text: PropTypes.string,
     font: PropTypes.shape({

diff --git a/ios/RCTARKit.m b/ios/RCTARKit.m
@@ -380,7 +380,7 @@ - (void)renderer:(id <SCNSceneRenderer>)renderer didAddNode:(SCNNode *)node forA
     //            });
 
     if (self.onPlaneDetected) {
-        self.onPlaneDetected(@{
+        self.onPlaneDetected(@{ 
                                @"id": planeAnchor.identifier.UUIDString,
                                @"alignment": @(planeAnchor.alignment),
                                @"node": @{ @"x": @(node.position.x), @"y": @(node.position.y), @"z": @(node.position.z) },

diff --git a/ios/RCTARKitNodes.m b/ios/RCTARKitNodes.m
@@ -161,13 +161,16 @@ - (NSMutableArray *) mapHitResultsWithSceneResults: (NSArray<SCNHitTestResult *>
         SCNHitTestResult *result = (SCNHitTestResult *) obj;
         SCNNode * node = result.node;
 
+
+        NSArray *ids = [self getIdHierarchy:node];
 
         SCNVector3 point = result.worldCoordinates;
         SCNVector3 normal = result.worldNormal;
-        NSString * nodeId = node.name;
         float distance = [self getCameraDistanceToPoint:point];
+
         [resultsMapped addObject:(@{
-                                    @"id": nodeId,
+                                    @"id": ids.count > 0 ? ids[0] : @"",
+                                    @"ids": ids,
                                     @"distance": @(distance),
                                     @"point": @{
                                             @"x": @(point.x),
@@ -198,6 +201,18 @@ - (void)registerNode:(SCNNode *)node forKey:(NSString *)key {
     }
 }
 
+- (NSArray *) getIdHierarchy:(SCNNode *) node {
+    NSMutableArray * ids = [NSMutableArray new];
+
+    SCNNode* _node = node;
+    while(_node) {
+        if(_node.name)
+            [ids addObject:_node.name];
+        _node = _node.parentNode;
+    }
+    return ids;
+
+}
 - (SCNNode *)nodeForKey:(NSString *)key {
     return [self.nodes objectForKey:key];
 }

diff --git a/ios/RCTConvert+ARKit.m b/ios/RCTConvert+ARKit.m
@@ -270,8 +270,11 @@ + (SCNTextNode *)SCNTextNode:(id)json {
 
     // SCNTextNode
     SCNTextNode *textNode = [SCNNode nodeWithGeometry:scnText];
-    textNode.scale = SCNVector3Make(size, size, size);
+    textNode.name = [NSString stringWithFormat:@"%@", json[@"id"]];
+
 
+    textNode.scale = SCNVector3Make(size, size, size);
+
     // position textNode
     SCNVector3 min = SCNVector3Zero;
     SCNVector3 max = SCNVector3Zero;