@webspatial/platform-visionos 1.0.3 → 1.0.5

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

@@ -0,0 +1,39 @@
+import SwiftUI
+import RealityKit
+
+@Observable
+class SpatialModelEntity: SpatialEntity{
+    private var modelEntity:Entity? = nil
+    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(){
+        super.onDestroy()
+        if let modelEntity = self.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)
+        try container.encode(name, forKey: .name)
+        try container.encode(isDestroyed, forKey: .isDestroyed)
+        try container.encode(spatialChildren, forKey: .children)
+        try container.encode(spatialComponents, forKey: .components)
+        try container.encode(modelEntity?.id, forKey: .model)
+    }
+}

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

@@ -0,0 +1,38 @@
+import RealityKit
+import SwiftUI
+
+@Observable
+class SpatialModelResource: SpatialObject {
+    var _resource: Entity? = nil
+    var resource: Entity? {
+        _resource
+    }
+
+    init(_ urlString: String, _ onload: @escaping (Result<SpatialModelResource, Error>) -> Void) {
+        super.init()
+        Dynamic3DManager.loadResourceToLocal(urlString) { result in
+            switch result {
+            case let .success(url):
+                DispatchQueue.main.async {
+                    do {
+                        let entity = try Entity.load(contentsOf: url)
+                        self._resource = entity
+                        onload(.success(self))
+                    } catch {
+                        print("Failed to load entity from URL: \(error)")
+                        onload(.failure(error))
+                        self.destroy()
+                    }
+                }
+            case let .failure(error):
+                print("Failed to download model: \(error)")
+                onload(.failure(error))
+                self.destroy()
+            }
+        }
+    }
+
+    override func onDestroy() {
+        _resource = nil
+    }
+}

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

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

package/web-spatial/protocol/ScrollAbleSpatialElementContainer.swift

@@ -0,0 +1 @@
+protocol ScrollAbleSpatialElementContainer: SpatialScrollAble, SpatializedElementContainer {}

package/web-spatial/protocol/SpatialScrollAble.swift

@@ -0,0 +1,8 @@
+import CoreFoundation
+
+protocol SpatialScrollAble {
+    func updateDeltaScrollOffset(_ delta: Vec2)
+    func stopScrolling()
+    var scrollPageEnabled: Bool { get }
+    var scrollOffset: Vec2 { get }
+}

package/web-spatial/protocol/SpatializedElementContainer.swift

@@ -0,0 +1,8 @@
+protocol SpatializedElementContainer {
+    var id: String { get }
+    var parent: ScrollAbleSpatialElementContainer? { get }
+    func addChild(_ spatializedElement: SpatializedElement)
+    func removeChild(_ spatializedElement: SpatializedElement)
+    func getChildren() -> [String: SpatializedElement]
+    func getChildrenOfType(_ type: SpatializedElementType) -> [String: SpatializedElement]
+}

package/web-spatial/protocol/WebMsgSender.swift

@@ -0,0 +1,5 @@
+import CoreFoundation
+
+protocol WebMsgSender {
+    func sendWebMsg(_ id: String, _ msg: Encodable)
+}

package/web-spatial/types/Vec2.swift

@@ -0,0 +1,12 @@
+import CoreFoundation
+
+struct Vec2: Codable {
+    var x: CGFloat
+    var y: CGFloat
+}
+
+extension Vec2 {
+    static func + (left: Vec2, right: Vec2) -> Vec2 {
+        return Vec2(x: left.x + right.x, y: left.y + right.y)
+    }
+}

package/web-spatial/types/Vec3.swift

@@ -0,0 +1,7 @@
+import CoreFoundation
+
+struct Vec3: Codable {
+    var x: CGFloat
+    var y: CGFloat
+    var z: CGFloat
+}

package/web-spatial/view/SceneHandlerUIView.swift

@@ -0,0 +1,92 @@
+import SwiftUI
+
+struct SceneHandlerUIView: View {
+    @Environment(\.openImmersiveSpace) private var openImmersiveSpace
+    @Environment(\.dismissImmersiveSpace) private var dismissImmersiveSpace
+    @Environment(\.openWindow) private var openWindow
+    @Environment(\.dismissWindow) private var dismissWindow
+    @EnvironmentObject private var sceneDelegate: SceneDelegate
+
+    @State var spatialScene: SpatialScene
+
+    @Environment(\.scenePhase) private var scenePhase
+
+    private func setResizibility(resizingRestrictions: UIWindowScene.ResizingRestrictions) {
+        sceneDelegate.window?.windowScene?
+            .requestGeometryUpdate(
+                .Vision(
+                    resizingRestrictions: resizingRestrictions
+                )
+            )
+    }
+
+    private func setResizeRange(resizeRange: ResizeRange) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.0) {
+            sceneDelegate.window?.windowScene?
+                .requestGeometryUpdate(
+                    .Vision(
+                        minimumSize: CGSize(
+                            width: resizeRange.minWidth ?? 0,
+                            height: resizeRange
+                                .minHeight ?? 0
+                        ),
+                        maximumSize: CGSize(
+                            width: resizeRange.maxWidth ?? .infinity,
+                            height: resizeRange.maxHeight ?? .infinity
+                        )
+                    )
+                ) { error in
+                    print("error:", error)
+                }
+        }
+    }
+
+    var body: some View {
+        VStack {}
+            .onAppear {
+                // window scene only resize logic
+                guard spatialScene.windowStyle == .window else {
+                    return
+                }
+                if let range = spatialScene.sceneConfig?.resizeRange {
+                    self.setResizeRange(resizeRange: range)
+                    if (range.minWidth != nil || range.minHeight != nil) && range.minWidth == range.maxWidth && range.minHeight == range.maxHeight {
+                        self.setResizibility(resizingRestrictions: .none)
+                    } else {
+                        self.setResizibility(resizingRestrictions: .freeform)
+                    }
+                }
+            }
+            .onDisappear {
+                print("onScene Disappear")
+                spatialScene.destroy()
+            }
+            .onReceive(spatialScene.openWindowData) { sceneID in
+                if let spatialScene = SpatialApp.Instance.getScene(sceneID) {
+                    let _ = openWindow(
+                        id: spatialScene.windowStyle.rawValue,
+                        value: sceneID
+                    )
+                }
+            }
+            .onReceive(spatialScene.closeWindowData) { sceneID in
+                if let spatialScene = SpatialApp.Instance.getScene(sceneID) {
+                    dismissWindow(
+                        id: spatialScene.windowStyle.rawValue,
+                        value: sceneID
+                    )
+                }
+            }
+            .onReceive(spatialScene.setLoadingWindowData) { wd in
+                if wd.method == .show {
+                    openWindow(id: "loading", value: wd.sceneID)
+                } else if wd.method == .hide {
+                    dismissWindow(id: "loading", value: wd.sceneID)
+                }
+            }
+
+            .onChange(of: scenePhase) { oldValue, newValue in
+                logger.debug("OpenDismissHandlerUI: Value changed from \(oldValue) to \(newValue)")
+            }
+    }
+}

package/web-spatial/{views/ui/NavView.swift → view/SpatialNavView.swift}

@@ -1,11 +1,75 @@
 import SwiftUI
-import WebKit
 
-struct NavView: View {
-    static let navHeight: CGFloat = 60
+struct NavButtonStyle: ButtonStyle {
+    func makeBody(configuration: Configuration) -> some View {
+        configuration.label
+            .background(Color.clear)
+    }
+}
+
+struct NavDivider: View {
+    var width: CGFloat = 1
+    var height: CGFloat = 16
+    var paddingLR: CGFloat = 4
+    var paddingTB: CGFloat = 12
+    var body: some View {
+        VStack {
+            Rectangle().fill(Color(hex: "#FFFFFF3D")).frame(width: width, height: height)
+        }
+        .padding([.top, .bottom], paddingTB)
+        .padding([.leading, .trailing], paddingLR)
+    }
+}
+
+
+struct NavButton: View {
+    var action: () -> Void
+    var children: Image
+    var size: CGFloat = 44
+    var padding: CGFloat = 10
+    var clearBackGround: Bool = true
+    var body: some View {
+        if clearBackGround {
+            Button(action: action, label: {
+                ZStack {
+                    Circle()
+                        .fill(Color.white.opacity(0))
+                        .frame(width: size, height: size)
+                        .overlay(
+                            children.resizable().frame(width: size - padding * 2, height: size - padding * 2)
+                        )
+                        .contentShape(Circle())
+                }
+            }).buttonStyle(NavButtonStyle()).frame(width: size, height: size).hoverEffect(.highlight)
+        } else {
+            Button(action: action, label: {
+                Circle()
+                    .fill(Color.white.opacity(0))
+                    .frame(width: size, height: size)
+                    .overlay(
+                        children.resizable().frame(width: size - padding * 2, height: size - padding * 2)
+                    )
+                    .contentShape(Circle())
+            }).hoverEffect(.highlight)
+        }
+    }
+}
+
+
+struct SpatialNavView: View {
+    static let navHeight: CGFloat = SpatialScene.navHeight
     static let minWidth: CGFloat = 400
-    @State var swc: SpatialWindowComponent?
-    @StateObject var navInfo: NavInfo
+    var spatialScene: SpatialScene
+    var model:SpatialWebViewModel? {
+        get {
+            return spatialScene.spatialWebViewModel
+        }
+    }
+    var url: String {
+        get {
+            return spatialScene.url
+        }
+    }
     @State var navWidth: CGFloat = 0
     @State private var showCopyTip = false
     @State private var contentHeight: CGFloat = 60
@@ -17,6 +81,36 @@ struct NavView: View {
     @State private var showNav: Double = 0
     @State private var showUrl: Double = 0
     @Namespace var hoverNamespace
+    
+    func checkButtonState(){
+        canGoBack = model!.getController().webview!.canGoBack
+        canGoForward = model!.getController().webview!.canGoForward
+    }
+    
+    func goBack() {
+        model?.getController().webview?.goBack()
+    }
+    
+    func goForward() {
+        model?.getController().webview?.goForward()
+    }
+    
+    func reload() {
+        model?.getController().webview?.reload()
+    }
+    
+    func navigateToURL(url: URL) {
+        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)
     }
@@ -28,9 +122,19 @@ struct NavView: View {
                     Image("logo").resizable().frame(width: 32, height: 32)
                         .cornerRadius(100)
                     if pwaManager.display == .minimal {
-                        NavButton(action: { swc?.goBack() }, children: Image("arrow_left"), clearBackGround: true).disabled(!(swc?.canGoBack ?? false))
-                        NavButton(action: { swc?.goForward() }, children: Image("arrow_right"), clearBackGround: true).disabled(!(swc?.canGoBack ?? false))
-                        NavButton(action: { swc?.reload() }, children: Image("refresh"), clearBackGround: true)
+                        NavButton(
+                            action: { self.goBack()
+                            },
+                            children: Image("arrow_left"),
+                            clearBackGround: true)
+                        .disabled(!(self.canGoBack))
+                        NavButton(
+                            action: { self.goForward()
+                            },
+                            children: Image("arrow_right"),
+                            clearBackGround: true)
+                        .disabled(!(self.canGoBack))
+                        NavButton(action: { self.reload() }, children: Image("refresh"), clearBackGround: true)
                         NavDivider()
                     }
                     NavButton(action: { print("click"); withAnimation(.easeInOut(duration: 0.5)) { showNav = 1.0; showEnter = 0 } }, children: Image("more"), clearBackGround: true)
@@ -49,12 +153,20 @@ struct NavView: View {
             .opacity(showEnter)
             HStack(spacing: 14) {
                 if pwaManager.display == .minimal {
-                    NavButton(action: { swc?.goBack() }, children: Image("arrow_left")).disabled(!(swc?.canGoBack ?? false))
-                    NavButton(action: { swc?.goForward() }, children: Image("arrow_right")).disabled(!(swc?.canGoBack ?? false))
-                    NavButton(action: { swc?.reload() }, children: Image("refresh"))
+                    NavButton(
+                        action: { self.goBack()
+                        },
+                        children: Image("arrow_left"))
+                    .disabled(!(self.canGoBack))
+                    NavButton(
+                        action: { self.goForward()
+                        },
+                        children: Image("arrow_right"))
+                    .disabled(!(self.canGoBack))
+                    NavButton(action: { self.reload() }, children: Image("refresh"))
                     NavDivider()
                 }
-                NavButton(action: { swc?.navigateToURL(url: URL(string: pwaManager.start_url)!) }, children: Image("home"))
+                NavButton(action: { self.navigateToURL(url: URL(string: pwaManager.start_url)!) }, children: Image("home"))
                 NavButton(action: { withAnimation(.easeInOut(duration: 0.5)) { showUrl = 1; showNav = 0 } }, children: Image("link"))
                 NavButton(action: { showNav = 0; showEnter = 1 }, children: Image("back"))
             }
@@ -70,7 +182,11 @@ struct NavView: View {
                 }
             }
             HStack(spacing: 6) {
-                Text(navInfo.url.count > 0 ? navInfo.url : (swc?.getURL()?.absoluteString ?? ""))
+                Text(
+                    url.count > 0 ? url : (
+                        self.getURL()?.absoluteString ?? ""
+                    )
+                )
                     .lineLimit(1)
                     .textSelection(.enabled)
                     .padding(12)
@@ -80,18 +196,29 @@ struct NavView: View {
                     .background(.black)
                     .cornerRadius(100)
                 NavButton(action: {
-                    UIPasteboard.general.string = swc?.getURL()?.absoluteString ?? ""
+                    UIPasteboard.general.string = self.getURL()?.absoluteString ?? ""
                     showCopyTip = true
                     DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
                         showCopyTip = false
                     }
                     withAnimation(.easeInOut(duration: 0.5)) { showUrl = 0; showNav = 1 }
                 }, children: Image("copy"))
-                NavButton(action: {
+                NavButton(
+action: {
                     print("open browser")
-                    UIApplication.shared.open(URL(string: navInfo.url.count > 0 ? navInfo.url : (swc?.getURL()?.absoluteString ?? ""))!, options: [:], completionHandler: nil)
+                    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"))
+                },
+ children: Image("browser"))
                 NavButton(action: { withAnimation(.easeInOut(duration: 0.5)) { showUrl = 0; showNav = 1 } }, children: Image("close"))
             }
             .popover(isPresented: $showCopyTip) {
@@ -105,6 +232,11 @@ struct NavView: View {
             .cornerRadius(100)
             .opacity(showUrl)
         }
+        .onAppear(){
+            model?.addStateListener(.didFinishLoad){
+                self.checkButtonState()
+            }
+        }
     }
 
     private func startTimer() {
@@ -128,63 +260,3 @@ struct NavView: View {
         timer = nil
     }
 }
-
-struct NavButtonStyle: ButtonStyle {
-    func makeBody(configuration: Configuration) -> some View {
-        configuration.label
-            .background(Color.clear)
-    }
-}
-
-struct NavButton: View {
-    var action: () -> Void
-    var children: Image
-    var size: CGFloat = 44
-    var padding: CGFloat = 10
-    var clearBackGround: Bool = true
-    var body: some View {
-        if clearBackGround {
-            Button(action: action, label: {
-                ZStack {
-                    Circle()
-                        .fill(Color.white.opacity(0))
-                        .frame(width: size, height: size)
-                        .overlay(
-                            children.resizable().frame(width: size - padding * 2, height: size - padding * 2)
-                        )
-                        .contentShape(Circle())
-                }
-            }).buttonStyle(NavButtonStyle()).frame(width: size, height: size).hoverEffect(.highlight)
-        } else {
-            Button(action: action, label: {
-                Circle()
-                    .fill(Color.white.opacity(0))
-                    .frame(width: size, height: size)
-                    .overlay(
-                        children.resizable().frame(width: size - padding * 2, height: size - padding * 2)
-                    )
-                    .contentShape(Circle())
-            }).hoverEffect(.highlight)
-        }
-    }
-}
-
-struct NavDivider: View {
-    var width: CGFloat = 1
-    var height: CGFloat = 16
-    var paddingLR: CGFloat = 4
-    var paddingTB: CGFloat = 12
-    var body: some View {
-        VStack {
-            Rectangle().fill(Color(hex: "#FFFFFF3D")).frame(width: width, height: height)
-        }
-        .padding([.top, .bottom], paddingTB)
-        .padding([.leading, .trailing], paddingLR)
-    }
-}
-
-// struct NavView_Previews: PreviewProvider {
-//    static var previews: some View {
-//        NavView()
-//    }
-// }