Support building for iOS 18

liveview-native · Jul 25, 2024 · 403ed16 · 403ed16
1 parent 579423d
commit 403ed16
Show file tree

Hide file tree

Showing 10 changed files with 129 additions and 0 deletions.
diff --git a/Package.swift b/Package.swift
@@ -5,6 +5,7 @@ import PackageDescription
 
 let package = Package(
     name: "LiveViewNativeRealityKit",
+    platforms: [.visionOS(.v1), .iOS("18.0")],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
         .library(

diff --git a/Sources/LiveViewNativeRealityKit/Components/AnchoringComponent.swift b/Sources/LiveViewNativeRealityKit/Components/AnchoringComponent.swift
@@ -40,13 +40,15 @@ extension AnchoringComponent.Target: AttributeDecodable {
         guard let value = attribute?.value
         else { throw AttributeDecodingError.missingAttribute(Self.self) }
         switch value {
+        #if os(visionOS)
         case "hand":
             self = .hand(
                 try element.attributeValue(Chirality.self, for: "chirality"),
                 location: try element.attributeValue(HandLocation.self, for: "location")
             )
         case "head":
             self = .head
+        #endif
         case "image":
             self = .image(
                 group: try element.attributeValue(String.self, for: "group"),
@@ -64,6 +66,7 @@ extension AnchoringComponent.Target: AttributeDecodable {
     }
 }
 
+#if os(visionOS)
 extension AnchoringComponent.Target.Chirality: AttributeDecodable {
     public init(from attribute: Attribute?, on element: ElementNode) throws {
         guard let value = attribute?.value
@@ -99,6 +102,7 @@ extension AnchoringComponent.Target.HandLocation: AttributeDecodable {
         }
     }
 }
+#endif
 
 extension AnchoringComponent.Target.Alignment: AttributeDecodable {
     public init(from attribute: Attribute?, on element: ElementNode) throws {

diff --git a/Sources/LiveViewNativeRealityKit/ContentBuilders/EntityContentBuilder.swift b/Sources/LiveViewNativeRealityKit/ContentBuilders/EntityContentBuilder.swift
@@ -26,10 +26,12 @@ public struct EntityContentBuilder<Entities: EntityRegistry, Components: Compone
             case modelEntity = "ModelEntity"
             case anchorEntity = "AnchorEntity"
 
+            #if os(visionOS)
             case sceneReconstructionProvider = "SceneReconstructionProvider"
             case handTrackingProvider = "HandTrackingProvider"
 
             case viewAttachmentEntity = "ViewAttachmentEntity"
+            #endif
         }
 
         public init?(rawValue: RawValue) {
@@ -71,12 +73,14 @@ public struct EntityContentBuilder<Entities: EntityRegistry, Components: Compone
                     entity = try ModelEntity(from: element, in: context)
                 case .anchorEntity:
                     entity = try AnchorEntity(from: element, in: context)
+                #if os(visionOS)
                 case .sceneReconstructionProvider:
                     entity = try SceneReconstructionEntity(from: element, in: context)
                 case .handTrackingProvider:
                     entity = HandTrackingEntity(from: element, in: context)
                 case .viewAttachmentEntity:
                     entity = try _ViewAttachmentEntity(from: element, in: context)
+                #endif
                 }
             case .custom:
                 guard let customEntity = (try Self.build([element.node], with: Entities.self, in: context)).first
@@ -217,7 +221,9 @@ extension Entity {
             self.components.set(elementNodeComponent)
         }
 
+        #if os(visionOS)
         guard !(self is SceneReconstructionEntity) else { return } // scene reconstruction creates its own child meshes
+        #endif
 
         /// The list of children previously part of this element.
         ///

diff --git a/Sources/LiveViewNativeRealityKit/Entities/ARKitSession/ARKitSession+shared.swift b/Sources/LiveViewNativeRealityKit/Entities/ARKitSession/ARKitSession+shared.swift
@@ -5,6 +5,7 @@
 //  Created by Carson.Katri on 5/30/24.
 //
 
+#if os(visionOS)
 import ARKit
 
 enum SharedARKitSessionStore {
@@ -19,3 +20,4 @@ enum SharedARKitSessionStore {
         }
     }
 }
+#endif
diff --git a/Sources/LiveViewNativeRealityKit/Entities/ARKitSession/HandTracking.swift b/Sources/LiveViewNativeRealityKit/Entities/ARKitSession/HandTracking.swift
@@ -5,6 +5,7 @@
 //  Created by Carson Katri on 5/23/24.
 //
 
+#if os(visionOS)
 import LiveViewNative
 import LiveViewNativeCore
 import ARKit
@@ -152,3 +153,4 @@ class HandTrackingEntity: Entity {
         session.stop()
     }
 }
+#endif
diff --git a/Sources/LiveViewNativeRealityKit/Entities/ARKitSession/SceneReconstruction.swift b/Sources/LiveViewNativeRealityKit/Entities/ARKitSession/SceneReconstruction.swift
@@ -5,6 +5,7 @@
 //  Created by Carson Katri on 5/23/24.
 //
 
+#if os(visionOS)
 import LiveViewNative
 import ARKit
 import RealityKit
@@ -128,3 +129,4 @@ extension GeometrySource {
         return asArray(ofType: (T, T, T).self).map { .init($0.0, $0.1, $0.2) }
     }
 }
+#endif
diff --git a/Sources/LiveViewNativeRealityKit/Modifiers/RealityViewCameraControlsModifier.swift b/Sources/LiveViewNativeRealityKit/Modifiers/RealityViewCameraControlsModifier.swift
@@ -0,0 +1,40 @@
+//
+//  RealityViewCameraControlsModifier.swift
+//  
+//
+//  Created by Carson.Katri on 7/25/24.
+//
+
+#if os(iOS) || os(macOS)
+import LiveViewNative
+import LiveViewNativeStylesheet
+import SwiftUI
+import RealityKit
+
+@ParseableExpression
+struct _RealityViewCameraControlsModifier: ViewModifier {
+    public static var name: String { "realityViewCameraControls" }
+
+    let controls: CameraControls
+
+    init(_ controls: CameraControls) {
+        self.controls = controls
+    }
+
+    func body(content: Content) -> some View {
+        content.realityViewCameraControls(controls)
+    }
+}
+
+extension CameraControls: ParseableModifierValue {
+    public static func parser(in context: ParseableModifierContext) -> some Parser<Substring.UTF8View, Self> {
+        ImplicitStaticMember([
+            "dolly": .dolly,
+            "none": .none,
+            "orbit": .orbit,
+            "pan": .pan,
+            "tilt": .tilt,
+        ])
+    }
+}
+#endif
diff --git a/Sources/LiveViewNativeRealityKit/RealityKit.swift b/Sources/LiveViewNativeRealityKit/RealityKit.swift
@@ -1,6 +1,7 @@
 import LiveViewNative
 import LiveViewNativeStylesheet
 import SwiftUI
+import RealityKit
 
 public struct CustomizableRealityKitRegistry<
     Entities: EntityRegistry,
@@ -17,6 +18,36 @@ public struct CustomizableRealityKitRegistry<
                 _RealityView<Root, Entities, _ComponentContentBuilder<Components>>()
             }
         }
+
+        #if os(iOS) || os(macOS)
+        public static func parseModifier(
+            _ input: inout Substring.UTF8View,
+            in context: ParseableModifierContext
+        ) throws -> CustomModifier {
+            try CustomModifier.parser(in: context).parse(&input)
+        }
+
+        public struct CustomModifier: ViewModifier, ParseableModifierValue {
+            enum Storage {
+                case realityViewCameraControls(_RealityViewCameraControlsModifier)
+            }
+
+            let storage: Storage
+
+            public static func parser(in context: ParseableModifierContext) -> some Parser<Substring.UTF8View, Self> {
+                CustomModifierGroupParser(output: Self.self) {
+                    _RealityViewCameraControlsModifier.parser(in: context).map({ Self(storage: .realityViewCameraControls($0)) })
+                }
+            }
+
+            public func body(content: Content) -> some View {
+                switch storage {
+                case .realityViewCameraControls(let modifier):
+                    content.modifier(modifier)
+                }
+            }
+        }
+        #endif
     }
 }
 

diff --git a/Sources/LiveViewNativeRealityKit/RealityView.swift b/Sources/LiveViewNativeRealityKit/RealityView.swift
@@ -95,6 +95,8 @@ struct _RealityView<Root: RootRegistry, Entities: EntityRegistry, Components: Co
 
     private var audibleClicks: Bool = false
 
+    private var camera: RealityViewCamera = .worldTracking
+
     @LiveElementIgnored
     @State
     private var updateStorage = UpdateContextComponent<Root, Entities, Components>.Storage()
@@ -146,6 +148,10 @@ struct _RealityView<Root: RootRegistry, Entities: EntityRegistry, Components: Co
 
     var body: some View {
         RealityView { content, attachments in
+            #if os(iOS) || os(macOS)
+            content.camera = self.camera
+            #endif
+
             self.subscriptions = [
                 content.subscribe(to: CollisionEvents.Began.self, componentType: PhysicsBodyChangeEventComponent.self) { collision in
                     for entity in [collision.entityA, collision.entityB] {
@@ -259,7 +265,11 @@ struct _RealityView<Root: RootRegistry, Entities: EntityRegistry, Components: Co
                             partialResult[String(attr.name.name.dropFirst(prefix.count))] = attr.value
                         }
 
+                    #if os(visionOS)
                     let tapLocation = value.convert(value.location3D, from: .local, to: .scene)
+                    #else
+                    let tapLocation = value.hitTest(point: value.location, in: .local).first?.position ?? value.entity.position
+                    #endif
 
                     payload["_location"] = [tapLocation.x, tapLocation.y, tapLocation.z]
 

diff --git a/Sources/LiveViewNativeRealityKit/Types/RealityViewCamera+AttributeDecodable.swift b/Sources/LiveViewNativeRealityKit/Types/RealityViewCamera+AttributeDecodable.swift
@@ -0,0 +1,31 @@
+//
+//  RealityViewCamera+AttributeDecodable.swift
+//  
+//
+//  Created by Carson.Katri on 7/25/24.
+//
+
+#if os(iOS) || os(macOS)
+import LiveViewNative
+import LiveViewNativeCore
+import RealityKit
+import SwiftUI
+
+extension RealityViewCamera: AttributeDecodable {
+    public init(from attribute: Attribute?, on element: ElementNode) throws {
+        guard let value = attribute?.value
+        else { throw AttributeDecodingError.missingAttribute(Self.self) }
+
+        switch value {
+        case "virtual":
+            self = .virtual
+        case "worldTracking":
+            self = .worldTracking
+        default:
+            throw AttributeDecodingError.badValue(Self.self)
+        }
+    }
+}
+#else
+typealias RealityViewCamera = String
+#endif