Skip to content

Commit 9e9c7ba

Browse files
committed
Merge branch 'master' into vrm
2 parents b4b1345 + 60178b4 commit 9e9c7ba

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pod 'GLTFSceneKit'
1919
Add the following to your [Cartfile](https://github.com/Carthage/Carthage/blob/master/Documentation/Artifacts.md#cartfile):
2020

2121
```
22-
github "magicien/GLTFSceneKit" ~> 0.2.0
22+
github "magicien/GLTFSceneKit" ~> 0.4.0
2323
```
2424

2525
### Using [Swift Package Manager](https://swift.org/package-manager/)

Sources/GLTFSceneKit/GLTFUnarchiver.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public class GLTFUnarchiver {
7474
]
7575

7676
decoder.userInfo[GLTFExtrasCodingUserInfoKey] = _extras
77-
77+
7878
var jsonData = data
7979

8080
let magic: UInt32 = data.subdata(in: 0..<4).withUnsafeBytes { $0.pointee }
@@ -223,7 +223,7 @@ public class GLTFUnarchiver {
223223
guard let perspective = glCamera.perspective else {
224224
throw GLTFUnarchiveError.DataInconsistent("loadCamera: perspective is not defined")
225225
}
226-
226+
227227
// SceneKit automatically calculates the viewing angle in the other direction to match
228228
// the aspect ratio of the view displaying the scene
229229
camera.fieldOfView = CGFloat(perspective.yfov * 180.0 / Float.pi)
@@ -1167,14 +1167,14 @@ public class GLTFUnarchiver {
11671167
let target = targets[targetIndex]
11681168
let sources = try self.loadAttributes(target)
11691169
let geometry = SCNGeometry(sources: sources, elements: nil)
1170-
1170+
11711171
if let extras = glMesh.extras, let extrasTargetNames = extras.extensions["TargetNames"] as? GLTFExtrasTargetNames, let targetNames = extrasTargetNames.targetNames {
11721172
geometry.name = targetNames[targetIndex]
11731173
}
11741174
else if let accessor = self.json.accessors?[target["POSITION"]!], let name = accessor.name {
11751175
geometry.name = name
11761176
}
1177-
1177+
11781178
morpher.targets.append(geometry)
11791179
let weightPath = "childNodes[0].childNodes[\(i)].morpher.weights[\(targetIndex)]"
11801180
weightPaths.append(weightPath)

0 commit comments

Comments
 (0)