@webspatial/platform-visionos 1.0.4 → 1.0.5

package/web-spatial/views/SpatialWebViewUI.swift

@@ -1,179 +0,0 @@
-import RealityKit
-import SwiftUI
-
-// Using scrollview has some side effects so only use it on elements we want to clip the edges of
-// Seems only scrollview has this clipping property so far on visionOS otherwise we would use ZStack
-struct OptionalClip<Content: View>: View {
-    var clipEnabled = true
-    let viewBuilder: () -> Content
-
-    var body: some View {
-        if clipEnabled {
-            ScrollView {
-                viewBuilder()
-            }.offset(z: CGFloat(0)).frame(maxWidth: .infinity, maxHeight: .infinity).scrollDisabled(true)
-        } else {
-            viewBuilder()
-        }
-    }
-}
-
-// zIndex() have some bug, so use zOrderBias to simulate zIndex effect
-let zOrderBias = 0.001
-
-struct SpatialWebViewUI: View {
-    @Environment(SpatialEntity.self) var ent: SpatialEntity
-    var body: some View {
-        if let wv = ent.getComponent(SpatialWindowComponent.self) {
-            let parentYOffset = Float(wv.scrollOffset.y)
-
-            let childEntities = ent.getEntities()
-            // Display child entities of the webview
-            ZStack {
-                OptionalClip(clipEnabled: ent.coordinateSpace != .ROOT && wv.isScrollEnabled()) {
-                    ZStack {
-                        ForEach(Array(childEntities.keys), id: \.self) { key in
-                            if let e = childEntities[key] {
-                                let _ = e.forceUpdate ? 0 : 0
-                                if let childWindowcomponent = e.getComponent(SpatialWindowComponent.self) {
-                                    if e.coordinateSpace == .DOM {
-                                        let view = childWindowcomponent
-                                        let x = CGFloat(e.modelEntity.position.x)
-                                        let y = CGFloat(e.modelEntity.position.y - (view.scrollWithParent ? parentYOffset : 0))
-                                        let z = CGFloat(e.modelEntity.position.z) + (e.zIndex * zOrderBias)
-                                        let width = CGFloat(view.resolutionX)
-                                        let height = CGFloat(view.resolutionY)
-                                        let anchor = view.rotationAnchor
-
-                                        // Matrix = MTranslate X MRotate X MScale
-                                        SpatialWebViewUI().environment(e)
-                                            .frame(width: width, height: height)
-                                            // use .offset(smallVal) to workaround for glassEffect not working and small width/height spatialDiv not working
-                                            .offset(z: 0.0001)
-                                            .scaleEffect(
-                                                x: CGFloat(e.modelEntity.scale.x),
-                                                y: CGFloat(e.modelEntity.scale.y),
-                                                z: CGFloat(e.modelEntity.scale.z),
-                                                anchor: anchor
-                                            )
-                                            .rotation3DEffect(
-                                                Rotation3D(simd_quatf(
-                                                    ix: e.modelEntity.orientation.vector.x,
-                                                    iy: e.modelEntity.orientation.vector.y,
-                                                    iz: e.modelEntity.orientation.vector.z,
-                                                    r: e.modelEntity.orientation.vector.w
-                                                )),
-                                                anchor: anchor
-                                            )
-
-                                            .position(x: x, y: y)
-                                            .offset(z: z)
-                                            .gesture(
-                                                DragGesture()
-                                                    .onChanged { gesture in
-                                                        let scrollEnabled = view.isScrollEnabled()
-                                                        if !scrollEnabled {
-                                                            // Check if there is a nearest scroll-enabled SpatialWindowComponent in the current SpatialEntity
-                                                            // and scroll it if it exists
-                                                            if let targetScrollWV = wv.findNearestScrollEnabledSpatialWindowComponent() {
-                                                                if !view.dragStarted {
-                                                                    view.dragStarted = true
-                                                                    view.dragStart = (gesture.translation.height)
-                                                                }
-
-                                                                // TODO: this should have velocity
-                                                                let delta = view.dragStart - gesture.translation.height
-                                                                view.dragStart = gesture.translation.height
-                                                                targetScrollWV.updateScrollOffset(delta: delta)
-                                                            }
-                                                        }
-                                                    }
-                                                    .onEnded { _ in
-                                                        let scrollEnabled = view.isScrollEnabled()
-                                                        if !scrollEnabled {
-                                                            if let targetScrollWV = wv.findNearestScrollEnabledSpatialWindowComponent() {
-                                                                view.dragStarted = false
-                                                                view.dragStart = 0
-                                                                targetScrollWV.stopScrolling()
-                                                            }
-                                                        }
-                                                    }
-                                            )
-                                    }
-                                }
-                            }
-                        }
-
-                        // Model3D content
-                        ForEach(Array(childEntities.keys), id: \.self) { key in
-                            if let e = childEntities[key] {
-                                let _ = e.forceUpdate ? 0 : 0
-                                SpatialModel3DView(parentYOffset: parentYOffset)
-                                    .environment(e)
-                            }
-                        }
-
-                        // SpatialView content
-                        ForEach(Array(childEntities.keys), id: \.self) { key in
-                            if let e = childEntities[key] {
-                                if e.coordinateSpace == .DOM {
-                                    if let viewComponent = e.getComponent(SpatialViewComponent.self) {
-                                        let _ = e.forceUpdate ? 0 : 0
-                                        let x = CGFloat(e.modelEntity.position.x)
-                                        let y = CGFloat(e.modelEntity.position.y - parentYOffset)
-                                        let z = CGFloat(e.modelEntity.position.z)
-
-                                        let width = CGFloat(viewComponent.resolutionX)
-                                        let height = CGFloat(viewComponent.resolutionY)
-
-                                        SpatialViewUI().environment(e).frame(width: width, height: height).scaleEffect(
-                                            x: CGFloat(e.modelEntity.scale.x),
-                                            y: CGFloat(e.modelEntity.scale.y),
-                                            z: CGFloat(e.modelEntity.scale.z)
-                                        )
-                                        .rotation3DEffect(
-                                            Rotation3D(simd_quatf(
-                                                ix: e.modelEntity.orientation.vector.x,
-                                                iy: e.modelEntity.orientation.vector.y,
-                                                iz: e.modelEntity.orientation.vector.z,
-                                                r: e.modelEntity.orientation.vector.w
-                                            ))
-                                        ).position(x: x, y: y)
-                                        .offset(z: z)
-                                    }
-                                }
-                            }
-                        }
-                    }.frame(maxWidth: .infinity, maxHeight: .infinity).frame(maxDepth: 0, alignment: .back).offset(z: 0)
-                }
-
-                // Display the main webview
-                if wv.didFailLoad {
-                    VStack {
-                        Text("Failed to load webpage. Is the server running?")
-                            .foregroundColor(.white)
-                        Button("Reload") {
-                            if let url = wv.getURL() {
-                                wv.navigateToURL(url: url)
-                            } else {
-                                logger.warning("Unable to reload URL")
-                            }
-                        }
-                        .foregroundColor(.white)
-                    }
-                    .frame(maxWidth: .infinity, maxHeight: .infinity).glassBackgroundEffect()
-
-                } else {
-                    wv.getView()
-                        .materialWithBorderCorner(
-                            wv.backgroundMaterial,
-                            wv.cornerRadius
-                        )
-                        .frame(maxWidth: .infinity, maxHeight: .infinity)
-                }
-            }
-            .opacity(wv.opacity)
-            .hidden(!ent.visible)
-        }
-    }
-}

package/web-spatial/views/VolumetricWindowContainerView.swift

@@ -1,30 +0,0 @@
-import typealias RealityKit.Attachment
-import typealias RealityKit.Entity
-import typealias RealityKit.MeshResource
-import typealias RealityKit.Model3D
-import typealias RealityKit.ModelEntity
-import typealias RealityKit.RealityView
-import typealias RealityKit.SimpleMaterial
-import SwiftUI
-
-struct VolumetricWindowContainerView: View {
-    @Environment(SpatialWindowContainer.self) var windowContainerContent: SpatialWindowContainer
-
-    var body: some View {
-        OpenDismissHandlerUI().environment(windowContainerContent).onDisappear {
-            // Don't destroy immersive space content as it is reused next time its opened
-            if windowContainerContent.id != SpatialWindowContainer.ImmersiveID {
-                windowContainerContent.destroy()
-            }
-        }
-
-        let entities = windowContainerContent.getEntities().filter { _, entity in
-            entity.coordinateSpace == .ROOT && entity.hasComponent(SpatialViewComponent.self)
-        }
-
-        ForEach(Array(entities.keys), id: \.self) { key in
-            let entity = entities[key]!
-            SpatialViewUI(isRoot: true).environment(entity)
-        }
-    }
-}

package/web-spatial/web_spatialApp.swift

@@ -1,141 +0,0 @@
-import typealias RealityKit.Attachment
-import typealias RealityKit.Entity
-import typealias RealityKit.MeshResource
-import typealias RealityKit.Model3D
-import typealias RealityKit.ModelEntity
-import typealias RealityKit.RealityView
-import typealias RealityKit.SimpleMaterial
-import SwiftUI
-
-let clock = PerfClock()
-let logger = Logger()
-
-// To load a local path, remove http:// eg.  "static-web/"
-let nativeAPIVersion = pwaManager.getVersion()
-
-// start URL
-let startURL = pwaManager.start_url
-
-// detect when app properties like defaultSize change so we can avoid race condition of setting default values and then opening window container
-var sceneStateChangedCB: ((Any) -> Void) = { _ in
-}
-
-@main
-struct web_spatialApp: App {
-    @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
-    @State var initialLaunch = true
-
-    @ObservedObject var wgm = WindowContainerMgr.Instance
-
-    @Environment(\.scenePhase) private var scenePhase
-
-    init() {
-        logger.debug("WebSpatial App Started -------- rootURL: " + startURL)
-
-        // init global logger
-        Logger.initLogger()
-
-        // init pwa manager
-        pwaManager._init()
-
-        // create Immersive SpatialWindowContainer
-        let _ = SpatialWindowContainer.createImmersiveWindowContainer()
-    }
-
-    func getFileUrl() -> URL {
-        return URL(string: pwaManager.start_url)!
-    }
-
-    func getDefaultSize() -> CGSize {
-        sceneStateChangedCB("")
-        return wgm.getValue().defaultSize!
-    }
-
-    var body: some Scene {
-        WindowGroup(id: "Plain", for: WindowContainerData.self) { $windowData in
-            let wg = SpatialWindowContainer.getOrCreateSpatialWindowContainer(
-                windowData.windowContainerID, windowData
-            )
-            PlainWindowContainerView().environment(wg)
-            // https://stackoverflow.com/questions/78567737/how-to-get-initial-windowgroup-to-reopen-on-launch-visionos
-//                    .handlesExternalEvents(preferring: [], allowing: [])
-        }
-        defaultValue: {
-            let windowData = WindowContainerData(
-                windowStyle: "Plain",
-                windowContainerID: SpatialWindowContainer.getRootID()
-            )
-
-            // Initialize entity and webview for deafult value
-            let fileUrl = getFileUrl()
-            let wc = SpatialWindowContainer.getOrCreateSpatialWindowContainer(
-                windowData.windowContainerID, windowData
-            )!
-            let rootEntity = SpatialEntity()
-            rootEntity.coordinateSpace = CoordinateSpaceMode.ROOT
-            let windowComponent = SpatialWindowComponent(parentWindowContainerID: wc.id, url: fileUrl)
-            rootEntity.addComponent(windowComponent)
-            rootEntity.setParentWindowContainer(wg: wc)
-            return windowData
-        }
-        .windowStyle(.plain).onChange(of: scenePhase) {
-            oldPhase,
-                newPhase in
-            if oldPhase == .background && newPhase == .inactive {
-                if initialLaunch {
-                    // App initial open
-                    initialLaunch = false
-                } else {
-                    // App reopened
-
-                    let fileUrl = getFileUrl()
-                    if let awid = SpatialWindowContainer.firstActivePlainWindowContainerId,
-                       let wc = SpatialWindowContainer.getSpatialWindowContainer(
-                           awid
-                       )
-                    {
-                        let rootEntity = wc.getEntities().filter {
-                            $0.value.getComponent(SpatialWindowComponent.self) != nil && $0.value.coordinateSpace == .ROOT
-                        }.first?.value
-
-                        if let wv = rootEntity?.getComponent(SpatialWindowComponent.self) {
-                            // remove the webview's name to behave like new opened root scene
-                            if wv.getURL() != fileUrl {
-                                wv.removeWebviewName {
-                                    wv.navigateToURL(url: fileUrl)
-                                }
-                            }
-                        }
-                        // reset to mainScene size
-                        wgm.setToMainSceneCfg()
-                        if let resizeRange = wgm.getValue().resizeRange {
-                            wc.setResizeRange.send(resizeRange)
-                        }
-                        wc.setSize.send(getDefaultSize())
-                    }
-                }
-            }
-
-        }.defaultSize(
-            getDefaultSize()
-        ).windowResizability(
-            wgm.getValue().windowResizability!
-        )
-
-        WindowGroup(id: "Volumetric", for: WindowContainerData.self) { $windowData in
-            let wg = SpatialWindowContainer.getOrCreateSpatialWindowContainer(windowData!.windowContainerID, windowData!)
-            VolumetricWindowContainerView().environment(wg).handlesExternalEvents(preferring: [], allowing: [])
-
-        }.windowStyle(.volumetric).defaultSize(width: 1, height: 1, depth: 1, in: .meters)
-
-        ImmersiveSpace(id: "ImmersiveSpace") {
-            if let wg = SpatialWindowContainer.getImmersiveWindowContainer() {
-                VolumetricWindowContainerView().environment(wg).handlesExternalEvents(preferring: [], allowing: [])
-            }
-        }
-
-        WindowGroup(id: "loading") {
-            LoadingView()
-        }
-    }
-}