Disable orthographic menu if fov is set to any value

nicklockwood · nicklockwood · commit e0ac064ea156 · 2021-11-04T00:53:49.000Z
diff --git a/Viewer/Camera.swift b/Viewer/Camera.swift
@@ -74,12 +74,12 @@ extension Camera {
         settings?.hasScale ?? false
     }
 
-    var fov: Angle {
-        settings?.fov ?? .degrees(60)
+    var fov: Angle? {
+        settings?.fov
     }
 
-    var isOrthographic: Bool {
-        fov <= .zero
+    var isOrthographic: Bool? {
+        fov.map { $0 <= .zero }
     }
 
     private var settings: ShapeScript.Camera? {
diff --git a/Viewer/Document.swift b/Viewer/Document.swift
@@ -480,8 +480,8 @@ class Document: NSDocument, EvaluationDelegate {
         case #selector(showAxes(_:)):
             menuItem.state = showAxes ? .on : .off
         case #selector(setOrthographic(_:)):
-            menuItem.state = camera.isOrthographic || isOrthographic ? .on : .off
-            return camera.fov > .zero
+            menuItem.state = camera.isOrthographic ?? isOrthographic ? .on : .off
+            return camera.isOrthographic == nil
         case #selector(selectCamera(_:)) where menuItem.tag < cameras.count:
             menuItem.state = (camera == cameras[menuItem.tag]) ? .on : .off
         case #selector(selectCameras(_:)):
diff --git a/Viewer/SceneViewController.swift b/Viewer/SceneViewController.swift
@@ -30,7 +30,7 @@ class SceneViewController: NSViewController {
         cameraNode.position = SCNVector3(0, 0, 1)
         cameraNode.camera?.zNear = 0.01
         cameraNode.camera?.automaticallyAdjustsZRange = true
-        cameraNode.camera?.usesOrthographicProjection = camera.isOrthographic || isOrthographic
+        cameraNode.camera?.usesOrthographicProjection = camera.isOrthographic ?? isOrthographic
         cameraNode.eulerAngles = SCNVector3(0, 0, 0)
         return cameraNode
     }()
@@ -148,7 +148,8 @@ class SceneViewController: NSViewController {
             guard isOrthographic != oldValue else {
                 return
             }
-            cameraNode.camera?.usesOrthographicProjection = camera.isOrthographic || isOrthographic
+            cameraNode.camera?.usesOrthographicProjection =
+                camera.isOrthographic ?? isOrthographic
             resetCamera(nil)
         }
     }
@@ -321,8 +322,8 @@ class SceneViewController: NSViewController {
         if !camera.hasOrientation {
             cameraNode.look(at: SCNVector3(viewCenter))
         }
-        cameraNode.camera?.fieldOfView = camera.fov.degrees
-        cameraNode.camera?.usesOrthographicProjection = camera.isOrthographic || isOrthographic
+        cameraNode.camera?.fieldOfView = CGFloat(camera.fov?.degrees ?? 60)
+        cameraNode.camera?.usesOrthographicProjection = camera.isOrthographic ?? isOrthographic
         resetCamera(nil)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -74,12 +74,12 @@ extension Camera {`
`74`	`74`	`settings?.hasScale ?? false`
`75`	`75`	`}`
`76`	`76`
`77`		`- var fov: Angle {`
`78`		`- settings?.fov ?? .degrees(60)`
	`77`	`+ var fov: Angle? {`
	`78`	`+ settings?.fov`
`79`	`79`	`}`
`80`	`80`
`81`		`- var isOrthographic: Bool {`
`82`		`- fov <= .zero`
	`81`	`+ var isOrthographic: Bool? {`
	`82`	`+ fov.map { $0 <= .zero }`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`private var settings: ShapeScript.Camera? {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class SceneViewController: NSViewController {`
`30`	`30`	`cameraNode.position = SCNVector3(0, 0, 1)`
`31`	`31`	`cameraNode.camera?.zNear = 0.01`
`32`	`32`	`cameraNode.camera?.automaticallyAdjustsZRange = true`
`33`		`- cameraNode.camera?.usesOrthographicProjection = camera.isOrthographic \|\| isOrthographic`
	`33`	`+ cameraNode.camera?.usesOrthographicProjection = camera.isOrthographic ?? isOrthographic`
`34`	`34`	`cameraNode.eulerAngles = SCNVector3(0, 0, 0)`
`35`	`35`	`return cameraNode`
`36`	`36`	`}()`
`@@ -148,7 +148,8 @@ class SceneViewController: NSViewController {`
`148`	`148`	`guard isOrthographic != oldValue else {`
`149`	`149`	`return`
`150`	`150`	`}`
`151`		`- cameraNode.camera?.usesOrthographicProjection = camera.isOrthographic \|\| isOrthographic`
	`151`	`+ cameraNode.camera?.usesOrthographicProjection =`
	`152`	`+ camera.isOrthographic ?? isOrthographic`
`152`	`153`	`resetCamera(nil)`
`153`	`154`	`}`
`154`	`155`	`}`
`@@ -321,8 +322,8 @@ class SceneViewController: NSViewController {`
`321`	`322`	`if !camera.hasOrientation {`
`322`	`323`	`cameraNode.look(at: SCNVector3(viewCenter))`
`323`	`324`	`}`
`324`		`- cameraNode.camera?.fieldOfView = camera.fov.degrees`
`325`		`- cameraNode.camera?.usesOrthographicProjection = camera.isOrthographic \|\| isOrthographic`
	`325`	`+ cameraNode.camera?.fieldOfView = CGFloat(camera.fov?.degrees ?? 60)`
	`326`	`+ cameraNode.camera?.usesOrthographicProjection = camera.isOrthographic ?? isOrthographic`
`326`	`327`	`resetCamera(nil)`
`327`	`328`	`}`
`328`	`329`