Merge pull request #11 from ejeinc/simulator-support

Simulator support
ejeinc · Apr 19, 2017 · 6223b9f · 6223b9f
2 parents a2f788c + 6c4d940
commit 6223b9f
Show file tree

Hide file tree

Showing 15 changed files with 109 additions and 80 deletions.
diff --git a/Examples/MonoImage/Sources/ViewController.swift b/Examples/MonoImage/Sources/ViewController.swift
@@ -21,7 +21,12 @@ final class ViewController: UIViewController {
     weak var panoramaView: PanoramaView?
 
     private func loadPanoramaView() {
+        #if METALSCOPE_ENABLE_METAL
         let panoramaView = PanoramaView(frame: view.bounds, device: device)
+        #else
+        let panoramaView = PanoramaView(frame: view.bounds) // iOS Simulator
+        #endif
+
         panoramaView.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(panoramaView)
 

diff --git a/README.md b/README.md
@@ -91,6 +91,19 @@ present(stereoViewController, animated: true, completion: nil)
 
 Check example apps for more samples.
 
+### Simulator
+`PanoramaView`, `StereoView` and `StereoViewController` can also be used on iOS simulator by using alternative initializers.
+
+```swift
+#if METALSCOPE_ENABLE_METAL
+let panoramaView = PanoramaView(frame: view.bounds, device: device)
+#else
+let panoramaView = PanoramaView(frame: view.bounds) // on simulator
+#endif
+```
+
+Please note that these classes are significantly limited in functionality on the simulator. For example, `PanoramaView` can display photos, but cannot display videos. For `StereoView` and `StereoViewController`, it is a placeholder and nothing is displayed.
+
 ## Requirements
 
 - Xcode 8.2+

diff --git a/Sources/MediaSceneLoader+Image.swift b/Sources/MediaSceneLoader+Image.swift
@@ -6,10 +6,6 @@
 //  Copyright © 2017 eje Inc. All rights reserved.
 //
 
-#if (arch(i386) || arch(x86_64)) && os(iOS)
-    // Not available on iOS Simulator
-#else
-
 import SceneKit
 
 extension MediaSceneLoader {
@@ -28,5 +24,3 @@ extension MediaSceneLoader {
         self.scene = (scene as? SCNScene)
     }
 }
-
-#endif
diff --git a/Sources/MediaSceneLoader+Video.swift b/Sources/MediaSceneLoader+Video.swift
@@ -6,9 +6,7 @@
 //  Copyright © 2017 eje Inc. All rights reserved.
 //
 
-#if (arch(i386) || arch(x86_64)) && os(iOS)
-    // Not available on iOS Simulator
-#else
+#if METALSCOPE_ENABLE_METAL
 
 import SceneKit
 import AVFoundation

diff --git a/Sources/MediaSceneLoader.swift b/Sources/MediaSceneLoader.swift
@@ -6,15 +6,12 @@
 //  Copyright © 2017 eje Inc. All rights reserved.
 //
 
-#if (arch(i386) || arch(x86_64)) && os(iOS)
-    // Not available on iOS Simulator
-#else
-
 import SceneKit
 
 public protocol MediaSceneLoader: class {
+    #if METALSCOPE_ENABLE_METAL
     var device: MTLDevice { get }
+    #endif
+
     var scene: SCNScene? { get set }
 }
-
-#endif
diff --git a/Sources/MetalScope.h b/Sources/MetalScope.h
@@ -8,6 +8,8 @@
 
 #import <UIKit/UIKit.h>
 
+#define METALSCOPE_ENABLE_METAL (!TARGET_OS_SIMULATOR)
+
 //! Project version number for MetalScope.
 FOUNDATION_EXPORT double MetalScopeVersionNumber;
 

diff --git a/Sources/PanoramaView+PanGesture.swift b/Sources/PanoramaView+PanGesture.swift
@@ -6,10 +6,6 @@
 //  Copyright © 2017 eje Inc. All rights reserved.
 //
 
-#if (arch(i386) || arch(x86_64)) && os(iOS)
-    // Not available on iOS Simulator
-#else
-
 import UIKit
 import UIKit.UIGestureRecognizerSubclass
 import SceneKit
@@ -157,5 +153,3 @@ extension PanoramaView {
         }
     }
 }
-
-#endif
diff --git a/Sources/PanoramaView.swift b/Sources/PanoramaView.swift
@@ -6,15 +6,13 @@
 //  Copyright © 2017 eje Inc. All rights reserved.
 //
 
-#if (arch(i386) || arch(x86_64)) && os(iOS)
-    // Not available on iOS Simulator
-#else
-
 import UIKit
 import SceneKit
 
 public final class PanoramaView: UIView, MediaSceneLoader {
+    #if METALSCOPE_ENABLE_METAL
     public let device: MTLDevice
+    #endif
 
     public var scene: SCNScene? {
         get {
@@ -37,10 +35,14 @@ public final class PanoramaView: UIView, MediaSceneLoader {
     }()
 
     lazy var scnView: SCNView = {
+        #if METALSCOPE_ENABLE_METAL
         let view = SCNView(frame: self.bounds, options: [
             SCNView.Option.preferredRenderingAPI.rawValue: SCNRenderingAPI.metal.rawValue,
             SCNView.Option.preferredDevice.rawValue: self.device
         ])
+        #else
+        let view = SCNView(frame: self.bounds)
+        #endif
         view.backgroundColor = .black
         view.isUserInteractionEnabled = false
         view.delegate = self
@@ -61,13 +63,18 @@ public final class PanoramaView: UIView, MediaSceneLoader {
         return InterfaceOrientationUpdater(orientationNode: self.orientationNode)
     }()
 
+    #if METALSCOPE_ENABLE_METAL
     public init(frame: CGRect, device: MTLDevice) {
         self.device = device
-
         super.init(frame: frame)
-
         addGestureRecognizer(self.panGestureManager.gestureRecognizer)
     }
+    #else
+    public override init(frame: CGRect) {
+        super.init(frame: frame)
+        addGestureRecognizer(self.panGestureManager.gestureRecognizer)
+    }
+    #endif
 
     public required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -185,5 +192,3 @@ extension PanoramaView: SCNSceneRendererDelegate {
         sceneRendererDelegate?.renderer?(renderer, didRenderScene: scene, atTime: time)
     }
 }
-
-#endif
diff --git a/Sources/PlayerItemRenderer.swift b/Sources/PlayerItemRenderer.swift
@@ -6,9 +6,7 @@
 //  Copyright © 2016 eje Inc. All rights reserved.
 //
 
-#if (arch(i386) || arch(x86_64)) && os(iOS)
-    // Not available on iOS Simulator
-#else
+#if METALSCOPE_ENABLE_METAL
 
 import Metal
 import AVFoundation

diff --git a/Sources/PlayerRenderer.swift b/Sources/PlayerRenderer.swift
@@ -6,9 +6,7 @@
 //  Copyright © 2017 eje Inc. All rights reserved.
 //
 
-#if (arch(i386) || arch(x86_64)) && os(iOS)
-    // Not available on iOS Simulator
-#else
+#if METALSCOPE_ENABLE_METAL
 
 import Metal
 import AVFoundation

diff --git a/Sources/StereoRenderer.swift b/Sources/StereoRenderer.swift
@@ -6,9 +6,7 @@
 //  Copyright © 2017 eje Inc. All rights reserved.
 //
 
-#if (arch(i386) || arch(x86_64)) && os(iOS)
-    // Not available on iOS Simulator
-#else
+#if METALSCOPE_ENABLE_METAL
 
 import SceneKit
 import Metal

diff --git a/Sources/StereoScene.swift b/Sources/StereoScene.swift
@@ -6,9 +6,7 @@
 //  Copyright © 2017 eje Inc. All rights reserved.
 //
 
-#if (arch(i386) || arch(x86_64)) && os(iOS)
-    // Not available on iOS Simulator
-#else
+#if METALSCOPE_ENABLE_METAL
 
 import SceneKit