Skip to content

Commit d3e3af7

Browse files
committed
Update for 1.1.6 release
1 parent a2b8ce6 commit d3e3af7

File tree

7 files changed

+18
-12
lines changed

7 files changed

+18
-12
lines changed

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1+
## [1.1.6](https://github.com/nicklockwood/ShapeScript/releases/tag/1.1.6) (2021-08-04)
2+
3+
- Paths are now drawn using polygons strips, which looks sharper and renders more consistently
4+
- Made further improvements to cancelling in-progress rendering when reloading a file
5+
- Bumped Euclid to 0.5.4, which includes several bug fixes and performance improvements
6+
- Improved performance when rendering scenes with nested CSG operations or groups
7+
- Fixed rendering and bounds calculation of non-planar extruded shapes
8+
19
## [1.1.5](https://github.com/nicklockwood/ShapeScript/releases/tag/1.1.5) (2021-08-02)
210

3-
- Info window in ShapeScript Viewer no longer included imported models in texture count
11+
- Info window in ShapeScript Viewer no longer includes imported models in texture count
412
- Fixed a regression in ShapeScript Viewer 1.1.4 where error message wouldn't refresh correctly on reload
513
- Improved error messaging for errors that occur in an imported file
614
- Reloading a partially-rendered scene should now terminate the rendering more quickly, freeing up CPU

ShapeScript.podspec.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ShapeScript",
3-
"version": "1.1.5",
3+
"version": "1.1.6",
44
"license": {
55
"type": "MIT",
66
"file": "LICENSE.md"
@@ -10,7 +10,7 @@
1010
"authors": "Nick Lockwood",
1111
"source": {
1212
"git": "https://github.com/nicklockwood/ShapeScript.git",
13-
"tag": "1.1.5"
13+
"tag": "1.1.6"
1414
},
1515
"source_files": "ShapeScript",
1616
"requires_arc": true,

ShapeScript.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@
606606
"$(inherited)",
607607
"@executable_path/../Frameworks",
608608
);
609-
MARKETING_VERSION = 1.1.5;
609+
MARKETING_VERSION = 1.1.6;
610610
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
611611
PRODUCT_MODULE_NAME = Viewer;
612612
PRODUCT_NAME = "ShapeScript Viewer";
@@ -632,7 +632,7 @@
632632
"$(inherited)",
633633
"@executable_path/../Frameworks",
634634
);
635-
MARKETING_VERSION = 1.1.5;
635+
MARKETING_VERSION = 1.1.6;
636636
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
637637
PRODUCT_MODULE_NAME = Viewer;
638638
PRODUCT_NAME = "ShapeScript Viewer";
@@ -784,7 +784,7 @@
784784
"@executable_path/../Frameworks",
785785
"@loader_path/Frameworks",
786786
);
787-
MARKETING_VERSION = 1.1.5;
787+
MARKETING_VERSION = 1.1.6;
788788
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
789789
PRODUCT_NAME = ShapeScript;
790790
SKIP_INSTALL = YES;
@@ -813,7 +813,7 @@
813813
"@executable_path/../Frameworks",
814814
"@loader_path/Frameworks",
815815
);
816-
MARKETING_VERSION = 1.1.5;
816+
MARKETING_VERSION = 1.1.6;
817817
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
818818
PRODUCT_NAME = ShapeScript;
819819
SKIP_INSTALL = YES;

ShapeScript/Geometry.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,6 @@ private extension Geometry {
525525
copy.isSelected = isSelected
526526
return copy
527527
}
528-
529528
}
530529

531530
// MARK: Stats

ShapeScript/Interpreter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public struct RuntimeError: Error, Equatable {
153153
let .fileTypeMismatch(for: name, _, _):
154154
return "Unable to open file '\(name)'"
155155
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 {
157157
return error.message
158158
}
159159
return "Error in imported file '\(name)': \(error.message)"

Viewer/Document.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ class Document: NSDocument, EvaluationDelegate {
283283
}
284284

285285
@IBAction func openInEditor(_: AnyObject) {
286-
287286
openFileInEditor(selectedGeometry?.sourceLocation?.file ?? fileURL)
288287
}
289288

@@ -409,7 +408,7 @@ class Document: NSDocument, EvaluationDelegate {
409408
"bmp", "dib",
410409
"heif", "heic",
411410
"ind", "indd", "indt",
412-
"jp2", "j2k", "jpf", "jpx", "jpm", "mj2"
411+
"jp2", "j2k", "jpf", "jpx", "jpm", "mj2",
413412
]
414413
return linkedResources.filter {
415414
imageExtensions.contains($0.pathExtension.lowercased())

Viewer/LoadingProgress.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ final class LoadingProgress {
2222

2323
init(_ observer: @escaping Observer) {
2424
self.observer = observer
25-
self.queue = DispatchQueue(label: "shapescript.progress.\(id)")
25+
queue = DispatchQueue(label: "shapescript.progress.\(id)")
2626
DispatchQueue.main.async {
2727
self.observer(self.status)
2828
}

0 commit comments

Comments
 (0)