replate-camera 0.1.21 → 0.1.23

package/ios/ReplateCameraViewManager.m

@@ -14,8 +14,8 @@ RCT_EXPORT_VIEW_PROPERTY(color, NSString)
 @interface RCT_EXTERN_MODULE(ReplateCameraController, NSObject)
 
 RCT_EXTERN_METHOD(takePhoto:(BOOL*)unlimited
-                 resolve:(RCTPromiseResolveBlock)resolve 
-                 rejecter:(RCTPromiseRejectBlock)reject)
+                 resolver:(RCTPromiseResolveBlock)resolver 
+                 rejecter:(RCTPromiseRejectBlock)rejecter)
 
 RCT_EXTERN_METHOD(getPhotosCount:(RCTPromiseResolveBlock*)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)

package/ios/ReplateCameraViewManager.swift

@@ -181,11 +181,6 @@ class ReplateCameraView : UIView, ARSessionDelegate {
         //        guard !ReplateCameraView.arView.canBecomeFocused else {
         //            return
         //        }
-        let callback = ReplateCameraController.anchorSetCallback
-        if (callback != nil){
-            callback!([])
-            ReplateCameraController.anchorSetCallback = nil
-        }
         let tapLocation: CGPoint = recognizer.location(in: ReplateCameraView.arView)
         let estimatedPlane: ARRaycastQuery.Target = .estimatedPlane
         let alignment: ARRaycastQuery.TargetAlignment = .horizontal
@@ -207,8 +202,10 @@ class ReplateCameraView : UIView, ARSessionDelegate {
             ReplateCameraView.initialCameraAngle = ReplateCameraController.calculateAngle(cameraPosition, anchorPosition)
         }else{}
         print("ANCHOR FOUND\n", anchor.transform)
-        if let cameraTransform = ReplateCameraView.arView.session.currentFrame?.camera.transform {
-            
+        let callback = ReplateCameraController.anchorSetCallback
+        if (callback != nil){
+            callback!([])
+            ReplateCameraController.anchorSetCallback = nil
         }
         if (ReplateCameraView.model == nil && ReplateCameraView.anchorEntity == nil){
             ReplateCameraView.anchorEntity = anchor
@@ -416,7 +413,7 @@ class ReplateCameraController: NSObject {
     }
     
     @objc(takePhoto:resolver:rejecter:)
-    func takePhoto(_ unlimited: Bool, resolver: RCTPromiseResolveBlock, rejecter: RCTPromiseRejectBlock) -> Void {
+    func takePhoto(_ unlimited: Bool = false, resolver: RCTPromiseResolveBlock, rejecter: RCTPromiseRejectBlock) -> Void {
         
         //DEVICE ORIENTATION
         guard let anchorNode = ReplateCameraView.anchorEntity else {
@@ -464,7 +461,7 @@ class ReplateCameraController: NSObject {
             print("Point 1 position: \(point1) Point 2 position: \(point2)")
             print("Angle to first: ", angleToFirstPoint, " Angle to second: ", angleToSecondPoint)
             print("Threshold \(dynamicThreshold)")
-            let isPointingAtFirstPoint = angleToFirstPoint < dynamicThreshold && cameraPosition.y < anchorNode.position.y + ReplateCameraView.spheresHeight
+            let isPointingAtFirstPoint = angleToFirstPoint < dynamicThreshold && cameraPosition.y <= anchorNode.position.y + ReplateCameraView.spheresHeight
             let isPointingAtSecondPoint = angleToSecondPoint < dynamicThreshold && cameraPosition.y >= anchorNode.position.y + ReplateCameraView.spheresHeight
             if (isPointingAtFirstPoint) {
                 deviceTargetInFocus = 0
@@ -592,6 +589,10 @@ class ReplateCameraController: NSObject {
                 print("Calculated angle \(angleForIndex)")
             }
             let sphereIndex = Int(floor(angleForIndex/5))
+            if(sphereIndex >= 72 || sphereIndex < 0){
+                print("WRONG SPHERE INDEX: \(sphereIndex)")
+                return false
+            }
             var mesh: ModelEntity?
             var newAngle: Bool = false
             if(deviceTargetInFocus == 1 && !ReplateCameraView.upperSpheresSet[sphereIndex]){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replate-camera",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "description": "Camera component for Replate Manager",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",