Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Target names read from mesh.extras.targetNames #38

Merged
merged 3 commits into from
Jul 18, 2021
Merged

Target names read from mesh.extras.targetNames #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59cddd0
extra target names
j6lim Aug 31, 2019
efc285a
var -> let
j6lim Aug 31, 2019
c791990
morph target names read from extras.targetName
j6lim Aug 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions GLTFSceneKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
1213286D231A535600083524 /* GLTFExtrasTargetNames.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1213286C231A535600083524 /* GLTFExtrasTargetNames.swift */; };
12132870231A552900083524 /* GLTFExtrasTargetNames.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1213286C231A535600083524 /* GLTFExtrasTargetNames.swift */; };
9DA74DB61FD5F8D9007F0749 /* GLTFShaderModifierSurface_alphaModeBlend.shader in Resources */ = {isa = PBXBuildFile; fileRef = 9DA74DB31FD5F54F007F0749 /* GLTFShaderModifierSurface_alphaModeBlend.shader */; };
9DA74DB71FD5FBAC007F0749 /* GLTFShaderModifierSurface_alphaModeBlend.shader in Resources */ = {isa = PBXBuildFile; fileRef = 9DA74DB31FD5F54F007F0749 /* GLTFShaderModifierSurface_alphaModeBlend.shader */; };
DD10459A1F47723D004B20CE /* GLTFTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD1045991F47723D004B20CE /* GLTFTypes.swift */; };
Expand Down Expand Up @@ -166,6 +168,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
1213286C231A535600083524 /* GLTFExtrasTargetNames.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GLTFExtrasTargetNames.swift; sourceTree = "<group>"; };
9DA74DB31FD5F54F007F0749 /* GLTFShaderModifierSurface_alphaModeBlend.shader */ = {isa = PBXFileReference; lastKnownFileType = text; path = GLTFShaderModifierSurface_alphaModeBlend.shader; sourceTree = "<group>"; };
DD071E031F55ED1200F00567 /* GLTFShaderModifierSurface.shader */ = {isa = PBXFileReference; lastKnownFileType = text; path = GLTFShaderModifierSurface.shader; sourceTree = "<group>"; };
DD1045991F47723D004B20CE /* GLTFTypes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GLTFTypes.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -416,6 +419,7 @@
DDE6FD3F1F466F2000CB11D6 /* GLTFTexture.swift */,
DDE6FD411F466F2000CB11D6 /* GLTFTextureInfo.swift */,
DD2E982B1F4CF55400D47C89 /* extensions */,
1213286C231A535600083524 /* GLTFExtrasTargetNames.swift */,
);
path = schema;
sourceTree = "<group>";
Expand Down Expand Up @@ -690,6 +694,7 @@
DD3EB09C1F524790009F32D2 /* GLTFUnarchiver.swift in Sources */,
DD3EB0861F524783009F32D2 /* GLTFCameraPerspective.swift in Sources */,
DD3EB09E1F524790009F32D2 /* GLTFTypes.swift in Sources */,
12132870231A552900083524 /* GLTFExtrasTargetNames.swift in Sources */,
DD3EB0931F524783009F32D2 /* GLTFMeshPrimitive.swift in Sources */,
DD3EB08E1F524783009F32D2 /* GLTFMaterial.swift in Sources */,
DD3EB0811F524783009F32D2 /* GLTFAsset.swift in Sources */,
Expand Down Expand Up @@ -738,6 +743,7 @@
DDE6FD6D1F466F3600CB11D6 /* GLTFCameraPerspective.swift in Sources */,
DDE6FD7A1F466F3600CB11D6 /* GLTFMeshPrimitive.swift in Sources */,
DDE6FD751F466F3600CB11D6 /* GLTFMaterial.swift in Sources */,
1213286D231A535600083524 /* GLTFExtrasTargetNames.swift in Sources */,
DDE6FD681F466F3600CB11D6 /* GLTFAsset.swift in Sources */,
DDE6FD671F466F3600CB11D6 /* GLTFAnimationSampler.swift in Sources */,
DDE6FD7C1F466F3600CB11D6 /* GLTFSampler.swift in Sources */,
Expand Down
12 changes: 11 additions & 1 deletion Source/Common/GLTFUnarchiver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ public class GLTFUnarchiver {
extensions?.forEach { (ext) in _extensions[ext.key] = ext.value }

decoder.userInfo[GLTFExtensionCodingUserInfoKey] = _extensions

let _extras = [
"TargetNames": GLTFExtrasTargetNames.self
]

decoder.userInfo[GLTFExtrasCodingUserInfoKey] = _extras

var jsonData = data

let magic: UInt32 = data.subdata(in: 0..<4).withUnsafeBytes { $0.pointee }
Expand Down Expand Up @@ -1163,7 +1170,10 @@ public class GLTFUnarchiver {
let sources = try self.loadAttributes(target)
let geometry = SCNGeometry(sources: sources, elements: nil)

if let accessor = self.json.accessors?[target["POSITION"]!], let name = accessor.name {
if let extras = glMesh.extras, let extrasTargetNames = extras.extensions["TargetNames"] as? GLTFExtrasTargetNames, let targetNames = extrasTargetNames.targetNames {
geometry.name = targetNames[targetIndex]
}
else if let accessor = self.json.accessors?[target["POSITION"]!], let name = accessor.name {
geometry.name = name
}

Expand Down
18 changes: 18 additions & 0 deletions Source/Common/schema/GLTFExtrasTargetNames.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//
// GLTFExtrasTargetNames.swift
//
// GLTFMesh.Extras.TargetNames
// An extra field to store morph target names
//

import Foundation

struct GLTFExtrasTargetNames : Codable {

/** An array of morph target names */
let targetNames: [String]?

private enum CodingKeys: String, CodingKey {
case targetNames
}
}