@webspatial/platform-visionos 1.2.1 → 1.4.0

package/web-spatial/model/dynamic3d/SpatialMaterial.swift

@@ -1,39 +1,39 @@
-import SwiftUI
 import RealityKit
+import SwiftUI
 
 @Observable
 class SpatialMaterial: SpatialObject {
     let type: SpatialMaterialType
-    
-    internal var _resource:RealityKit.Material? = nil
-    var resource:RealityKit.Material? {
+
+    var _resource: RealityKit.Material?
+    var resource: RealityKit.Material? {
         _resource
     }
-    
-    init(_ _type:SpatialMaterialType){
+
+    init(_ _type: SpatialMaterialType) {
         type = _type
         super.init()
     }
-    
+
     override func onDestroy() {
         _resource = nil
     }
 }
 
 @Observable
-class SpatialUnlitMaterial: SpatialMaterial{
-    let color:UIColor
-    
-    init(_ color:String, _ texture:TextureResource? = nil, _ transparent:Bool = true, _ opacity:Float = 1){
-        self.color = UIColor.init(Color(hex: color))
+class SpatialUnlitMaterial: SpatialMaterial {
+    let color: UIColor
+
+    init(_ color: String, _ texture: TextureResource? = nil, _ transparent: Bool = true, _ opacity: Float = 1) {
+        self.color = UIColor(Color(hex: color))
         super.init(.UnlitMaterial)
         var mat = UnlitMaterial()
-        mat.color = .init(tint:UIColor(Color.init(hex: color)), texture: texture != nil ? .init(texture!) : nil)
+        mat.color = .init(tint: UIColor(Color(hex: color)), texture: texture != nil ? .init(texture!) : nil)
         mat.blending = transparent ? .transparent(opacity: .init(scale: opacity)) : .opaque
         _resource = mat
     }
 }
 
-enum SpatialMaterialType: String{
-    case UnlitMaterial = "UnlitMaterial"
+enum SpatialMaterialType: String {
+    case UnlitMaterial
 }

package/web-spatial/model/dynamic3d/SpatialModelEntity.swift

@@ -1,32 +1,32 @@
-import SwiftUI
 import RealityKit
+import SwiftUI
 
 @Observable
-class SpatialModelEntity: SpatialEntity{
-    private var modelEntity:Entity? = nil
-    required init(_ modelResource:SpatialModelResource, _ _name:String = ""){
+class SpatialModelEntity: SpatialEntity {
+    private var modelEntity: Entity?
+    required init(_ modelResource: SpatialModelResource, _ _name: String = "") {
         super.init(_name)
         modelEntity = modelResource.resource
         addChild(modelEntity!)
         generateCollisionShapes(recursive: true)
     }
-    
+
     required init() {
         super.init()
     }
-    
-    override internal func onDestroy(){
+
+    override func onDestroy() {
         super.onDestroy()
-        if let modelEntity = self.modelEntity{
+        if let modelEntity = modelEntity {
             removeChild(modelEntity)
         }
         modelEntity = nil
     }
-    
+
     enum CodingKeys: String, CodingKey {
         case id, name, isDestroyed, children, components, model
     }
-    
+
     override func encode(to encoder: any Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(spatialId, forKey: .id)

package/web-spatial/model/dynamic3d/SpatialModelResource.swift

@@ -3,7 +3,7 @@ import SwiftUI
 
 @Observable
 class SpatialModelResource: SpatialObject {
-    var _resource: Entity? = nil
+    var _resource: Entity?
     var resource: Entity? {
         _resource
     }

package/web-spatial/model/dynamic3d/SpatialTextureResource.swift

@@ -1,18 +1,18 @@
-import SwiftUI
 import RealityKit
+import SwiftUI
 
 @Observable
-class SpatialTextureResource:SpatialObject {
-    internal var _resource:TextureResource? = nil
-    var resource:TextureResource? {
+class SpatialTextureResource: SpatialObject {
+    var _resource: TextureResource?
+    var resource: TextureResource? {
         _resource
     }
-    
-    override init(_ url:String){
+
+    override init(_ url: String) {
         super.init()
     }
-    
-    override internal func onDestroy() {
+
+    override func onDestroy() {
         _resource = nil
     }
 }

package/web-spatial/view/SceneHandlerUIView.swift

@@ -10,6 +10,9 @@ struct SceneHandlerUIView: View {
     @State var spatialScene: SpatialScene
 
     @Environment(\.scenePhase) private var scenePhase
+    @Environment(\.physicalMetrics) private var converter
+    @State private var latestScaled: Double?
+    @State private var latestUnscaled: Double?
 
     private func setResizibility(resizingRestrictions: UIWindowScene.ResizingRestrictions) {
         sceneDelegate.window?.windowScene?
@@ -41,10 +44,35 @@ struct SceneHandlerUIView: View {
         }
     }
 
+    private func updatePhysicalMetricsIfReady() {
+        if let scaled = latestScaled, let unscaled = latestUnscaled {
+            spatialScene.onUpdatePhysicalMetrics(meterToPtUnscaled: unscaled, meterToPtScaled: scaled)
+        }
+    }
+
     var body: some View {
+        let meterToPtScaled = converter.worldScalingCompensation(.scaled).convert(
+            1,
+            from: .meters
+        )
+        let meterToPtUnscaled = converter.worldScalingCompensation(.unscaled).convert(
+            1,
+            from: .meters
+        )
         VStack {}
             .onAppear {
-                // window scene only resize logic
+                latestScaled = meterToPtScaled
+                latestUnscaled = meterToPtUnscaled
+                updatePhysicalMetricsIfReady()
+            }
+            .onChange(of: meterToPtScaled) { _, newValue in
+                latestScaled = newValue
+                updatePhysicalMetricsIfReady()
+            }
+            .onChange(of: meterToPtUnscaled) { _, newValue in
+                latestUnscaled = newValue
+                updatePhysicalMetricsIfReady()
+            }.onAppear {
                 guard spatialScene.windowStyle == .window else {
                     return
                 }

package/web-spatial/view/SpatialNavView.swift

@@ -21,7 +21,6 @@ struct NavDivider: View {
     }
 }
 
-
 struct NavButton: View {
     var action: () -> Void
     var children: Image
@@ -55,21 +54,18 @@ struct NavButton: View {
     }
 }
 
-
 struct SpatialNavView: View {
     static let navHeight: CGFloat = SpatialScene.navHeight
     static let minWidth: CGFloat = 400
     var spatialScene: SpatialScene
-    var model:SpatialWebViewModel? {
-        get {
-            return spatialScene.spatialWebViewModel
-        }
+    var model: SpatialWebViewModel? {
+        return spatialScene.spatialWebViewModel
     }
+
     var url: String {
-        get {
-            return spatialScene.url
-        }
+        return spatialScene.url
     }
+
     @State var navWidth: CGFloat = 0
     @State private var showCopyTip = false
     @State private var contentHeight: CGFloat = 60
@@ -81,36 +77,40 @@ struct SpatialNavView: View {
     @State private var showNav: Double = 0
     @State private var showUrl: Double = 0
     @Namespace var hoverNamespace
-    
-    func checkButtonState(){
+
+    func checkButtonState() {
         canGoBack = model!.getController().webview!.canGoBack
         canGoForward = model!.getController().webview!.canGoForward
     }
-    
+
     func goBack() {
+        spatialScene.resetForNavigation()
         model?.getController().webview?.goBack()
     }
-    
+
     func goForward() {
+        spatialScene.resetForNavigation()
         model?.getController().webview?.goForward()
     }
-    
+
     func reload() {
+        spatialScene.resetForNavigation()
         model?.getController().webview?.reload()
     }
-    
+
     func navigateToURL(url: URL) {
+        spatialScene.resetForNavigation()
         model?.load(url.absoluteString)
     }
-    
+
     func getURL() -> URL? {
         return model?.getController().webview?.url
     }
-    
+
     @State var canGoBack: Bool = false
-    
+
     @State var canGoForward: Bool = false
-    
+
     var navHoverGroup: HoverEffectGroup {
         HoverEffectGroup(hoverNamespace)
     }
@@ -126,13 +126,15 @@ struct SpatialNavView: View {
                             action: { self.goBack()
                             },
                             children: Image("arrow_left"),
-                            clearBackGround: true)
+                            clearBackGround: true
+                        )
                         .disabled(!(self.canGoBack))
                         NavButton(
                             action: { self.goForward()
                             },
                             children: Image("arrow_right"),
-                            clearBackGround: true)
+                            clearBackGround: true
+                        )
                         .disabled(!(self.canGoBack))
                         NavButton(action: { self.reload() }, children: Image("refresh"), clearBackGround: true)
                         NavDivider()
@@ -156,12 +158,14 @@ struct SpatialNavView: View {
                     NavButton(
                         action: { self.goBack()
                         },
-                        children: Image("arrow_left"))
+                        children: Image("arrow_left")
+                    )
                     .disabled(!(self.canGoBack))
                     NavButton(
                         action: { self.goForward()
                         },
-                        children: Image("arrow_right"))
+                        children: Image("arrow_right")
+                    )
                     .disabled(!(self.canGoBack))
                     NavButton(action: { self.reload() }, children: Image("refresh"))
                     NavDivider()
@@ -187,14 +191,14 @@ struct SpatialNavView: View {
                         self.getURL()?.absoluteString ?? ""
                     )
                 )
-                    .lineLimit(1)
-                    .textSelection(.enabled)
-                    .padding(12)
-                    .frame(minWidth: 200)
-                    .frame(maxWidth: 500)
-                    .frame(height: 44)
-                    .background(.black)
-                    .cornerRadius(100)
+                .lineLimit(1)
+                .textSelection(.enabled)
+                .padding(12)
+                .frame(minWidth: 200)
+                .frame(maxWidth: 500)
+                .frame(height: 44)
+                .background(.black)
+                .cornerRadius(100)
                 NavButton(action: {
                     UIPasteboard.general.string = self.getURL()?.absoluteString ?? ""
                     showCopyTip = true
@@ -204,21 +208,22 @@ struct SpatialNavView: View {
                     withAnimation(.easeInOut(duration: 0.5)) { showUrl = 0; showNav = 1 }
                 }, children: Image("copy"))
                 NavButton(
-action: {
-                    print("open browser")
-                    UIApplication.shared
-        .open(
-            URL(
-                string: url.count > 0 ? url : (
-                    self.getURL()?.absoluteString ?? ""
+                    action: {
+                        print("open browser")
+                        UIApplication.shared
+                            .open(
+                                URL(
+                                    string: url.count > 0 ? url : (
+                                        self.getURL()?.absoluteString ?? ""
+                                    )
+                                )!,
+                                options: [:],
+                                completionHandler: nil
+                            )
+                        withAnimation(.easeInOut(duration: 0.5)) { showUrl = 0; showNav = 1 }
+                    },
+                    children: Image("browser")
                 )
-            )!,
-            options: [:],
-            completionHandler: nil
-        )
-                    withAnimation(.easeInOut(duration: 0.5)) { showUrl = 0; showNav = 1 }
-                },
- children: Image("browser"))
                 NavButton(action: { withAnimation(.easeInOut(duration: 0.5)) { showUrl = 0; showNav = 1 } }, children: Image("close"))
             }
             .popover(isPresented: $showCopyTip) {
@@ -232,8 +237,8 @@ action: {
             .cornerRadius(100)
             .opacity(showUrl)
         }
-        .onAppear(){
-            model?.addStateListener(.didFinishLoad){
+        .onAppear {
+            model?.addStateListener(.didFinishLoad) {
                 self.checkButtonState()
             }
         }

package/web-spatial/view/SpatializedDynamic3DView.swift

@@ -16,17 +16,28 @@ struct SpatializedDynamic3DView: View {
         SpatialTapGesture(count: 1).targetedToAnyEntity()
             .onEnded { value in
                 if let entity = value.entity as? SpatialEntity {
-                    spatialScene.sendWebMsg(entity.spatialId, WebSpatialTapGuestureEvent(detail: WebSpatialTapGuestureEventDetail(location3D: value.location3D)))
+                    // Convert local gesture coordinates into world (global) coordinates via RealityKit.
+                    let globalLocation3D = entity.convert(position: SIMD3<Float>(Float(value.location3D.x), Float(value.location3D.y), Float(value.location3D.z)), to: nil)
+                    let globalPoint3D = Point3D(x: Double(globalLocation3D.x), y: Double(globalLocation3D.y), z: Double(globalLocation3D.z))
+
+                    spatialScene.sendWebMsg(entity.spatialId, WebSpatialTapGuestureEvent(detail: WebSpatialTapGuestureEventDetail(location3D: value.location3D, globalLocation3D: globalPoint3D)))
                 } else {
                     if let spatialEntity = SpatialEntity.findNearestParent(entity: value.entity) {
-                        spatialScene.sendWebMsg(spatialEntity.spatialId, WebSpatialTapGuestureEvent(detail: WebSpatialTapGuestureEventDetail(location3D: value.location3D)))
+                        // Convert using the hit entity's coordinate space, then forward to the nearest SpatialEntity.
+                        let globalLocation3D = value.entity.convert(
+                            position: SIMD3<Float>(Float(value.location3D.x), Float(value.location3D.y), Float(value.location3D.z)),
+                            to: nil
+                        )
+                        let globalPoint3D = Point3D(x: Double(globalLocation3D.x), y: Double(globalLocation3D.y), z: Double(globalLocation3D.z))
+
+                        spatialScene.sendWebMsg(spatialEntity.spatialId, WebSpatialTapGuestureEvent(detail: WebSpatialTapGuestureEventDetail(location3D: value.location3D, globalLocation3D: globalPoint3D)))
                     }
                 }
             }
     }
 
     var rotate3dEvent: some Gesture {
-        RotateGesture3D().targetedToAnyEntity().onChanged { value in
+        makeRotateGesture3D().targetedToAnyEntity().onChanged { value in
             // Always forward rotate gesture events to JS
             if let entity = value.entity as? SpatialEntity {
                 let gestureEvent = WebSpatialRotateGuestureEvent(
@@ -51,6 +62,21 @@ struct SpatializedDynamic3DView: View {
         }
     }
 
+    private func makeRotateGesture3D() -> RotateGesture3D {
+        guard let raw = spatializedElement.rotateConstrainedToAxis else {
+            return RotateGesture3D()
+        }
+        let dx = Double(raw.x)
+        let dy = Double(raw.y)
+        let dz = Double(raw.z)
+        let len = (dx * dx + dy * dy + dz * dz).squareRoot()
+        if len < 1e-9 {
+            return RotateGesture3D()
+        }
+        let axis = RotationAxis3D(x: dx / len, y: dy / len, z: dz / len)
+        return RotateGesture3D(constrainedToAxis: axis)
+    }
+
     var magnifyEvent: some Gesture {
         MagnifyGesture().targetedToAnyEntity().onChanged { value in
             // Always forward magnify gesture events to JS
@@ -76,9 +102,16 @@ struct SpatializedDynamic3DView: View {
             // Always forward drag gesture events to JS
             if let entity = value.entity as? SpatialEntity {
                 if !isDrag {
+                    let globalStartLocation3D = value.entity.convert(
+                        position: SIMD3<Float>(Float(value.startLocation3D.x), Float(value.startLocation3D.y), Float(value.startLocation3D.z)),
+                        to: nil
+                    )
+                    let globalStartPoint3D = Point3D(x: Double(globalStartLocation3D.x), y: Double(globalStartLocation3D.y), z: Double(globalStartLocation3D.z))
+
                     let startEvent = WebSpatialDragStartGuestureEvent(
                         detail: .init(
-                            startLocation3D: value.startLocation3D
+                            startLocation3D: value.startLocation3D,
+                            globalLocation3D: globalStartPoint3D
                         )
                     )
                     spatialScene.sendWebMsg(entity.spatialId, startEvent)
@@ -101,13 +134,63 @@ struct SpatializedDynamic3DView: View {
     }
 
     var body: some View {
-        RealityView(make: { content in
+        RealityView(make: { content, attachments in
             let rootEntity = spatializedDynamic3DElement.getRoot()
             content.add(rootEntity)
+            spatializedDynamic3DElement.setViewContent(content)
+
+            // Add existing attachments on initial creation
+            for (_, info) in spatialScene.attachmentManager.attachments {
+                if let attachmentEntity = attachments.entity(for: info.id) {
+                    attachmentEntity.position = info.position
+                    if let parentEntity = findSpatialEntity(info.parentEntityId) {
+                        parentEntity.addChild(attachmentEntity)
+                    } else {
+                        rootEntity.addChild(attachmentEntity)
+                    }
+                }
+            }
+        }, update: { _, attachments in
+            let rootEntity = spatializedDynamic3DElement.getRoot()
+            // Update attachment positions and parenting
+            for (_, info) in spatialScene.attachmentManager.attachments {
+                if let attachmentEntity = attachments.entity(for: info.id) {
+                    attachmentEntity.position = info.position
+                    // Re-parent if not already under the correct parent
+                    if let parentEntity = findSpatialEntity(info.parentEntityId) {
+                        if attachmentEntity.parent != parentEntity {
+                            parentEntity.addChild(attachmentEntity)
+                        }
+                    } else {
+                        // Parent entity might have been destroyed; fall back to root.
+                        if attachmentEntity.parent != rootEntity {
+                            rootEntity.addChild(attachmentEntity)
+                        }
+                    }
+                }
+            }
+        }, attachments: {
+            ForEach(Array(spatialScene.attachmentManager.attachments.values)) { info in
+                Attachment(id: info.id) {
+                    info.webViewModel.getView()
+                        .frame(
+                            width: info.size.width,
+                            height: info.size.height
+                        )
+                }
+            }
         })
         .simultaneousGesture(spatialTapEvent)
         .simultaneousGesture(rotate3dEvent)
         .simultaneousGesture(dragEvent)
         .simultaneousGesture(magnifyEvent)
+        .onDisappear {
+            spatializedDynamic3DElement.setViewContent(nil)
+        }
+    }
+
+    private func findSpatialEntity(_ spatialId: String) -> SpatialEntity? {
+        // Look up the SpatialEntity from the SpatialScene's spatial object registry
+        return spatialScene.findSpatialObject(spatialId)
     }
 }