@webspatial/platform-visionos 1.0.5 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webspatial/platform-visionos",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "description": "Used to publish WebSpatial projects to Apple Vision Pro",
   "type": "commonjs",
   "engines": {

package/web-spatial/WebMsgCommand.swift

@@ -21,13 +21,16 @@ enum SpatialWebMsgType: String, Encodable {
     case modelloaded = "modelloaded"
     case modelloadfailed = "modelloadfailed"
     case spatialtap = "spatialtap"
+    case spatialdragstart = "spatialdragstart"
     case spatialdrag = "spatialdrag"
     case spatialdragend = "spatialdragend"
+    case spatialrotatestart = "spatialrotatestart"
     case spatialrotate = "spatialrotate"
     case spatialrotateend = "spatialrotateend"
+    case spatialmagnifystart = "spatialmagnifystart"
     case spatialmagnify = "spatialmagnify"
     case spatialmagnifyend = "spatialmagnifyend"
-    
+
     case objectdestroy = "objectdestroy"
 }
 
@@ -68,6 +71,11 @@ struct WebSpatialDragGuestureEvent: Encodable {
     let detail: WebSpatialDragGuestureEventDetail
 }
 
+struct WebSpatialDragStartGuestureEvent: Encodable {
+    let type: SpatialWebMsgType = SpatialWebMsgType.spatialdragstart
+    let detail: WebSpatialDragGuestureEventDetail
+}
+
 struct WebSpatialDragEndGuestureEvent: Encodable {
     let type: SpatialWebMsgType = SpatialWebMsgType.spatialdragend
     let detail: WebSpatialDragGuestureEventDetail
@@ -77,13 +85,18 @@ struct WebSpatialRotateGuestureEventDetail: Encodable {
     let rotation: Rotation3D
     let startAnchor3D: UnitPoint3D
     let startLocation3D: Point3D
-    
 }
+
 struct WebSpatialRotateGuestureEvent: Encodable {
     let type: SpatialWebMsgType = SpatialWebMsgType.spatialrotate
     let detail: WebSpatialRotateGuestureEventDetail
 }
 
+struct WebSpatialRotateStartGuestureEvent: Encodable {
+    let type: SpatialWebMsgType = SpatialWebMsgType.spatialrotatestart
+    let detail: WebSpatialRotateGuestureEventDetail
+}
+
 struct WebSpatialRotateEndGuestureEvent: Encodable {
     let type: SpatialWebMsgType = SpatialWebMsgType.spatialrotateend
     let detail: WebSpatialRotateGuestureEventDetail
@@ -101,6 +114,11 @@ struct WebSpatialMagnifyGuestureEvent: Encodable {
     let detail: WebSpatialMagnifyGuestureEventDetail
 }
 
+struct WebSpatialMagnifyStartGuestureEvent: Encodable {
+    let type: SpatialWebMsgType = SpatialWebMsgType.spatialmagnifystart
+    let detail: WebSpatialMagnifyGuestureEventDetail
+}
+
 struct WebSpatialMagnifyEndGuestureEvent: Encodable {
     let type: SpatialWebMsgType = SpatialWebMsgType.spatialmagnifyend
     let detail: WebSpatialMagnifyGuestureEventDetail

package/web-spatial/manifest.swift

@@ -5,7 +5,7 @@ var pwaManager = PWAManager()
 
 struct PWAManager: Codable {
     var isLocal: Bool = false
-    var start_url: String = "http://localhost:5173/src/reality/gestures"
+    var start_url: String = "http://localhost:5173/src/static-3d-model"
 
     var scope: String = ""
     var id: String = "com.webspatial.pico"

package/web-spatial/model/SpatialScene.swift

@@ -116,6 +116,35 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
         return true
     }
 
+    private func handleNavigationCheckCustom(_ url: URL) -> Bool {
+        /*
+         because full url is webspatial://createSpatialScene?url=xxx
+         we need to get the real url.
+         we do 2 things:
+
+         1. let curUrl = parse url
+         2. if url is in scope do webviewModel.load(curUrl)
+            else open in safari
+         */
+        guard let components = URLComponents(string: url.absoluteString),
+              let queryItems = components.queryItems
+        else {
+            print("❌ fail to parse URL")
+            return false
+        }
+        guard let encodedUrl = queryItems.first(where: { $0.name == "url" })?.value,
+              let decodedUrl = encodedUrl.removingPercentEncoding
+        else {
+            return false
+        }
+        if pwaManager.checkInScope(url: decodedUrl) {
+            spatialWebViewModel.load(decodedUrl)
+            return false
+        }
+        UIApplication.shared.open(URL(string: decodedUrl)!, options: [:], completionHandler: nil)
+        return false
+    }
+
     private func handleWindowOpenCustom(_ url: URL) -> WebViewElementInfo? {
         // get config from url
         guard let components = URLComponents(string: url.absoluteString),
@@ -132,6 +161,11 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
             return nil
         }
 
+        if !pwaManager.checkInScope(url: decodedUrl) {
+            UIApplication.shared.open(URL(string: decodedUrl)!, options: [:], completionHandler: nil)
+            return nil
+        }
+
         if let encodedConfig = queryItems.first(where: { $0.name == "config" })?.value,
            let decodedConfig = encodedConfig.removingPercentEncoding
         {
@@ -269,6 +303,8 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
 
         spatialWebViewModel
             .addNavigationListener(protocal: SpatialApp.Instance.scope, event: handleNavigationCheck)
+        spatialWebViewModel
+            .addNavigationListener(protocal: "webspatial://createSpatialScene", event: handleNavigationCheckCustom)
     }
 
     var width: Double = 0

package/web-spatial/view/SpatializedDynamic3DView.swift

@@ -7,90 +7,159 @@ struct SpatializedDynamic3DView: View {
     @State private var isDrag = false
     @State private var isRotate = false
     @State private var isScale = false
-    
+
     private var spatializedDynamic3DElement: SpatializedDynamic3DElement {
         return spatializedElement as! SpatializedDynamic3DElement
     }
-    
-    var spatialTapEvent: some Gesture{
+
+    var spatialTapEvent: some Gesture {
         SpatialTapGesture(count: 1).targetedToAnyEntity()
-            .onEnded{ value in
-                if let entity = value.entity as? SpatialEntity{
+            .onEnded { value in
+                if let entity = value.entity as? SpatialEntity {
                     spatialScene.sendWebMsg(entity.spatialId, WebSpatialTapGuestureEvent(detail: WebSpatialTapGuestureEventDetail(location3D: value.location3D)))
-                }
-                else {
-                    if let spatialEntity = SpatialEntity.findNearestParent(entity: value.entity){
+                } else {
+                    if let spatialEntity = SpatialEntity.findNearestParent(entity: value.entity) {
                         spatialScene.sendWebMsg(spatialEntity.spatialId, WebSpatialTapGuestureEvent(detail: WebSpatialTapGuestureEventDetail(location3D: value.location3D)))
                     }
                 }
-        }
+            }
     }
-    
-    var rotate3dEvent: some Gesture{
-        RotateGesture3D().targetedToAnyEntity().onChanged{ value in
-            print(value.gestureValue)
-            if let entity = value.entity as? SpatialEntity{
-                if entity.enableTap == true {
-//                    if(isRotate == false){
-//                        print("start rotate")
-//                    }
-//                    else{
-//                        print("rotating")
-//                    }
-//                    isRotate = true
-                    return
+
+    var rotate3dEvent: some Gesture {
+        RotateGesture3D().targetedToAnyEntity().onChanged { value in
+            // Always forward rotate gesture events to JS
+            if let entity = value.entity as? SpatialEntity {
+                if !isRotate {
+                    let startEvent = WebSpatialRotateStartGuestureEvent(
+                        detail: .init(
+                            rotation: value.rotation,
+                            startAnchor3D: value.startAnchor3D,
+                            startLocation3D: value.startLocation3D
+                        )
+                    )
+                    spatialScene.sendWebMsg(entity.spatialId, startEvent)
+                    isRotate = true
+                } else {
+                    let gestureEvent = WebSpatialRotateGuestureEvent(
+                        detail: .init(
+                            rotation: value.rotation,
+                            startAnchor3D: value.startAnchor3D,
+                            startLocation3D: value.startLocation3D
+                        )
+                    )
+                    spatialScene.sendWebMsg(entity.spatialId, gestureEvent)
                 }
             }
+        }.onEnded { value in
+            // Always forward rotate end event to JS
+            if let entity = value.entity as? SpatialEntity {
+                let gestureEvent = WebSpatialRotateEndGuestureEvent(
+                    detail: .init(
+                        rotation: value.rotation,
+                        startAnchor3D: value.startAnchor3D,
+                        startLocation3D: value.startLocation3D
+                    )
+                )
+                spatialScene.sendWebMsg(entity.spatialId, gestureEvent)
+            }
             isRotate = false
-        }.onEnded{ value in
-            print(value.rotation)
-            print("rotate end")
-//            isRotate = false
         }
     }
-    
-    var magnifyEvent: some Gesture{
-        MagnifyGesture().targetedToAnyEntity().onChanged{ value in
-            print(value)
-            if let entity = value.entity as? SpatialEntity{
-                if entity.enableTap == true {
-//                    if(isScale == false){
-//                        print("start scale")
-//                    }
-//                    else{
-//                        print("scaling")
-//                    }
-//                    isScale = true
-                    return
+
+    var magnifyEvent: some Gesture {
+        MagnifyGesture().targetedToAnyEntity().onChanged { value in
+            // Always forward magnify gesture events to JS
+            if let entity = value.entity as? SpatialEntity {
+                if !isScale {
+                    let startEvent = WebSpatialMagnifyStartGuestureEvent(
+                        detail: .init(
+                            magnification: value.magnification,
+                            velocity: value.velocity,
+                            startLocation3D: value.startLocation3D,
+                            startAnchor3D: value.startAnchor3D
+                        )
+                    )
+                    spatialScene.sendWebMsg(entity.spatialId, startEvent)
+                    isScale = true
+                } else {
+                    let gestureEvent = WebSpatialMagnifyGuestureEvent(
+                        detail: .init(
+                            magnification: value.magnification,
+                            velocity: value.velocity,
+                            startLocation3D: value.startLocation3D,
+                            startAnchor3D: value.startAnchor3D
+                        )
+                    )
+                    spatialScene.sendWebMsg(entity.spatialId, gestureEvent)
                 }
             }
-        }.onEnded{ value in
-            print("scale end")
-//            isScale = false
+        }.onEnded { value in
+            // Always forward magnify end event to JS
+            if let entity = value.entity as? SpatialEntity {
+                let gestureEvent = WebSpatialMagnifyEndGuestureEvent(
+                    detail: .init(
+                        magnification: value.magnification,
+                        velocity: value.velocity,
+                        startLocation3D: value.startLocation3D,
+                        startAnchor3D: value.startAnchor3D
+                    )
+                )
+                spatialScene.sendWebMsg(entity.spatialId, gestureEvent)
+            }
+            isScale = false
         }
     }
-    
-    var dragEvent: some Gesture{
-        DragGesture().targetedToAnyEntity().onChanged{ value in
-            if let entity = value.entity as? SpatialEntity{
-                if entity.enableTap == true {
-//                    if(isDrag == false){
-//                        print("start drag")
-//                    }
-//                    else{
-//                        print("dragging")
-//                    }
-//                    isDrag = true
-                    return
+
+    var dragEvent: some Gesture {
+        DragGesture().targetedToAnyEntity().onChanged { value in
+            // Always forward drag gesture events to JS
+            if let entity = value.entity as? SpatialEntity {
+                if !isDrag {
+                    let startEvent = WebSpatialDragStartGuestureEvent(
+                        detail: .init(
+                            location3D: value.location3D,
+                            startLocation3D: value.startLocation3D,
+                            translation3D: value.translation3D,
+                            predictedEndTranslation3D: value.predictedEndTranslation3D,
+                            predictedEndLocation3D: value.predictedEndLocation3D,
+                            velocity: value.velocity
+                        )
+                    )
+                    spatialScene.sendWebMsg(entity.spatialId, startEvent)
+                    isDrag = true
+                } else {
+                    let gestureEvent = WebSpatialDragGuestureEvent(
+                        detail: .init(
+                            location3D: value.location3D,
+                            startLocation3D: value.startLocation3D,
+                            translation3D: value.translation3D,
+                            predictedEndTranslation3D: value.predictedEndTranslation3D,
+                            predictedEndLocation3D: value.predictedEndLocation3D,
+                            velocity: value.velocity
+                        )
+                    )
+                    spatialScene.sendWebMsg(entity.spatialId, gestureEvent)
                 }
             }
-            
-        }.onEnded{ value in
-            print("drag end")
-//            isDrag = false
+        }.onEnded { value in
+            // Always forward drag end event to JS
+            if let entity = value.entity as? SpatialEntity {
+                let gestureEvent = WebSpatialDragEndGuestureEvent(
+                    detail: .init(
+                        location3D: value.location3D,
+                        startLocation3D: value.startLocation3D,
+                        translation3D: value.translation3D,
+                        predictedEndTranslation3D: value.predictedEndTranslation3D,
+                        predictedEndLocation3D: value.predictedEndLocation3D,
+                        velocity: value.velocity
+                    )
+                )
+                spatialScene.sendWebMsg(entity.spatialId, gestureEvent)
+            }
+            isDrag = false
         }
     }
-    
+
     var body: some View {
         RealityView(make: { content in
             let rootEntity = spatializedDynamic3DElement.getRoot()

package/web-spatial/view/SpatializedStatic3DView.swift

@@ -19,6 +19,7 @@ struct SpatializedStatic3DView: View {
 
     @ViewBuilder
     var body: some View {
+        let depth = spatializedElement.depth
         let transform = spatializedStatic3DElement.modelTransform
         let translation = transform.translation
         let scale = transform.scale
@@ -41,6 +42,7 @@ struct SpatializedStatic3DView: View {
                             nil,
                             contentMode: .fit
                         )
+                        .if(!depth.isZero){ view in view.scaledToFit3D()}
                         .onAppear {
                             self.onLoadSuccess()
                         }