Merge pull request #112 from HippoAR/fix-configuration-bug

fix configuration bug
react-native-ar · Nov 15, 2017 · aaddf2a · aaddf2a
2 parents 390151d + c2e9825
commit aaddf2a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/ios/RCTARKit.m b/ios/RCTARKit.m
@@ -136,12 +136,12 @@ - (void)setDebug:(BOOL)debug {
 }
 
 - (BOOL)planeDetection {
-    ARWorldTrackingConfiguration *configuration = (ARWorldTrackingConfiguration *) self.session.configuration;
+    ARWorldTrackingConfiguration *configuration = (ARWorldTrackingConfiguration *) self.configuration;
     return configuration.planeDetection == ARPlaneDetectionHorizontal;
 }
 
 - (void)setPlaneDetection:(BOOL)planeDetection {
-    ARWorldTrackingConfiguration *configuration = (ARWorldTrackingConfiguration *) self.session.configuration;
+    ARWorldTrackingConfiguration *configuration = (ARWorldTrackingConfiguration *) self.configuration;
     if (planeDetection) {
         configuration.planeDetection = ARPlaneDetectionHorizontal;
     } else {
@@ -151,7 +151,7 @@ - (void)setPlaneDetection:(BOOL)planeDetection {
 }
 
 - (BOOL)lightEstimationEnabled {
-    ARConfiguration *configuration = self.session.configuration;
+    ARConfiguration *configuration = self.configuration;
     return configuration.lightEstimationEnabled;
 }
 
@@ -170,7 +170,7 @@ - (BOOL)autoenablesDefaultLighting {
 }
 
 - (ARWorldAlignment)worldAlignment {
-    ARConfiguration *configuration = self.session.configuration;
+    ARConfiguration *configuration = self.configuration;
     return configuration.worldAlignment;
 }
 

diff --git a/ios/RCTARKitNodes.m b/ios/RCTARKitNodes.m
@@ -223,16 +223,14 @@ - (void)removeNodeForKey:(NSString *)key {
 
     SCNNode *node = [self.nodes objectForKey:key];
     if (node) {
-       // NSLog(@"removing node %@", key);
+        [self.nodes removeObjectForKey:key];
         if(node.light) {
             // see https://stackoverflow.com/questions/47270056/how-to-remove-a-light-with-shadowmode-deferred-in-scenekit-arkit?noredirect=1#comment81491270_47270056
             node.hidden = YES;
-
-              [node removeFromParentNode];
+            [node removeFromParentNode];
         } else {
-        [node removeFromParentNode];
+            [node removeFromParentNode];
         }
-        [self.nodes removeObjectForKey:key];
     }
 }