@webspatial/platform-visionos 1.4.0 → 1.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webspatial/platform-visionos",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Used to publish WebSpatial projects to Apple Vision Pro",
   "type": "commonjs",
   "main": "package.json",

package/web-spatial/JSBCommand.swift

@@ -145,6 +145,26 @@ protocol SpatialObjectCommand: CommandDataProtocol {
     var id: String { get }
 }
 
+struct UpdateUnlitMaterialProperties: CommandDataProtocol {
+    static let commandType: String = "UpdateUnlitMaterialProperties"
+    let id: String
+    let color: String?
+    let transparent: Bool?
+    let opacity: Float?
+}
+
+struct RemoveComponentFromEntity: CommandDataProtocol {
+    static let commandType: String = "RemoveComponentFromEntity"
+    let entityId: String
+    let componentId: String
+}
+
+struct SetMaterialsOnEntity: CommandDataProtocol {
+    static let commandType: String = "SetMaterialsOnEntity"
+    let entityId: String
+    let materialIds: [String]
+}
+
 struct DestroyCommand: CommandDataProtocol {
     static let commandType: String = "Destroy"
     var id: String

package/web-spatial/manifest.swift

@@ -6,7 +6,7 @@ var pwaManager = PWAManager()
 struct PWAManager: Codable {
     var isLocal: Bool = false
 
-    var start_url: String = "http://localhost:5173/#/geometry-verify"
+    var start_url: String = "http://localhost:5173/"
 
     // var start_url: String = "http://localhost:5173/#/spatial-drag-gesture"
 

package/web-spatial/model/SpatialScene.swift

@@ -321,6 +321,10 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
         spatialWebViewModel.addJSBListener(InitializeAttachmentCommand.self, onInitializeAttachment)
         spatialWebViewModel.addJSBListener(ConvertCoordinate.self, onConvertCoordinate)
 
+        spatialWebViewModel.addJSBListener(UpdateUnlitMaterialProperties.self, onUpdateUnlitMaterialProperties)
+        spatialWebViewModel.addJSBListener(RemoveComponentFromEntity.self, onRemoveComponentFromEntity)
+        spatialWebViewModel.addJSBListener(SetMaterialsOnEntity.self, onSetMaterialsOnEntity)
+
         spatialWebViewModel.addJSBListener(UpdateAttachmentEntityCommand.self, onUpdateAttachmentEntity)
 
         spatialWebViewModel.addOpenWindowListener(protocal: "webspatial", onOpenWindowHandler)
@@ -1196,6 +1200,52 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
         resolve(.success(baseReplyData))
     }
 
+    private func onUpdateUnlitMaterialProperties(command: UpdateUnlitMaterialProperties, resolve: @escaping JSBManager.ResolveHandler<Encodable>) {
+        guard let material = spatialObjects[command.id] as? SpatialUnlitMaterial else {
+            resolve(.failure(JsbError(code: .InvalidSpatialObject, message: "Material \(command.id) not found")))
+            return
+        }
+        material.updateProperties(color: command.color, transparent: command.transparent, opacity: command.opacity)
+        // Re-apply material to any ModelComponent or ModelEntity override that references it
+        for (_, obj) in spatialObjects {
+            if let comp = obj as? SpatialModelComponent, comp.usesMaterial(command.id) {
+                comp.refreshMaterials()
+            } else if let modelEntity = obj as? SpatialModelEntity, modelEntity.usesMaterial(command.id) {
+                modelEntity.refreshMaterials()
+            }
+        }
+        resolve(.success(baseReplyData))
+    }
+
+    private func onRemoveComponentFromEntity(command: RemoveComponentFromEntity, resolve: @escaping JSBManager.ResolveHandler<Encodable>) {
+        guard let entity = spatialObjects[command.entityId] as? SpatialEntity,
+              let component = spatialObjects[command.componentId] as? SpatialComponent
+        else {
+            resolve(.failure(JsbError(code: .InvalidSpatialObject, message: "Remove component failed")))
+            return
+        }
+        entity.removeComponent(component)
+        resolve(.success(baseReplyData))
+    }
+
+    private func onSetMaterialsOnEntity(command: SetMaterialsOnEntity, resolve: @escaping JSBManager.ResolveHandler<Encodable>) {
+        guard let entity = spatialObjects[command.entityId] as? SpatialModelEntity else {
+            resolve(.failure(JsbError(code: .InvalidSpatialObject, message: "ModelEntity \(command.entityId) not found")))
+            return
+        }
+        var materials: [SpatialMaterial] = []
+        for mid in command.materialIds {
+            if let material = spatialObjects[mid] as? SpatialMaterial {
+                materials.append(material)
+            } else {
+                resolve(.failure(JsbError(code: .InvalidSpatialObject, message: "Material \(mid) not found")))
+                return
+            }
+        }
+        entity.setMaterials(materials)
+        resolve(.success(baseReplyData))
+    }
+
     private func addSpatialObject(_ object: any SpatialObjectProtocol) {
         var spatialObject = object
         spatialObjects[spatialObject.spatialId] = spatialObject
@@ -1227,19 +1277,12 @@ class SpatialScene: SpatialObject, ScrollAbleSpatialElementContainer, WebMsgSend
             return nil
         }
 
-        for (_, object) in spatialObjects {
-            guard let dynamic3dElement = object as? SpatializedDynamic3DElement else {
-                continue
-            }
-
-            let root = dynamic3dElement.getRoot()
-            var current: Entity? = entity
-            while let node = current {
-                if node === root {
-                    return dynamic3dElement
-                }
-                current = node.parent
+        var current: Entity? = entity
+        while let node = current {
+            if let rootEntity = node as? SpatialRootEntity {
+                return rootEntity.root
             }
+            current = node.parent
         }
 
         return nil

package/web-spatial/model/SpatializedDynamic3DElement.swift

@@ -4,9 +4,14 @@ import RealityKit
 
 @Observable
 class SpatializedDynamic3DElement: SpatializedElement {
-    private var rootEntity = SpatialEntity()
+    private var rootEntity = SpatialRootEntity()
     private var viewContent: RealityViewContent? = nil
 
+    override init() {
+        super.init()
+        rootEntity.root = self
+    }
+
     func getRoot() -> SpatialEntity {
         return rootEntity
     }

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

@@ -43,7 +43,12 @@ class SpatialComponent: SpatialObject {
 
 @Observable
 class SpatialModelComponent: SpatialComponent {
+    private(set) var spatialMaterials: [SpatialMaterial] = []
+    private(set) var mesh: Geometry?
+
     init(mesh: Geometry, mats: [SpatialMaterial]) {
+        spatialMaterials = mats
+        self.mesh = mesh
         super.init(.ModelComponent)
         var materials: [any RealityKit.Material] = []
         for item in mats {
@@ -52,6 +57,27 @@ class SpatialModelComponent: SpatialComponent {
         _resource = ModelComponent(mesh: mesh.resource!, materials: materials)
     }
 
+    /// Rebuild the ModelComponent with current material resources (called after material properties change)
+    func refreshMaterials() {
+        guard let mesh = mesh else { return }
+        var materials: [any RealityKit.Material] = []
+        for item in spatialMaterials {
+            if let res = item.resource {
+                materials.append(res)
+            }
+        }
+        _resource = ModelComponent(mesh: mesh.resource!, materials: materials)
+        if let entity = _entity {
+            entity.components.set(_resource!)
+            entity.generateCollisionShapes(recursive: true)
+        }
+    }
+
+    /// Check if this component uses the given material
+    func usesMaterial(_ materialId: String) -> Bool {
+        return spatialMaterials.contains { $0.id == materialId }
+    }
+
     override func addToEntity(entity: SpatialEntity) {
         super.addToEntity(entity: entity)
         entity.generateCollisionShapes(recursive: true)
@@ -63,7 +89,12 @@ class SpatialModelComponent: SpatialComponent {
     }
 
     override func onDestroy() {
+        // TODO(P2): `mesh` is a registered `Geometry` spatial object; clearing the reference does not
+        // run `Geometry.destroy()`, so dynamic mesh rebuilds can leak mesh/registry entries until the
+        // scene ends. Call `mesh?.destroy()` (or equivalent) before nil-ing when ownership is exclusive.
         _resource = nil
+        spatialMaterials = []
+        mesh = nil
     }
 }
 

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

@@ -22,16 +22,38 @@ class SpatialMaterial: SpatialObject {
 
 @Observable
 class SpatialUnlitMaterial: SpatialMaterial {
-    let color: UIColor
+    private(set) var currentColor: UIColor
+    private(set) var currentTexture: TextureResource?
+    private(set) var currentTransparent: Bool
+    private(set) var currentOpacity: Float
 
     init(_ color: String, _ texture: TextureResource? = nil, _ transparent: Bool = true, _ opacity: Float = 1) {
-        self.color = UIColor(Color(hex: color))
+        currentColor = UIColor(Color(hex: color))
+        currentTexture = texture
+        currentTransparent = transparent
+        currentOpacity = opacity
         super.init(.UnlitMaterial)
         var mat = UnlitMaterial()
-        mat.color = .init(tint: UIColor(Color(hex: color)), texture: texture != nil ? .init(texture!) : nil)
+        mat.color = .init(tint: currentColor, texture: texture != nil ? .init(texture!) : nil)
         mat.blending = transparent ? .transparent(opacity: .init(scale: opacity)) : .opaque
         _resource = mat
     }
+
+    func updateProperties(color: String?, transparent: Bool?, opacity: Float?) {
+        if let color = color {
+            currentColor = UIColor(Color(hex: color))
+        }
+        if let transparent = transparent {
+            currentTransparent = transparent
+        }
+        if let opacity = opacity {
+            currentOpacity = opacity
+        }
+        var mat = UnlitMaterial()
+        mat.color = .init(tint: currentColor, texture: currentTexture != nil ? .init(currentTexture!) : nil)
+        mat.blending = currentTransparent ? .transparent(opacity: .init(scale: currentOpacity)) : .opaque
+        _resource = mat
+    }
 }
 
 enum SpatialMaterialType: String {

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

@@ -4,6 +4,9 @@ import SwiftUI
 @Observable
 class SpatialModelEntity: SpatialEntity {
     private var modelEntity: Entity?
+    /// Retained so `UpdateUnlitMaterialProperties` can re-apply current `SpatialMaterial.resource` after native material updates.
+    private(set) var overrideSpatialMaterials: [SpatialMaterial] = []
+
     required init(_ modelResource: SpatialModelResource, _ _name: String = "") {
         super.init(_name)
         modelEntity = modelResource.resource
@@ -15,12 +18,44 @@ class SpatialModelEntity: SpatialEntity {
         super.init()
     }
 
+    func setMaterials(_ materials: [SpatialMaterial]) {
+        overrideSpatialMaterials = materials
+        applyOverrideMaterials()
+    }
+
+    /// Re-apply stored override materials using each `SpatialMaterial`'s current `resource` (e.g. after unlit property updates).
+    func refreshMaterials() {
+        applyOverrideMaterials()
+    }
+
+    func usesMaterial(_ materialId: String) -> Bool {
+        overrideSpatialMaterials.contains { $0.id == materialId }
+    }
+
+    private func applyOverrideMaterials() {
+        guard let modelEntity = modelEntity else { return }
+        // TODO(P1): Clearing overrides (`setMaterials([])`) assigns an empty material list here; there is
+        // no baseline of the model asset’s authored materials to restore. Persist per-component defaults
+        // at load (or skip writing when overrides are empty) so clears return to the authored look.
+        func applyMaterials(to entity: Entity) {
+            if var modelComp = entity.components[ModelComponent.self] {
+                modelComp.materials = overrideSpatialMaterials.compactMap { $0.resource }
+                entity.components.set(modelComp)
+            }
+            for child in entity.children {
+                applyMaterials(to: child)
+            }
+        }
+        applyMaterials(to: modelEntity)
+    }
+
     override func onDestroy() {
         super.onDestroy()
         if let modelEntity = modelEntity {
             removeChild(modelEntity)
         }
         modelEntity = nil
+        overrideSpatialMaterials = []
     }
 
     enum CodingKeys: String, CodingKey {

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

@@ -0,0 +1,12 @@
+import RealityKit
+import SwiftUI
+
+@Observable
+class SpatialRootEntity: SpatialEntity {
+    weak var root: SpatializedDynamic3DElement?
+
+    convenience init(root: SpatializedDynamic3DElement) {
+        self.init()
+        self.root = root
+    }
+}

package/web-spatial.xcodeproj/project.pbxproj

@@ -70,6 +70,7 @@
 				dynamic3d/SpatialMaterial.swift,
 				dynamic3d/SpatialModelEntity.swift,
 				dynamic3d/SpatialModelResource.swift,
+				dynamic3d/SpatialRootEntity.swift,
 				dynamic3d/SpatialTextureResource.swift,
 				SpatialApp.swift,
 				Spatialized2DElement.swift,