Skip to content

removed unnecessary extra SCNNodes during loading #37

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

Open
digitallysavvy wants to merge 2 commits into
base: master
Choose a base branch
from
Open

removed unnecessary extra SCNNodes during loading #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5751d2
removed unnecessary extra SCNNodes during loading
digitallysavvy Aug 3, 2019
e242a0b
ensure nodes keep the proper name
digitallysavvy Dec 10, 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
29 changes: 16 additions & 13 deletions Source/Common/GLTFUnarchiver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,8 +453,8 @@ public class GLTFUnarchiver {
bufferView = bufferView.subdata(in: dataOffset..<dataOffset + dataStride * vectorCount - padding)

let geometrySource = SCNGeometrySource(data: bufferView, semantic: semantic, vectorCount: vectorCount, usesFloatComponents: usesFloatComponents, componentsPerVector: componentsPerVector, bytesPerComponent: bytesPerComponent, dataOffset: 0, dataStride: dataStride)

#else
#error("GLTF Bug still getting through in build")
let geometrySource = SCNGeometrySource(data: bufferView, semantic: semantic, vectorCount: vectorCount, usesFloatComponents: usesFloatComponents, componentsPerVector: componentsPerVector, bytesPerComponent: bytesPerComponent, dataOffset: dataOffset, dataStride: dataStride)
#endif

Expand Down Expand Up @@ -1033,7 +1033,6 @@ public class GLTFUnarchiver {
}

material.isDoubleSided = glMaterial.doubleSided

material.shaderModifiers = [
.surface: try! String(contentsOf: URL(fileURLWithPath: Bundle(for: GLTFUnarchiver.self).path(forResource: "GLTFShaderModifierSurface", ofType: "shader")!), encoding: String.Encoding.utf8)
]
Expand Down Expand Up @@ -1100,7 +1099,7 @@ public class GLTFUnarchiver {
var weightPaths = [String]()
for i in 0..<glMesh.primitives.count {
let primitive = glMesh.primitives[i]
let primitiveNode = SCNNode()

//var sources = [SCNGeometrySource]()
//var vertexSource: SCNGeometrySource?
//var normalSource: SCNGeometrySource?
Expand Down Expand Up @@ -1146,7 +1145,7 @@ public class GLTFUnarchiver {
}

let geometry = SCNGeometry(sources: sources, elements: elements)
primitiveNode.geometry = geometry
node.geometry = geometry

if let materialIndex = primitive.material {
let material = try self.loadMaterial(index: materialIndex)
Expand All @@ -1173,10 +1172,9 @@ public class GLTFUnarchiver {

}
morpher.calculationMode = .additive
primitiveNode.morpher = morpher
node.morpher = morpher
}

node.addChildNode(primitiveNode)
}

// TODO: set default weights
Expand Down Expand Up @@ -1596,22 +1594,27 @@ public class GLTFUnarchiver {
throw GLTFUnarchiveError.DataInconsistent("loadNode: nodes is not defined")
}
let glNode = nodes[index]
let scnNode = SCNNode()
var scnNode = SCNNode()
self.nodes[index] = scnNode

if let name = glNode.name {
let name = glNode.name
if name != nil {
scnNode.name = name
}
if let camera = glNode.camera {
scnNode.camera = try self.loadCamera(index: camera)
}
if let mesh = glNode.mesh {
let meshNode = try self.loadMesh(index: mesh)
scnNode.addChildNode(meshNode)
scnNode = try self.loadMesh(index: mesh)

// Keep the main node's name, not that of the mesh
if (name != nil) {
scnNode.name = name
}

var weightPaths = [String]()
for i in 0..<meshNode.childNodes.count {
let primitive = meshNode.childNodes[i]
for i in 0..<scnNode.childNodes.count {
let primitive = scnNode.childNodes[i]
if let morpher = primitive.morpher {
for j in 0..<morpher.targets.count {
let path = "childNodes[0].childNodes[\(i)].morpher.weights[\(j)]"
Expand All @@ -1622,7 +1625,7 @@ public class GLTFUnarchiver {
scnNode.setValue(weightPaths, forUndefinedKey: "weightPaths")

if let skin = glNode.skin {
_ = try self.loadSkin(index: skin, meshNode: meshNode)
_ = try self.loadSkin(index: skin, meshNode: scnNode)
//scnNode.skinner = skinner
}
}
Expand Down