replate-camera 0.1.6 → 0.1.7

package/ios/ReplateCameraViewManager.swift

@@ -45,7 +45,6 @@ extension UIImage {
 class ReplateCameraView : UIView, ARSessionDelegate {
 
     static var arView: ARView!
-    static var anchor: ARAnchor!
     static var anchorEntity: AnchorEntity!
     static var model: Entity!
     static var spheresModels: [ModelEntity] = []
@@ -53,20 +52,27 @@ class ReplateCameraView : UIView, ARSessionDelegate {
     static var lowerSpheresSet: [Bool] = [Bool](repeating: false, count: 72)
     static var totalPhotosTaken: Int = 0
     static var photosFromDifferentAnglesTaken = 0
+    static var INSTANCE: ReplateCameraView!
 
     override init(frame: CGRect) {
         super.init(frame: frame)
         requestCameraPermissions()
 //        setupAR()
+        ReplateCameraView.INSTANCE = self
     }
 
     required init?(coder: NSCoder) {
         super.init(coder: coder)
         requestCameraPermissions()
+        ReplateCameraView.INSTANCE = self
 //        setupAR()
     }
 
-    
+    static func addRecognizer(){
+        let recognizer = UITapGestureRecognizer(target: ReplateCameraView.INSTANCE,
+                                                action: #selector(ReplateCameraView.INSTANCE.viewTapped(_:)))
+        ReplateCameraView.arView.addGestureRecognizer(recognizer)
+    }
     
     func requestCameraPermissions(){
 
@@ -94,6 +100,65 @@ class ReplateCameraView : UIView, ARSessionDelegate {
         print("Width: \(width), Height: \(height)")
         self.setupAR()
     }
+    
+    
+    @objc private func viewTapped(_ recognizer: UITapGestureRecognizer) {
+        print("VIEW TAPPED")
+//        guard !ReplateCameraView.arView.canBecomeFocused else {
+//            return
+//        }
+        
+        let tapLocation: CGPoint = recognizer.location(in: ReplateCameraView.arView)
+        let estimatedPlane: ARRaycastQuery.Target = .estimatedPlane
+        let alignment: ARRaycastQuery.TargetAlignment = .horizontal
+        
+        let result: [ARRaycastResult] = ReplateCameraView.arView.raycast(from: tapLocation,
+                                                       allowing: estimatedPlane,
+                                                       alignment: alignment)
+        
+        guard let rayCast: ARRaycastResult = result.first
+        else { return }
+        let anchor = AnchorEntity(raycastResult: rayCast)
+        print("ANCHOR FOUND\n", anchor.transform)
+        if (ReplateCameraView.model == nil && ReplateCameraView.anchorEntity == nil){
+            ReplateCameraView.anchorEntity = anchor
+            let anchorTransform = anchor.transform
+            //            let path = Bundle.main.path(forResource: "anchor", ofType: "usdz")!
+            //            let url = URL(fileURLWithPath: path)
+            //            let entity: ModelEntity = try! ModelEntity.loadModel(contentsOf: url)
+            
+            //            if #available(iOS 15.0, *) {
+            //                entity.model!.mesh.
+            //                ReplateCameraView.spheresModels = Array(entity.model!.mesh.contents.models)
+            //            }
+            //            entity.scale *= 4.5
+            //            entity.position = SIMD3(anchorTransform.columns.3.x, anchorTransform.columns.3.y, anchorTransform.columns.3.z)
+            
+            func createSphere(position: SIMD3<Float>) -> ModelEntity {
+                let sphereMesh = MeshResource.generateSphere(radius: 0.0025)
+                let sphereEntity = ModelEntity(mesh: sphereMesh, materials: [SimpleMaterial(color: .white.withAlphaComponent(0.7), isMetallic: false)])
+                sphereEntity.position = position
+                return sphereEntity
+            }
+            
+            func createSpheres(y: Float){
+                let radius = Float(0.1)
+                for i in 0..<72 {
+                    let angle = Float(i) * (Float.pi / 180) * 5 // 10 degrees in radians
+                    let x = radius * cos(angle)
+                    let z = radius * sin(angle)
+                    let spherePosition = SIMD3<Float>(x, y, z)
+                    let sphereEntity = createSphere(position: spherePosition)
+                    ReplateCameraView.spheresModels.append(sphereEntity)
+                    ReplateCameraView.anchorEntity.addChild(sphereEntity)
+                }
+            }
+            
+            createSpheres(y: 0.0)
+            createSpheres(y: 0.3)
+            ReplateCameraView.arView.scene.anchors.append(ReplateCameraView.anchorEntity)
+        }
+    }
 
     func setupAR() {
         print("Setup AR")
@@ -109,6 +174,10 @@ class ReplateCameraView : UIView, ARSessionDelegate {
 //        else { fatalError("See no reference object") }
 //        print(obj)
         configuration.planeDetection = ARWorldTrackingConfiguration.PlaneDetection.horizontal
+//        ReplateCameraView.arView.debugOptions = [
+//            .showAnchorOrigins,
+//            .showAnchorGeometry
+//        ]
         if #available(iOS 16.0, *) {
             print("recommendedVideoFormatForHighResolutionFrameCapturing")
             configuration.videoFormat = ARWorldTrackingConfiguration.recommendedVideoFormatForHighResolutionFrameCapturing ?? ARWorldTrackingConfiguration.recommendedVideoFormatFor4KResolution ?? ARWorldTrackingConfiguration.supportedVideoFormats[0]
@@ -123,61 +192,14 @@ class ReplateCameraView : UIView, ARSessionDelegate {
         }
 //        configuration.detectionObjects = obj
         ReplateCameraView.arView.session.run(configuration)
+        
+        ReplateCameraView.arView.addCoaching()
     }
 
     func session(_ session: ARSession, didAdd anchors: [ARAnchor]) {
-        print("ANCHOR FOUND")
-        if (ReplateCameraView.anchor == nil){
-            guard let _anchor = anchors.first else { return }
-            ReplateCameraView.anchor =  _anchor
-        }
-        if (ReplateCameraView.model == nil && ReplateCameraView.anchorEntity == nil){
-            let anchorTransform = ReplateCameraView.anchor.transform
-//            let path = Bundle.main.path(forResource: "anchor", ofType: "usdz")!
-//            let url = URL(fileURLWithPath: path)
-//            let entity: ModelEntity = try! ModelEntity.loadModel(contentsOf: url)
-            
-//            if #available(iOS 15.0, *) {
-//                entity.model!.mesh.
-//                ReplateCameraView.spheresModels = Array(entity.model!.mesh.contents.models)
-//            }
-//            entity.scale *= 4.5
-//            entity.position = SIMD3(anchorTransform.columns.3.x, anchorTransform.columns.3.y, anchorTransform.columns.3.z)
-            
-            func createSphere(position: SIMD3<Float>) -> ModelEntity {
-                let sphereMesh = MeshResource.generateSphere(radius: 0.0025)
-                let sphereEntity = ModelEntity(mesh: sphereMesh, materials: [SimpleMaterial(color: .white.withAlphaComponent(0.7), isMetallic: false)])
-                sphereEntity.position = position
-                return sphereEntity
-            }
-            
-            func createSpheres(y: Float){
-                let radius = Float(0.1)
-                for i in 0..<72 {
-                    let angle = Float(i) * (Float.pi / 180) * 5 // 10 degrees in radians
-                    let x = radius * cos(angle)
-                    let z = radius * sin(angle)
-                    let spherePosition = SIMD3<Float>(x, y, z)
-                    let sphereEntity = createSphere(position: spherePosition)
-                    ReplateCameraView.spheresModels.append(sphereEntity)
-                    ReplateCameraView.anchorEntity.addChild(sphereEntity)
-                }
-            }
-             
-            ReplateCameraView.anchorEntity = AnchorEntity()
-            createSpheres(y: 0.0)
-            createSpheres(y: 0.3)
-            ReplateCameraView.arView.scene.anchors.append(ReplateCameraView.anchorEntity)
-        }
+        
     }
 
-//    @objc func setCameraRect(_ node: NSNumber, rect: NSDictionary) {
-//        let x = rect["x"] as? CGFloat ?? 0
-//        let y = rect["y"] as? CGFloat ?? 0
-//        let width = rect["width"] as? CGFloat ?? 0
-//        let height = rect["height"] as? CGFloat ?? 0
-////        arView.(CGRect(x: x, y: y, width: width, height: height))
-//    }
 
     @objc var color: String = "" {
         didSet {
@@ -220,11 +242,17 @@ class ReplateCameraView : UIView, ARSessionDelegate {
         ReplateCameraView.arView.session.run(ARWorldTrackingConfiguration())
     }
 
-
 }
 
 @objc(ReplateCameraController)
-class ReplateCameraController: NSObject {
+class ReplateCameraController: RCTEventEmitter {
+    
+    static var INSTANCE: ReplateCameraController!
+    
+    override init() {
+        super.init()
+        ReplateCameraController.INSTANCE = self
+    }
 
     @objc(getPhotosCount:rejecter:)
     func getPhotosCount(_ resolver: RCTPromiseResolveBlock, rejecter: RCTPromiseRejectBlock) -> Void{
@@ -330,7 +358,6 @@ class ReplateCameraController: NSObject {
     }
     
     
-    
     static func saveImageAsJPEG(_ image: UIImage) -> URL? {
         // Convert UIImage to Data with JPEG representation
         guard let imageData = image.jpegData(compressionQuality: 1.0) else {
@@ -363,12 +390,12 @@ class ReplateCameraController: NSObject {
             return nil
         }
     }
-
-
-   @objc
-   func constantsToExport() -> [String: Any]! {
-     return ["someKey": "someValue"]
-   }
+    
+    @objc
+    func sendTutorialEndedEvent(){
+        self.sendEvent(withName: "arTutorialCompleted", body: true)
+    }
+    
     
     func updateSpheres(deviceTargetInFocus: Int) {
         guard let anchorNode = ReplateCameraView.anchorEntity else { return }
@@ -436,3 +463,31 @@ extension SCNVector3 {
         return a.x*b.x + a.y*b.y + a.z*b.z
     }
 }
+
+extension ARView: ARCoachingOverlayViewDelegate {
+    func addCoaching() {
+        print("ADD COACHING")
+        // Create a ARCoachingOverlayView object
+        let coachingOverlay = ARCoachingOverlayView()
+        // Make sure it rescales if the device orientation changes
+        coachingOverlay.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        self.addSubview(coachingOverlay)
+        coachingOverlay.center = self.convert(self.center, from:self.superview)
+        // Set the Augmented Reality goal
+        coachingOverlay.goal = .horizontalPlane
+        // Set the ARSession
+        coachingOverlay.session = self.session
+        // Set the delegate for any callbacks
+        coachingOverlay.delegate = self
+        coachingOverlay.setActive(true, animated: true)
+    }
+    // Example callback for the delegate object
+    public func coachingOverlayViewDidDeactivate(
+        _ coachingOverlayView: ARCoachingOverlayView
+    ) {
+        print("DEACTIVATED")
+        ReplateCameraController.INSTANCE.sendTutorialEndedEvent()
+        ReplateCameraView.addRecognizer()
+        print("CRASHED")
+    }
+}

package/package.json

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