@webspatial/platform-visionos 1.6.1 → 2.0.0

package/web-spatial/view/SpatializedStatic3DView.swift

@@ -2,28 +2,31 @@ import RealityKit
 import SwiftUI
 
 struct SpatializedStatic3DView: View {
-    @Environment(SpatializedElement.self) var spatializedElement: SpatializedElement
+    @Bindable var spatializedStatic3DElement: SpatializedStatic3DElement
     @Environment(SpatialScene.self) var spatialScene: SpatialScene
 
-    @State private var asset: Model3DAsset?
-    @State private var source: String?
-    @State private var isLoading = false
+    @State private var loadState: LoadState = .idle
 
-    private var spatializedStatic3DElement: SpatializedStatic3DElement {
-        return spatializedElement as! SpatializedStatic3DElement
+    private var asset: Model3DAsset? {
+        if case let .loaded(asset, _) = loadState { return asset }
+        return nil
     }
 
     func onLoadSuccess(src: String) {
-        spatialScene.sendWebMsg(spatializedElement.id, ModelLoadSuccess(src: src))
+        spatialScene.sendWebMsg(spatializedStatic3DElement.id, ModelLoadSuccess(src: src))
     }
 
     func onLoadFailure() {
-        spatialScene.sendWebMsg(spatializedElement.id, ModelLoadFailure())
+        spatialScene.sendWebMsg(spatializedStatic3DElement.id, ModelLoadFailure())
+    }
+
+    private func onOrbit(_ transform: AffineTransform3D) {
+        spatialScene.sendWebMsg(spatializedStatic3DElement.id, EntityTransformChangeEvent(transform))
     }
 
     var body: some View {
-        let depth = spatializedElement.depth
-        let transform = spatializedStatic3DElement.modelTransform
+        let depth = spatializedStatic3DElement.depth
+        let transform = spatializedStatic3DElement.entityTransform
         let translation = transform.translation
         let scale = transform.scale
         let rotation = transform.rotation!
@@ -31,38 +34,33 @@ struct SpatializedStatic3DView: View {
         let y = translation.y
         let z = translation.z
 
-        let enableGesture = spatializedElement.enableGesture
-        if !spatializedStatic3DElement.allSources.isEmpty {
+        let enableGesture = spatializedStatic3DElement.enableGesture
+        if spatializedStatic3DElement.loading == .eager {
             Group {
-                if isLoading {
-                    ProgressView()
-                } else if let asset, let source {
+                switch loadState {
+                case .idle, .loading:
+                    posterView { ProgressView() }
+                case let .loaded(asset, _):
                     Model3D(asset: asset) { resolvedModel3D in
                         resolvedModel3D
                             .resizable(true)
-                            .aspectRatio(
-                                nil,
-                                contentMode: .fit
-                            )
+                            .aspectRatio(nil, contentMode: .fit)
                             .if(!depth.isZero) { view in view.scaledToFit3D() }
-                            .onAppear {
-                                self.onLoadSuccess(src: source)
-                            }
                             .if(enableGesture) { view in view.hoverEffect() }
                     }
-                } else {
-                    Text("").onAppear {
-                        self.onLoadFailure()
+                case .failed:
+                    posterView {
+                        // Transparent view is required so that lifecycle modifiers like .task still work
+                        Color.clear
                     }
                 }
             }
-            .scaleEffect(
-                x: scale.width,
-                y: scale.height,
-                z: scale.depth
-            )
-            .rotation3DEffect(
-                rotation
+            .scaleEffect(scale)
+            .rotation3DEffect(rotation)
+            .orbit(
+                enabled: spatializedStatic3DElement.stagemode == .orbit && asset != nil,
+                entityTransform: $spatializedStatic3DElement.entityTransform,
+                onChange: onOrbit
             )
             .offset(x: x, y: y)
             .offset(z: z)
@@ -81,13 +79,38 @@ struct SpatializedStatic3DView: View {
                 }
             }
             .onChange(of: spatializedStatic3DElement.animationPaused) { onPlayback(isPaused: $1) }
-            .onChange(of: spatializedStatic3DElement.playbackRate) { asset?.animationPlaybackController?.speed = Float($1) }
+            .onChange(of: spatializedStatic3DElement.playbackRate) {
+                asset?.animationPlaybackController?.speed = spatializedStatic3DElement.animationPaused ? 0 : Float($1)
+            }
+            .onChange(of: spatializedStatic3DElement.pendingSeekTime) { _, time in onSeek(time: time) }
             .task(id: spatializedStatic3DElement.allSources) { await loadSources() }
         } else {
             EmptyView()
         }
     }
 
+    /// Renders the poster image while the 3D model is loading or after all
+    /// sources fail. When no poster URL is provided, or the poster itself is
+    /// still loading/failed, the supplied `fallback` view is shown instead.
+    @ViewBuilder
+    private func posterView<Fallback: View>(
+        @ViewBuilder fallback: @escaping () -> Fallback
+    ) -> some View {
+        if let posterURL = spatializedStatic3DElement.posterURL,
+           let url = localOrRemoteURL(url: posterURL)
+        {
+            AsyncImage(url: url) { phase in
+                if case let .success(image) = phase {
+                    image.resizable().aspectRatio(contentMode: .fit)
+                } else {
+                    fallback()
+                }
+            }
+        } else {
+            fallback()
+        }
+    }
+
     /// Plays or pauses the model animation and sends an animation state to the web code
     private func onPlayback(isPaused: Bool) {
         guard let asset else {
@@ -100,13 +123,41 @@ struct SpatializedStatic3DView: View {
             asset.selectedAnimation = asset.availableAnimations.first
         }
         let controller = asset.animationPlaybackController
-        controller?.speed = Float(spatializedStatic3DElement.playbackRate)
+        controller?.speed = isPaused ? 0 : Float(spatializedStatic3DElement.playbackRate)
+        if let time = spatializedStatic3DElement.pendingSeekTime, let controller {
+            controller.time = time
+            spatializedStatic3DElement.pendingSeekTime = nil
+        }
         isPaused ? controller?.pause() : controller?.resume()
+        sendAnimationStateChange(isPaused: isPaused)
+    }
+
+    /// Seeks the underlying animation controller when a non-nil `time` is
+    /// requested, then clears `pendingSeekTime` so subsequent identical
+    /// requests still trigger a fresh seek.
+    private func onSeek(time: Double?) {
+        guard let controller = asset?.animationPlaybackController, let time else { return }
+        controller.time = time
+        spatializedStatic3DElement.pendingSeekTime = nil
+        sendAnimationStateChange(isPaused: spatializedStatic3DElement.animationPaused)
+    }
+
+    /// Emits the current animation state to the web layer, sampling the
+    /// controller's position and the wall clock together so the web side can
+    /// extrapolate between samples.
+    private func sendAnimationStateChange(isPaused: Bool) {
+        let controller = asset?.animationPlaybackController
         let duration = controller?.duration ?? 0
+        let currentTime = controller?.time ?? 0
         spatialScene.sendWebMsg(
-            spatializedElement.id,
+            spatializedStatic3DElement.id,
             AnimationStateChangeEvent(
-                detail: AnimationStateChangeDetail(paused: isPaused, duration: duration)
+                detail: AnimationStateChangeDetail(
+                    paused: isPaused,
+                    duration: duration,
+                    currentTime: currentTime,
+                    timestamp: Date().timeIntervalSince1970 * 1000
+                )
             )
         )
     }
@@ -127,18 +178,21 @@ struct SpatializedStatic3DView: View {
     }
 
     private func loadSources() async {
-        isLoading = true
+        loadState = .loading
         let result = await loadSources(spatializedStatic3DElement.allSources)
-        asset = result?.asset
-        source = result?.url.absoluteString
-        if spatializedStatic3DElement.autoplay {
+        guard !Task.isCancelled else { return }
+        if let result {
+            loadState = .loaded(result.asset, result.url.absoluteString)
+            onLoadSuccess(src: result.url.absoluteString)
             // If animationPaused didn't change then SwiftUI will not trigger onChange so manually trigger playback
             // This happens when play is called before load and autoplay is enabled
-            if spatializedStatic3DElement.animationPaused {
+            if spatializedStatic3DElement.autoplay, spatializedStatic3DElement.animationPaused {
                 spatializedStatic3DElement.animationPaused = false
-            } else { onPlayback(isPaused: false) }
+            } else { onPlayback(isPaused: !spatializedStatic3DElement.autoplay) }
+        } else {
+            loadState = .failed
+            onLoadFailure()
         }
-        isLoading = false
     }
 
     /// Attempts to load from each source in order, returning the first success.
@@ -158,3 +212,10 @@ struct SpatializedStatic3DView: View {
 private func localOrRemoteURL(url: String) -> URL? {
     URL(string: url.hasPrefix("file://") ? pwaManager.getLocalResourceURL(url: url) : url)
 }
+
+private enum LoadState {
+    case idle
+    case loading
+    case loaded(Model3DAsset, String)
+    case failed
+}

package/web-spatial/view/view-modifier/OrbitModifier.swift

@@ -0,0 +1,84 @@
+import SwiftUI
+
+private let degreesPerPoint = 0.5
+private let pitchLimitDegrees = 100.0
+private let springBack = Animation.spring(response: 0.45, dampingFraction: 0.7)
+
+/// Adds an orbital camera-style rotation gesture to a 3D model.
+///
+/// Both horizontal yaw (around the Y-axis) and vertical pitch (around the
+/// X-axis, clamped to ±100° so the model can't flip past upright) are folded
+/// directly into the bound `entityTransform` on each drag tick, so the web
+/// layer always observes an accurate transform. On release, the pitch
+/// elastically springs back to 0: the data is set to the unpitched final state
+/// immediately while SwiftUI animates the existing `.rotation3DEffect` from the
+/// old (pitched) rotation to the new (unpitched) rotation for a smooth visual.
+struct OrbitModifier: ViewModifier {
+    let enabled: Bool
+    @Binding var entityTransform: AffineTransform3D
+    let onChange: (AffineTransform3D) -> Void
+
+    @State private var dragStartTransform: AffineTransform3D?
+    @State private var dragYawDegrees: Double = 0
+
+    func body(content: Content) -> some View {
+        content
+            .simultaneousGesture(enabled ? orbitGesture : nil)
+            .onChange(of: enabled) { _, isEnabled in
+                if !isEnabled { releaseElastic() }
+            }
+    }
+
+    private var orbitGesture: some Gesture {
+        DragGesture(minimumDistance: 0)
+            .onChanged { value in
+                let base = dragStartTransform ?? entityTransform
+                if dragStartTransform == nil { dragStartTransform = base }
+
+                dragYawDegrees = Double(value.translation.width) * degreesPerPoint
+                let pitchTarget = Double(-value.translation.height) * degreesPerPoint
+                let pitchDegrees = max(-pitchLimitDegrees, min(pitchLimitDegrees, pitchTarget))
+
+                let new = compose(base: base, yawDegrees: dragYawDegrees, pitchDegrees: pitchDegrees)
+                entityTransform = new
+                onChange(new)
+            }
+            .onEnded { _ in releaseElastic() }
+    }
+
+    private func releaseElastic() {
+        guard let base = dragStartTransform else { return }
+        let unpitched = compose(base: base, yawDegrees: dragYawDegrees, pitchDegrees: 0)
+        withAnimation(springBack) { entityTransform = unpitched }
+        onChange(unpitched)
+        dragStartTransform = nil
+        dragYawDegrees = 0
+    }
+
+    private func compose(
+        base: AffineTransform3D,
+        yawDegrees: Double,
+        pitchDegrees: Double
+    ) -> AffineTransform3D {
+        let translation = AffineTransform3D(translation: base.translation)
+        let yaw = AffineTransform3D(rotation: Rotation3D(angle: .degrees(yawDegrees), axis: .y))
+        let pitch = AffineTransform3D(rotation: Rotation3D(angle: .degrees(pitchDegrees), axis: .x))
+        let baseRotation = AffineTransform3D(rotation: base.rotation ?? .identity)
+        let scale = AffineTransform3D(scale: base.scale)
+        return translation
+            .concatenating(yaw)
+            .concatenating(pitch)
+            .concatenating(baseRotation)
+            .concatenating(scale)
+    }
+}
+
+extension View {
+    func orbit(
+        enabled: Bool,
+        entityTransform: Binding<AffineTransform3D>,
+        onChange: @escaping (AffineTransform3D) -> Void
+    ) -> some View {
+        modifier(OrbitModifier(enabled: enabled, entityTransform: entityTransform, onChange: onChange))
+    }
+}

package/web-spatial/webview/SpatialWebController.swift

@@ -5,6 +5,9 @@ class SpatialWebController: NSObject, WKNavigationDelegate, WKScriptMessageHandl
     weak var model: SpatialWebViewModel?
     var webview: WKWebView?
     private var isObserving = false
+    private var urlObservation: NSKeyValueObservation?
+    private var canGoBackObservation: NSKeyValueObservation?
+    private var canGoForwardObservation: NSKeyValueObservation?
     private var navigationInvoke: ((_ data: URL) -> Bool)?
     private var openWindowInvoke: ((_ data: URL) -> WebViewElementInfo?)?
     private var webviewStateChangeInvoke: ((_ type: SpatialWebViewState) -> Void)?
@@ -205,32 +208,37 @@ class SpatialWebController: NSObject, WKNavigationDelegate, WKScriptMessageHandl
 
     func startObserving() {
         guard !isObserving else { return }
-        webview?.addObserver(self, forKeyPath: #keyPath(WKWebView.url), options: .new, context: nil)
+        urlObservation = webview?.observe(\.url, options: [.new]) { [weak self] webView, _ in
+            guard let self, let url = webView.url?.absoluteString else { return }
+            Task { @MainActor in
+                self.model?.url = url
+                self.webviewStateChangeInvoke?(.didUpdateURL)
+            }
+        }
+        canGoBackObservation = webview?.observe(\.canGoBack, options: [.new]) { [weak self] _, _ in
+            Task { @MainActor in
+                self?.webviewStateChangeInvoke?(.didUpdateNavigationState)
+            }
+        }
+        canGoForwardObservation = webview?.observe(\.canGoForward, options: [.new]) { [weak self] _, _ in
+            Task { @MainActor in
+                self?.webviewStateChangeInvoke?(.didUpdateNavigationState)
+            }
+        }
         isObserving = true
     }
 
     func stopObserving() {
         guard isObserving else { return }
-        webview?.removeObserver(self, forKeyPath: #keyPath(WKWebView.url))
+        urlObservation?.invalidate()
+        canGoBackObservation?.invalidate()
+        canGoForwardObservation?.invalidate()
+        urlObservation = nil
+        canGoBackObservation = nil
+        canGoForwardObservation = nil
         isObserving = false
     }
 
-    override func observeValue(
-        forKeyPath keyPath: String?,
-        of object: Any?,
-        change: [NSKeyValueChangeKey: Any]?,
-        context: UnsafeMutableRawPointer?
-    ) {
-        if keyPath == #keyPath(WKWebView.url),
-           let url = (object as? WKWebView)?.url?.absoluteString
-        {
-            DispatchQueue.main.async {
-//                print("url change", url)
-                self.model?.url = url
-            }
-        }
-    }
-
     func destroy() {
         destroyView()
         navigationInvoke = nil

package/web-spatial/webview/SpatialWebViewModel.swift

@@ -10,7 +10,7 @@ class SpatialWebViewModel {
     private var navigationList: [String: (_ data: URL) -> Bool] = [:]
     private var openWindowList: [String: (_ data: URL) -> WebViewElementInfo?] = [:]
     private var stateListeners: [SpatialWebViewState: [() -> Void]] = [:]
-    private var stateChangeListeners: [(_ type: SpatialWebViewState) -> Void] = []
+    private var stateChangeListeners: [(id: UUID, listener: (_ type: SpatialWebViewState) -> Void)] = []
     private var scrollUpdateListeners: [(_ type: ScrollState, _ point: CGPoint) -> Void] = []
     private var backgroundTransparent: Bool = false
 
@@ -150,8 +150,11 @@ class SpatialWebViewModel {
     }
 
     /// webview state event
-    func addStateListener(_ event: @escaping (_ type: SpatialWebViewState) -> Void) {
-        stateChangeListeners.append(event)
+    @discardableResult
+    func addStateListener(_ event: @escaping (_ type: SpatialWebViewState) -> Void) -> UUID {
+        let id = UUID()
+        stateChangeListeners.append((id: id, listener: event))
+        return id
     }
 
     func addStateListener(_ state: SpatialWebViewState, _ event: @escaping () -> Void) {
@@ -161,13 +164,13 @@ class SpatialWebViewModel {
         stateListeners[state]?.append(event)
     }
 
-    func removeStateListener(_ event: @escaping (_ type: String) -> Void) {
+    func removeStateListener(_ id: UUID) {
         stateChangeListeners.removeAll(where: {
-            $0 as AnyObject === event as AnyObject
+            $0.id == id
         })
     }
 
-    func removeStateListener(_ state: SpatialWebViewState, _ event: @escaping (_ object: Any, _ data: Any) -> Void) {
+    func removeStateListener(_ state: SpatialWebViewState, _ event: @escaping () -> Void) {
         stateListeners[state]?.removeAll(where: {
             $0 as AnyObject === event as AnyObject
         })
@@ -235,7 +238,7 @@ class SpatialWebViewModel {
             load()
         }
         for onStateChange in stateChangeListeners {
-            onStateChange(state)
+            onStateChange.listener(state)
         }
         stateListeners[state]?.forEach { onStateChange in
             onStateChange()
@@ -300,6 +303,8 @@ enum SpatialWebViewState: String, CaseIterable {
     case didReceive
     case didFinishLoad
     case didFailLoad
+    case didUpdateURL
+    case didUpdateNavigationState
     case didUnload
     case didClose
     case didMakeView

package/web-spatial.xcodeproj/project.pbxproj

@@ -14,7 +14,8 @@
 		2B06AEE62E4C1AE8000327E9 /* JSBCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B06AEC02E4C1AE8000327E9 /* JSBCommand.swift */; };
 		2B06AEE92E4C1AE8000327E9 /* EventEmitter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B06AEBF2E4C1AE8000327E9 /* EventEmitter.swift */; };
 		2B1008A22F0B000800000002 /* NavigationCleanupTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B1008A12F0B000800000001 /* NavigationCleanupTests.swift */; };
-		2B2F1D692BEBFAAA006897EE /* RealityKitContent in Frameworks */ = {isa = PBXBuildFile; productRef = 2B2F1D682BEBFAAA006897EE /* RealityKitContent */; };
+		2B1008A52F0B000800000005 /* SpatializedElementMotionTimelineSamplerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B1008A42F0B000800000004 /* SpatializedElementMotionTimelineSamplerTests.swift */; };
+		2B1008A72F0B000800000007 /* SpatializedElementAnimationManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B1008A62F0B000800000006 /* SpatializedElementAnimationManagerTests.swift */; };
 		2B2F1D712BEBFAAC006897EE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2B2F1D702BEBFAAC006897EE /* Assets.xcassets */; };
 		2B2F1D742BEBFAAC006897EE /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2B2F1D732BEBFAAC006897EE /* Preview Assets.xcassets */; };
 		2B89E38C2E699104004079AA /* WebMsgCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B89E38B2E699104004079AA /* WebMsgCommand.swift */; };
@@ -39,12 +40,14 @@
 		2B06AEC32E4C1AE8000327E9 /* WebSpatialApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebSpatialApp.swift; sourceTree = "<group>"; };
 		2B06AEC42E4C1AE8000327E9 /* Window.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Window.swift; sourceTree = "<group>"; };
 		2B1008A12F0B000800000001 /* NavigationCleanupTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationCleanupTests.swift; sourceTree = "<group>"; };
+		2B1008A42F0B000800000004 /* SpatializedElementMotionTimelineSamplerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpatializedElementMotionTimelineSamplerTests.swift; sourceTree = "<group>"; };
+		2B1008A62F0B000800000006 /* SpatializedElementAnimationManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpatializedElementAnimationManagerTests.swift; sourceTree = "<group>"; };
 		2B2F1D632BEBFAAA006897EE /* WebSpatial.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WebSpatial.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		2B2F1D672BEBFAAA006897EE /* RealityKitContent */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = RealityKitContent; sourceTree = "<group>"; };
 		2B2F1D702BEBFAAC006897EE /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		2B2F1D732BEBFAAC006897EE /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		2B2F1D752BEBFAAC006897EE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		2B2F1D7A2BEBFAAD006897EE /* WebSpatial.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WebSpatial.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		2B2F1D7A2BEBFAAD006897EE /* WebSpatial.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = WebSpatial.xctest; path = "web-spatialTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2B89E38B2E699104004079AA /* WebMsgCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebMsgCommand.swift; sourceTree = "<group>"; };
 		2BDBF9B52C4ED9F600D269D7 /* static-web */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "static-web"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -64,6 +67,8 @@
 		2B06AF312E4C1AF8000327E9 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
+				dynamic3d/EntityAnimationManager.swift,
+				dynamic3d/EntityAnimationSession.swift,
 				dynamic3d/Geometry.swift,
 				dynamic3d/SpatialComponent.swift,
 				dynamic3d/SpatialEntity.swift,
@@ -72,6 +77,16 @@
 				dynamic3d/SpatialModelResource.swift,
 				dynamic3d/SpatialRootEntity.swift,
 				dynamic3d/SpatialTextureResource.swift,
+				"element-motion/SpatializedElementAnimationCommand.swift",
+				"element-motion/SpatializedElementAnimationManager.swift",
+				"element-motion/SpatializedElementAnimationObject.swift",
+				"element-motion/SpatializedElementAnimationTypes.swift",
+				"element-motion/SpatializedElementAnimationWriteAdapter.swift",
+				"element-motion/SpatializedElementMotionBridgeTypes.swift",
+				"element-motion/SpatializedElementMotionTimelineSampler.swift",
+				"element-motion/SpatializedElementMotionTiming.swift",
+				"element-motion/SpatializedElementMotionTransformTypes.swift",
+				MaterialSceneRefresh.swift,
 				SpatialApp.swift,
 				Spatialized2DElement.swift,
 				SpatializedDynamic3DElement.swift,
@@ -113,6 +128,7 @@
 				SpatialSceneView.swift,
 				"view-modifier/HideViewModifier.swift",
 				"view-modifier/MaterialWithBorderCornerModifier.swift",
+				"view-modifier/OrbitModifier.swift",
 			);
 			target = 2B2F1D622BEBFAAA006897EE /* web-spatial */;
 		};
@@ -142,7 +158,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2B2F1D692BEBFAAA006897EE /* RealityKitContent in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -160,6 +175,8 @@
 			isa = PBXGroup;
 			children = (
 				2B1008A12F0B000800000001 /* NavigationCleanupTests.swift */,
+				2B1008A42F0B000800000004 /* SpatializedElementMotionTimelineSamplerTests.swift */,
+				2B1008A62F0B000800000006 /* SpatializedElementAnimationManagerTests.swift */,
 			);
 			path = "web-spatialTests";
 			sourceTree = "<group>";
@@ -244,7 +261,6 @@
 			);
 			name = "web-spatial";
 			packageProductDependencies = (
-				2B2F1D682BEBFAAA006897EE /* RealityKitContent */,
 			);
 			productName = "web-spatial";
 			productReference = 2B2F1D632BEBFAAA006897EE /* WebSpatial.app */;
@@ -348,6 +364,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				2B1008A22F0B000800000002 /* NavigationCleanupTests.swift in Sources */,
+				2B1008A52F0B000800000005 /* SpatializedElementMotionTimelineSamplerTests.swift in Sources */,
+				2B1008A72F0B000800000007 /* SpatializedElementAnimationManagerTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -544,13 +562,14 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.webspatial.test;
-				PRODUCT_NAME = WebSpatial;
+				PRODUCT_MODULE_NAME = WebSpatialTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "xros xrsimulator";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,7";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/web-spatial.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/web-spatial";
-				XROS_DEPLOYMENT_TARGET = 1.1;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WebSpatial.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/WebSpatial";
+				XROS_DEPLOYMENT_TARGET = 26.0;
 			};
 			name = Debug;
 		};
@@ -563,13 +582,14 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.webspatial.test;
-				PRODUCT_NAME = WebSpatial;
+				PRODUCT_MODULE_NAME = WebSpatialTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "xros xrsimulator";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,7";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/web-spatial.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/web-spatial";
-				XROS_DEPLOYMENT_TARGET = 1.1;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WebSpatial.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/WebSpatial";
+				XROS_DEPLOYMENT_TARGET = 26.0;
 			};
 			name = Release;
 		};
@@ -604,13 +624,6 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
-
-/* Begin XCSwiftPackageProductDependency section */
-		2B2F1D682BEBFAAA006897EE /* RealityKitContent */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = RealityKitContent;
-		};
-/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 2B2F1D5B2BEBFAAA006897EE /* Project object */;
 }

package/web-spatial.xcodeproj/xcshareddata/xcschemes/web-spatial.xcscheme

@@ -36,7 +36,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "2B2F1D792BEBFAAD006897EE"
-               BuildableName = "WebSpatial.xctest"
+               BuildableName = "web-spatialTests.xctest"
                BlueprintName = "web-spatialTests"
                ReferencedContainer = "container:web-spatial.xcodeproj">
             </BuildableReference>

package/web-spatialTests/NavigationCleanupTests.swift

@@ -18,7 +18,8 @@ final class NavigationCleanupTests: XCTestCase {
             id: "test-attachment",
             parentEntityId: "test-parent-entity",
             position: SIMD3<Float>(0, 0, 0),
-            size: CGSize(width: 100, height: 100)
+            size: CGSize(width: 100, height: 100),
+            webViewModel: SpatialWebViewModel(url: "http://localhost:5173/")
         )
         XCTAssertFalse(scene.attachmentManager.attachments.isEmpty)