Skip to content

Commit 74b59c3

Browse files
nicklockwoodnicklockwood
committed
Update for 1.3.10 release
1 parent 44008ed commit 74b59c3

11 files changed

Lines changed: 49 additions & 16 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## [1.3.10](https://github.com/nicklockwood/ShapeScript/releases/tag/1.3.10) (2021-11-01)
2+
3+
- DAE files containing triangle strips or non-triangular polygons are now loaded correctly
4+
- Fixed empty Geometry names not being set to nil
5+
- Fixed broken footer links in help pages
6+
- Bumped Euclid to version 0.5.14
7+
18
## [1.3.9](https://github.com/nicklockwood/ShapeScript/releases/tag/1.3.9) (2021-10-22)
29

310
- Added multiple camera options

‎LRUCache/LRUCache.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
isa = PBXProject;
158158
attributes = {
159159
LastSwiftUpdateCheck = 1010;
160-
LastUpgradeCheck = 1300;
160+
LastUpgradeCheck = 1310;
161161
ORGANIZATIONNAME = "Nick Lockwood";
162162
TargetAttributes = {
163163
016FAB2821BFE78100AF60DC = {
@@ -327,13 +327,14 @@
327327
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
328328
GCC_WARN_UNUSED_FUNCTION = YES;
329329
GCC_WARN_UNUSED_VARIABLE = YES;
330-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
330+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
331331
MACOSX_DEPLOYMENT_TARGET = 10.12;
332332
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
333333
MTL_FAST_MATH = YES;
334334
ONLY_ACTIVE_ARCH = YES;
335335
SDKROOT = macosx;
336336
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
337+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
337338
SWIFT_VERSION = 4.2;
338339
VERSIONING_SYSTEM = "apple-generic";
339340
VERSION_INFO_PREFIX = "";
@@ -387,12 +388,13 @@
387388
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
388389
GCC_WARN_UNUSED_FUNCTION = YES;
389390
GCC_WARN_UNUSED_VARIABLE = YES;
390-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
391+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
391392
MACOSX_DEPLOYMENT_TARGET = 10.12;
392393
MTL_ENABLE_DEBUG_INFO = NO;
393394
MTL_FAST_MATH = YES;
394395
SDKROOT = macosx;
395396
SWIFT_COMPILATION_MODE = wholemodule;
397+
SWIFT_OPTIMIZATION_LEVEL = "-O";
396398
SWIFT_VERSION = 4.2;
397399
VERSIONING_SYSTEM = "apple-generic";
398400
VERSION_INFO_PREFIX = "";
@@ -427,6 +429,7 @@
427429
SDKROOT = "";
428430
SKIP_INSTALL = YES;
429431
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvos appletvsimulator";
432+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
430433
SWIFT_VERSION = 5.0;
431434
};
432435
name = Debug;

‎LRUCache/LRUCache.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LRUCache/LRUCache.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎LRUCache/LRUCache.xcodeproj/xcshareddata/xcschemes/LRUCache.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1310"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎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.3.9",
3+
"version": "1.3.10",
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.3.9"
13+
"tag": "1.3.10"
1414
},
1515
"source_files": ["ShapeScript", "LRUCache/Sources"],
1616
"requires_arc": true,

‎ShapeScript.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@
741741
"$(inherited)",
742742
"@executable_path/../Frameworks",
743743
);
744-
MARKETING_VERSION = 1.3.9;
744+
MARKETING_VERSION = 1.3.10;
745745
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
746746
PRODUCT_MODULE_NAME = Viewer;
747747
PRODUCT_NAME = "ShapeScript Viewer";
@@ -768,7 +768,7 @@
768768
"$(inherited)",
769769
"@executable_path/../Frameworks",
770770
);
771-
MARKETING_VERSION = 1.3.9;
771+
MARKETING_VERSION = 1.3.10;
772772
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
773773
PRODUCT_MODULE_NAME = Viewer;
774774
PRODUCT_NAME = "ShapeScript Viewer";
@@ -921,7 +921,7 @@
921921
"@executable_path/../Frameworks",
922922
"@loader_path/Frameworks",
923923
);
924-
MARKETING_VERSION = 1.3.9;
924+
MARKETING_VERSION = 1.3.10;
925925
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
926926
PRODUCT_NAME = ShapeScript;
927927
SKIP_INSTALL = YES;
@@ -950,7 +950,7 @@
950950
"@executable_path/../Frameworks",
951951
"@loader_path/Frameworks",
952952
);
953-
MARKETING_VERSION = 1.3.9;
953+
MARKETING_VERSION = 1.3.10;
954954
PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
955955
PRODUCT_NAME = ShapeScript;
956956
SKIP_INSTALL = YES;

‎ShapeScript/EvaluationContext.swift‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
import Euclid
1010
import Foundation
1111

12+
#if canImport(CoreGraphics)
13+
import CoreGraphics
14+
#endif
15+
16+
#if canImport(CoreText)
17+
import CoreText
18+
#endif
19+
1220
// MARK: Implementation
1321

1422
public struct SourceLocation: Hashable {

‎ShapeScript/Scene+SceneKit.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public extension Geometry {
146146

147147
if let scnData = scnData, scnData.options == options {
148148
return
149-
} else if let path = self.path {
149+
} else if let path = path {
150150
let wireframe = SCNGeometry(.stroke(
151151
path,
152152
width: options.lineWidth,
@@ -158,7 +158,7 @@ public extension Geometry {
158158
geometry: wireframe,
159159
wireframe: wireframe
160160
)
161-
} else if let mesh = self.mesh {
161+
} else if let mesh = mesh {
162162
if options.wireframe {
163163
let wireframe = scnData?.wireframe ?? (
164164
options.wireframeLineWidth > 0 ? SCNGeometry(.stroke(

‎Viewer/Document.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ class Document: NSDocument, EvaluationDelegate {
168168
override func read(from url: URL, ofType _: String) throws {
169169
let input = try String(contentsOf: url, encoding: .utf8)
170170
linkedResources.removeAll()
171-
if let progress = self.progress, progress.inProgress {
171+
if let progress = progress, progress.inProgress {
172172
Swift.print("[\(progress.id)] cancelling...")
173173
progress.cancel()
174174
}
@@ -409,7 +409,7 @@ class Document: NSDocument, EvaluationDelegate {
409409
dimensions = "calculating…"
410410
}
411411

412-
if let selectedGeometry = self.selectedGeometry {
412+
if let selectedGeometry = selectedGeometry {
413413
var locationString = ""
414414
if let location = selectedGeometry.sourceLocation {
415415
locationString = "\nDefined on line \(location.line)"

0 commit comments

Comments
 (0)