removed some \'if simulator\' statements, added initialisers so that …

…simulator will compile with same code as device
maxxfrazer · Nov 19, 2021 · 3a7e4db · 3a7e4db
1 parent c1db612
commit 3a7e4db
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/Sources/FocusEntity/FocusEntity+Segment.swift b/Sources/FocusEntity/FocusEntity+Segment.swift
@@ -6,7 +6,6 @@
 //  Copyright © 2019 Max Cobb. All rights reserved.
 //
 
-#if canImport(ARKit) && !targetEnvironment(simulator)
 import RealityKit
 
 internal extension FocusEntity {
@@ -154,4 +153,3 @@ internal extension FocusEntity {
 
   }
 }
-#endif
diff --git a/Sources/FocusEntity/FocusEntity.swift b/Sources/FocusEntity/FocusEntity.swift
@@ -6,11 +6,12 @@
 //  Copyright © 2019 Max Cobb. All rights reserved.
 //
 
-#if canImport(ARKit) && !targetEnvironment(simulator)
 import RealityKit
 #if canImport(RealityFoundation)
 import RealityFoundation
 #endif
+
+#if canImport(ARKit) && !targetEnvironment(simulator)
 import ARKit
 import Combine
 
@@ -330,9 +331,14 @@ open class FocusEntity: Entity, HasAnchoring, HasFocusEntity {
 FocusEntity is only enabled for environments which can import ARKit.
 */
 open class FocusEntity {
-  init?() {
-    print("This is not supported when ARKit cannot be imported.")
-    return nil
+  public convenience init(on arView: ARView, style: FocusEntityComponent.Style) {
+    self.init(on: arView, focus: FocusEntityComponent(style: style))
+  }
+  public convenience init(on arView: ARView, focus: FocusEntityComponent) {
+    self.init()
+  }
+  internal init() {
+    print("This is not supported when ARKit cannot be imported or using the simulator.")
   }
 }
 #endif
diff --git a/Sources/FocusEntity/FocusEntityComponent.swift b/Sources/FocusEntity/FocusEntityComponent.swift
@@ -6,7 +6,6 @@
 //  Copyright © 2019 Max Cobb. All rights reserved.
 //
 
-#if canImport(ARKit) && !targetEnvironment(simulator)
 import RealityKit
 import ARKit
 
@@ -86,4 +85,3 @@ public struct FocusEntityComponent: Component {
     }
   }
 }
-#endif