replate-camera 0.5.1 → 0.6.0

package/ios/ReplateCameraViewManager.swift

@@ -4,6 +4,7 @@ import UIKit
 import AVFoundation
 import ImageIO
 import MobileCoreServices
+import CoreMotion
 
 // MARK: - RCTViewManager
 @objc(ReplateCameraViewManager)
@@ -53,6 +54,8 @@ class ReplateCameraView: UIView, ARSessionDelegate {
   static var anchorEntity: AnchorEntity?
   static var model: Entity!
   static var sessionId: UUID!
+  static var motionManager: CMMotionManager!
+  static var gravityVector: [String : Double] = [:]
   static var INSTANCE: ReplateCameraView!
 
   // Scene Configuration
@@ -485,6 +488,7 @@ class ReplateCameraView: UIView, ARSessionDelegate {
         spheresHeight = 0.10
         dragSpeed = 7000
         dotAnchors.removeAll()
+        gravityVector = [:]
     }
 
     private static func setupNewARView() {
@@ -494,6 +498,12 @@ class ReplateCameraView: UIView, ARSessionDelegate {
         arView.backgroundColor = instance.hexStringToUIColor(hexColor: "#32a852")
         instance.addSubview(arView)
         arView.session.delegate = instance
+        motionManager = CMMotionManager()
+        if motionManager.isDeviceMotionAvailable {
+          ReplateCameraView.INSTANCE.startDeviceMotionUpdates()
+        } else {
+          print("Device motion is not available")
+        }
         setupAR()
     }
 
@@ -567,10 +577,12 @@ class ReplateCameraView: UIView, ARSessionDelegate {
 
   func sessionWasInterrupted(_ session: ARSession) {
     print("SESSION INTERRUPTED")
+    ReplateCameraView.motionManager.stopDeviceMotionUpdates()
   }
 
   func sessionInterruptionEnded(_ session: ARSession) {
     print("SESSION RESUMED")
+    ReplateCameraView.INSTANCE.startDeviceMotionUpdates()
   }
 
   func generateImpactFeedback(strength: UIImpactFeedbackGenerator.FeedbackStyle) {
@@ -582,6 +594,21 @@ class ReplateCameraView: UIView, ARSessionDelegate {
       print("Error when sending feedback")
     }
   }
+  
+  func startDeviceMotionUpdates() {
+    ReplateCameraView.motionManager.deviceMotionUpdateInterval = 0.1 // Update interval in seconds
+    ReplateCameraView.motionManager.startDeviceMotionUpdates(to: .main) { (deviceMotion, error) in
+      if let deviceMotion = deviceMotion {
+        let gravity = deviceMotion.gravity
+        ReplateCameraView.gravityVector = [
+          "x": gravity.x,
+          "y": gravity.y,
+          "z": gravity.z
+        ]
+        print("Gravity vector: x = \(gravity.x), y = \(gravity.y), z = \(gravity.z)")
+      }
+    }
+  }
 
 }
 
@@ -598,6 +625,7 @@ enum ARError: Error {
     case savingError
     case transformError
     case lightingError
+    case notInRange
     case unknown
 
     var localizedDescription: String {
@@ -611,6 +639,7 @@ enum ARError: Error {
         case .savingError: return "[ReplateCameraController] Error saving photo"
         case .transformError: return "[ReplateCameraController] Camera transform data not available"
         case .lightingError: return "[ReplateCameraController] Image too dark"
+        case .notInRange: return "[ReplateCameraController] Camera not in range"
         case .unknown: return "[ReplateCameraController] Unknown error occurred"
         }
     }
@@ -875,8 +904,25 @@ class ReplateCameraController: NSObject {
             guard let self = self else { return }
 
             self.updateCircleFocus(targetIndex: deviceTargetInfo.targetIndex)
-            self.checkCameraDistance(deviceTargetInfo: deviceTargetInfo)
-
+            let isInRange = self.checkCameraDistance(deviceTargetInfo: deviceTargetInfo)
+            if !isInRange {
+              callbackHandler.reject(.notInRange)
+              return
+            }
+            
+            guard let frame = ReplateCameraView.arView?.session.currentFrame else {
+              callbackHandler.reject(.captureError)
+              return
+            }
+            
+            // Check lighting conditions
+            if let lightEstimate = frame.lightEstimate {
+              guard lightEstimate.ambientIntensity >= Self.MIN_AMBIENT_INTENSITY else {
+                callbackHandler.reject(.lightingError)
+                return
+              }
+            }
+                    
             self.updateSpheres(
                 deviceTargetInfo: deviceTargetInfo,
                 cameraTransform: deviceTargetInfo.transform
@@ -886,7 +932,7 @@ class ReplateCameraController: NSObject {
                     return
                 }
 
-                self.captureAndProcessImage(callbackHandler: callbackHandler)
+                self.processAndSaveImage(frame.capturedImage, callbackHandler: callbackHandler)
             }
         }
     }
@@ -900,7 +946,7 @@ class ReplateCameraController: NSObject {
         }
     }
 
-    private func checkCameraDistance(deviceTargetInfo: DeviceTargetInfo) {
+  private func checkCameraDistance(deviceTargetInfo: DeviceTargetInfo) -> Bool {
         let distance = isCameraWithinRange(
             cameraTransform: deviceTargetInfo.transform,
             anchorEntity: ReplateCameraView.anchorEntity!
@@ -909,31 +955,17 @@ class ReplateCameraController: NSObject {
         switch distance {
         case 1:
             ReplateCameraController.tooFarCallback?([])
+            ReplateCameraController.tooFarCallback = nil
+            return false
         case -1:
             ReplateCameraController.tooCloseCallback?([])
+            ReplateCameraController.tooCloseCallback = nil
+            return false
         default:
-            break
+            return true
         }
     }
 
-    // MARK: - Image Processing
-    private func captureAndProcessImage(callbackHandler: SafeCallbackHandler) {
-        guard let frame = ReplateCameraView.arView?.session.currentFrame else {
-            callbackHandler.reject(.captureError)
-            return
-        }
-
-        // Check lighting conditions
-        if let lightEstimate = frame.lightEstimate {
-            guard lightEstimate.ambientIntensity >= Self.MIN_AMBIENT_INTENSITY else {
-                callbackHandler.reject(.lightingError)
-                return
-            }
-        }
-
-        processAndSaveImage(frame.capturedImage, callbackHandler: callbackHandler)
-    }
-
   private func processAndSaveImage(_ pixelBuffer: CVPixelBuffer, callbackHandler: SafeCallbackHandler) {
     let ciImage = CIImage(cvImageBuffer: pixelBuffer)
 
@@ -1260,20 +1292,20 @@ class ReplateCameraController: NSObject {
           let source = CGImageSourceCreateWithData(imageData as CFData, nil) else {
       return nil
     }
-    
+
     let temporaryDirectoryURL = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
     let uniqueFilename = "image_\(Date().timeIntervalSince1970).jpg"
     let fileURL = temporaryDirectoryURL.appendingPathComponent(uniqueFilename)
-    
+
     guard let imageProperties = CGImageSourceCopyPropertiesAtIndex(source, 0, nil) as? [CFString: Any] else {
       return nil
     }
-    
+
     var mutableMetadata = imageProperties
     mutableMetadata[kCGImagePropertyExifDictionary] = [
       kCGImagePropertyExifUserComment: getTransformJSON(session: ReplateCameraView.arView.session)
     ]
-    
+
     guard let destination = CGImageDestinationCreateWithURL(
       fileURL as CFURL,
       kUTTypeJPEG,
@@ -1282,21 +1314,21 @@ class ReplateCameraController: NSObject {
     ) else {
       return nil
     }
-    
+
     CGImageDestinationAddImageFromSource(
       destination,
       source,
       0,
       mutableMetadata as CFDictionary
     )
-    
+
     guard CGImageDestinationFinalize(destination) else {
       return nil
     }
-    
+
     return fileURL
   }
-  
+
   func getTransformJSON(session: ARSession) -> String {
     let transform = session.currentFrame?.camera.transform ?? simd_float4x4()
     // Extract translation
@@ -1305,21 +1337,21 @@ class ReplateCameraController: NSObject {
       "y": transform.columns.3.y,
       "z": transform.columns.3.z
     ]
-    
+
     // Extract scale by calculating the length of each column vector
     let scale = [
       "x": simd_length(simd_float3(transform.columns.0.x, transform.columns.0.y, transform.columns.0.z)),
       "y": simd_length(simd_float3(transform.columns.1.x, transform.columns.1.y, transform.columns.1.z)),
       "z": simd_length(simd_float3(transform.columns.2.x, transform.columns.2.y, transform.columns.2.z))
     ]
-    
+
     // Extract rotation by normalizing each axis and converting it into a 3x3 rotation matrix
     let rotationMatrix = simd_float3x3(columns: (
       simd_float3(transform.columns.0.x / scale["x"]!, transform.columns.0.y / scale["x"]!, transform.columns.0.z / scale["x"]!),
       simd_float3(transform.columns.1.x / scale["y"]!, transform.columns.1.y / scale["y"]!, transform.columns.1.z / scale["y"]!),
       simd_float3(transform.columns.2.x / scale["z"]!, transform.columns.2.y / scale["z"]!, transform.columns.2.z / scale["z"]!)
     ))
-    
+
     // Convert rotation matrix to quaternion
     let quaternion = simd_quatf(rotationMatrix)
     let rotation = [
@@ -1328,26 +1360,15 @@ class ReplateCameraController: NSObject {
       "z": quaternion.vector.z,
       "w": quaternion.vector.w
     ]
-    
-    // Get the gravity vector from the AR session
-    var gravityVector: [String: Any] = [:]
-    if let currentFrame = session.currentFrame {
-      let gravityEulerAngles = currentFrame.camera.eulerAngles
-      gravityVector = [
-        "x": gravityEulerAngles.x,
-        "y": gravityEulerAngles.y,
-        "z": gravityEulerAngles.z
-      ]
-    }
-    
+
     // Format as JSON
     let jsonObject: [String: Any] = [
       "translation": translation,
       "rotation": rotation,
       "scale": scale,
-      "gravityVector": gravityVector
+      "gravityVector": ReplateCameraView.gravityVector
     ]
-    
+
     // Convert dictionary to JSON string
     if let jsonData = try? JSONSerialization.data(withJSONObject: jsonObject, options: .prettyPrinted),
        let jsonString = String(data: jsonData, encoding: .utf8) {

package/package.json

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