Update for 1.1.6 release

nicklockwood · nicklockwood · commit d3e3af7cc864 · 2021-08-05T09:01:48.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
+## [1.1.6](https://github.com/nicklockwood/ShapeScript/releases/tag/1.1.6) (2021-08-04)
+
+- Paths are now drawn using polygons strips, which looks sharper and renders more consistently
+- Made further improvements to cancelling in-progress rendering when reloading a file
+- Bumped Euclid to 0.5.4, which includes several bug fixes and performance improvements
+- Improved performance when rendering scenes with nested CSG operations or groups
+- Fixed rendering and bounds calculation of non-planar extruded shapes
+
 ## [1.1.5](https://github.com/nicklockwood/ShapeScript/releases/tag/1.1.5) (2021-08-02)
 
-- Info window in ShapeScript Viewer no longer included imported models in texture count
+- Info window in ShapeScript Viewer no longer includes imported models in texture count
 - Fixed a regression in ShapeScript Viewer 1.1.4 where error message wouldn't refresh correctly on reload
 - Improved error messaging for errors that occur in an imported file
 - Reloading a partially-rendered scene should now terminate the rendering more quickly, freeing up CPU
diff --git a/ShapeScript.podspec.json b/ShapeScript.podspec.json
@@ -1,6 +1,6 @@
 {
   "name": "ShapeScript",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "license": {
     "type": "MIT",
     "file": "LICENSE.md"
@@ -10,7 +10,7 @@
   "authors": "Nick Lockwood",
   "source": {
     "git": "https://github.com/nicklockwood/ShapeScript.git",
-    "tag": "1.1.5"
+    "tag": "1.1.6"
   },
   "source_files": "ShapeScript",
   "requires_arc": true,
diff --git a/ShapeScript.xcodeproj/project.pbxproj b/ShapeScript.xcodeproj/project.pbxproj
@@ -606,7 +606,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.1.5;
+				MARKETING_VERSION = 1.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
 				PRODUCT_MODULE_NAME = Viewer;
 				PRODUCT_NAME = "ShapeScript Viewer";
@@ -632,7 +632,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.1.5;
+				MARKETING_VERSION = 1.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
 				PRODUCT_MODULE_NAME = Viewer;
 				PRODUCT_NAME = "ShapeScript Viewer";
@@ -784,7 +784,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.5;
+				MARKETING_VERSION = 1.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
 				PRODUCT_NAME = ShapeScript;
 				SKIP_INSTALL = YES;
@@ -813,7 +813,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.5;
+				MARKETING_VERSION = 1.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
 				PRODUCT_NAME = ShapeScript;
 				SKIP_INSTALL = YES;
diff --git a/ShapeScript/Geometry.swift b/ShapeScript/Geometry.swift
@@ -525,7 +525,6 @@ private extension Geometry {
         copy.isSelected = isSelected
         return copy
     }
-
 }
 
 // MARK: Stats
diff --git a/ShapeScript/Interpreter.swift b/ShapeScript/Interpreter.swift
@@ -153,7 +153,7 @@ public struct RuntimeError: Error, Equatable {
              let .fileTypeMismatch(for: name, _, _):
             return "Unable to open file '\(name)'"
         case let .importError(error, for: name, _):
-            if case let .runtimeError(error) = error, case .importError = error.type  {
+            if case let .runtimeError(error) = error, case .importError = error.type {
                 return error.message
             }
             return "Error in imported file '\(name)': \(error.message)"
diff --git a/Viewer/Document.swift b/Viewer/Document.swift
@@ -283,7 +283,6 @@ class Document: NSDocument, EvaluationDelegate {
     }
 
     @IBAction func openInEditor(_: AnyObject) {
-
         openFileInEditor(selectedGeometry?.sourceLocation?.file ?? fileURL)
     }
 
@@ -409,7 +408,7 @@ class Document: NSDocument, EvaluationDelegate {
             "bmp", "dib",
             "heif", "heic",
             "ind", "indd", "indt",
-            "jp2", "j2k", "jpf", "jpx", "jpm", "mj2"
+            "jp2", "j2k", "jpf", "jpx", "jpm", "mj2",
         ]
         return linkedResources.filter {
             imageExtensions.contains($0.pathExtension.lowercased())
diff --git a/Viewer/LoadingProgress.swift b/Viewer/LoadingProgress.swift
@@ -22,7 +22,7 @@ final class LoadingProgress {
 
     init(_ observer: @escaping Observer) {
         self.observer = observer
-        self.queue = DispatchQueue(label: "shapescript.progress.\(id)")
+        queue = DispatchQueue(label: "shapescript.progress.\(id)")
         DispatchQueue.main.async {
             self.observer(self.status)
         }

Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,6 @@ private extension Geometry {`
`525`	`525`	`copy.isSelected = isSelected`
`526`	`526`	`return copy`
`527`	`527`	`}`
`528`		`-`
`529`	`528`	`}`
`530`	`529`
`531`	`530`	`// MARK: Stats`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public struct RuntimeError: Error, Equatable {`
`153`	`153`	`let .fileTypeMismatch(for: name, _, _):`
`154`	`154`	`return "Unable to open file '\(name)'"`
`155`	`155`	`case let .importError(error, for: name, _):`
`156`		`- if case let .runtimeError(error) = error, case .importError = error.type {`
	`156`	`+ if case let .runtimeError(error) = error, case .importError = error.type {`
`157`	`157`	`return error.message`
`158`	`158`	`}`
`159`	`159`	`return "Error in imported file '\(name)': \(error.message)"`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,6 @@ class Document: NSDocument, EvaluationDelegate {`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`@IBAction func openInEditor(_: AnyObject) {`
`286`		`-`
`287`	`286`	`openFileInEditor(selectedGeometry?.sourceLocation?.file ?? fileURL)`
`288`	`287`	`}`
`289`	`288`
`@@ -409,7 +408,7 @@ class Document: NSDocument, EvaluationDelegate {`
`409`	`408`	`"bmp", "dib",`
`410`	`409`	`"heif", "heic",`
`411`	`410`	`"ind", "indd", "indt",`
`412`		`- "jp2", "j2k", "jpf", "jpx", "jpm", "mj2"`
	`411`	`+ "jp2", "j2k", "jpf", "jpx", "jpm", "mj2",`
`413`	`412`	`]`
`414`	`413`	`return linkedResources.filter {`
`415`	`414`	`imageExtensions.contains($0.pathExtension.lowercased())`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ final class LoadingProgress {`
`22`	`22`
`23`	`23`	`init(_ observer: @escaping Observer) {`
`24`	`24`	`self.observer = observer`
`25`		`- self.queue = DispatchQueue(label: "shapescript.progress.\(id)")`
	`25`	`+ queue = DispatchQueue(label: "shapescript.progress.\(id)")`
`26`	`26`	`DispatchQueue.main.async {`
`27`	`27`	`self.observer(self.status)`
`28`	`28`	`}`