first round of beta fixes

tracyhenry-visionOS · Sep 4, 2023 · f83ccad · f83ccad
1 parent 2eaf64a
commit f83ccad
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 43 deletions.
diff --git a/GenerativeWallArt/ImmersiveView.swift b/GenerativeWallArt/ImmersiveView.swift
@@ -102,45 +102,46 @@ struct ImmersiveView: View {
         }
         update: { _, _ in
         } attachments: {
-            VStack {
-                Text(inputText)
-                    .frame(maxWidth: 600, alignment: .leading)
-                    .font(.extraLargeTitle2)
-                    .fontWeight(.regular)
-                    .padding(40)
-                    .glassBackgroundEffect()
-                if showAttachmentButtons {
-                    HStack(spacing: 20) {
-                        Button(action: {
-                            tapSubject.send()
-                        }) {
-                            Text("Yes, let's go!")
-                                .font(.largeTitle)
-                                .fontWeight(.regular)
-                                .padding()
-                                .cornerRadius(8)
+            Attachment(id: "red_e") {
+                VStack {
+                    Text(inputText)
+                        .frame(maxWidth: 600, alignment: .leading)
+                        .font(.extraLargeTitle2)
+                        .fontWeight(.regular)
+                        .padding(40)
+                        .glassBackgroundEffect()
+                    if showAttachmentButtons {
+                        HStack(spacing: 20) {
+                            Button(action: {
+                                tapSubject.send()
+                            }) {
+                                Text("Yes, let's go!")
+                                    .font(.largeTitle)
+                                    .fontWeight(.regular)
+                                    .padding()
+                                    .cornerRadius(8)
+                            }
+                            .padding()
+                            .buttonStyle(.bordered)
+
+                            Button(action: {
+                                // Action for No button
+                            }) {
+                                Text("No")
+                                    .font(.largeTitle)
+                                    .fontWeight(.regular)
+                                    .padding()
+                                    .cornerRadius(8)
+                            }
+                            .padding()
+                            .buttonStyle(.bordered)
                         }
-                        .padding()
-                        .buttonStyle(.bordered)
-
-                        Button(action: {
-                            // Action for No button
-                        }) {
-                            Text("No")
-                                .font(.largeTitle)
-                                .fontWeight(.regular)
-                                .padding()
-                                .cornerRadius(8)
-                        }
-                        .padding()
-                        .buttonStyle(.bordered)
+                        .glassBackgroundEffect()
+                        .opacity(showAttachmentButtons ? 1 : 0)
                     }
-                    .glassBackgroundEffect()
-                    .opacity(showAttachmentButtons ? 1 : 0)
                 }
+                .opacity(showTextField ? 1 : 0)
             }
-            .tag("red_e")
-            .opacity(showTextField ? 1 : 0)
         }
         .gesture(SpatialTapGesture().targetedToAnyEntity().onEnded {
             _ in

diff --git a/GenerativeWallArt/ImpactParticleSystem.swift b/GenerativeWallArt/ImpactParticleSystem.swift
@@ -15,14 +15,14 @@ struct ImpactParticleSystem: System {
 
     func update(context: SceneUpdateContext) {
         // get projectile
-        var iter = context.entities(matching: Self.projectileQuery, when: .rendering).makeIterator()
+        var iter = context.entities(matching: Self.projectileQuery, updatingSystemWhen: .rendering).makeIterator()
         guard let projectile = iter.next() else { return }
         guard var projectileComponent = projectile.components[ProjectileComponent.self] else { return }
 
         // if it's time for a burst
         if !projectileComponent.bursted && projectileComponent.canBurst {
             // look for impact particles using the particle query
-            for p in context.entities(matching: Self.particleQuery, when: .rendering) {
+            for p in context.entities(matching: Self.particleQuery, updatingSystemWhen: .rendering) {
                 if p.name == "ImpactParticle" {
                     p.components[ParticleEmitterComponent.self]?.burst()
                 }

diff --git a/Packages/RealityKitContent/Sources/RealityKitContent/BillboardSystem.swift b/Packages/RealityKitContent/Sources/RealityKitContent/BillboardSystem.swift
@@ -36,9 +36,9 @@ public struct BillboardSystem: System {
         let entities = context.scene.performQuery(Self.query).map({ $0 })
 
         guard !entities.isEmpty,
-                let pose = worldTrackingProvider.queryPose(atTimestamp: CACurrentMediaTime()) else { return }
+                let pose = worldTrackingProvider.queryDeviceAnchor(atTimestamp: CACurrentMediaTime()) else { return }
 
-        let cameraTransform = Transform(matrix: pose.originFromDeviceTransform)
+        let cameraTransform = Transform(matrix: pose.originFromAnchorTransform)
         for entity in entities {
 
             let translation = entity.transform.translation
@@ -67,10 +67,11 @@ public struct BillboardSystem: System {
             content.add(entity)
         }
     } attachments: {
-        Text("Preview")
-            .font(.system(size: 100))
-            .background(.pink)
-            .tag("previewTag")
+        Attachment(id: "previewTag") {
+            Text("Preview")
+                .font(.system(size: 100))
+                .background(.pink)
+        }
     }
     .previewLayout(.sizeThatFits)
 }