sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes issues in the gltf loader when there are several skins

Browse Source
This commit is contained in:
Nehon 2018-01-07 15:34:01 +01:00
parent 12004217d1
commit 96b95b9a1e
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java
View File

@ -924,6 +924,7 @@ public class GltfLoader implements AssetLoader {
//no skins, no bone animation. //no skins, no bone animation.
return; return;
} }
List<JsonArray> allJoints = new ArrayList<>();
for (int index = 0; index < skins.size(); index++) { for (int index = 0; index < skins.size(); index++) {
JsonObject skin = skins.get(index).getAsJsonObject(); JsonObject skin = skins.get(index).getAsJsonObject();
@ -933,6 +934,15 @@ public class GltfLoader implements AssetLoader {
JsonArray joints = skin.getAsJsonArray("joints"); JsonArray joints = skin.getAsJsonArray("joints");
assertNotNull(joints, "No joints defined for skin"); assertNotNull(joints, "No joints defined for skin");
int idx = allJoints.indexOf(joints);
if (idx >= 0) {
//skin already exists let's just set it in the cache
SkinData sd = fetchFromCache("skins", idx, SkinData.class);
addToCache("skins", index, sd, nodes.size());
continue;
} else {
allJoints.add(joints);
}
//These inverse bind matrices, once inverted again, will give us the real bind pose of the bones (in model space), //These inverse bind matrices, once inverted again, will give us the real bind pose of the bones (in model space),
//since the skeleton in not guaranteed to be exported in bind pose. //since the skeleton in not guaranteed to be exported in bind pose.
@ -1063,13 +1073,17 @@ public class GltfLoader implements AssetLoader {
if (children != null) { if (children != null) {
for (JsonElement child : children) { for (JsonElement child : children) {
int childIndex = child.getAsInt(); int childIndex = child.getAsInt();
if (bw.children.contains(childIndex)) {
//bone already has the child in its children
continue;
}
BoneWrapper cbw = fetchFromCache("nodes", childIndex, BoneWrapper.class); BoneWrapper cbw = fetchFromCache("nodes", childIndex, BoneWrapper.class);
if (cbw != null) { if (cbw != null) {
bw.bone.addChild(cbw.bone); bw.bone.addChild(cbw.bone);
bw.children.add(childIndex); bw.children.add(childIndex);
} else { } else {
//The child might be a Node //The child might be a Node
//Creating a dummy node to reed the subgraph //Creating a dummy node to read the subgraph
Node n = new Node(); Node n = new Node();
readChild(n, child); readChild(n, child);
Spatial s = n.getChild(0); Spatial s = n.getChild(0);
@ -1086,12 +1100,15 @@ public class GltfLoader implements AssetLoader {
for (SkinData skinData : skinnedSpatials.keySet()) { for (SkinData skinData : skinnedSpatials.keySet()) {
List<Spatial> spatials = skinnedSpatials.get(skinData); List<Spatial> spatials = skinnedSpatials.get(skinData);
Spatial spatial = skinData.parent; Spatial spatial = skinData.parent;
if (spatials.isEmpty()) {
continue;
}
if (spatials.size() >= 1) { if (spatials.size() >= 1) {
spatial = findCommonAncestor(spatials); spatial = findCommonAncestor(spatials);
} }
if (spatial != skinData.parent) { if (skinData.parent != null && spatial != skinData.parent) {
skinData.rootBoneTransformOffset = spatial.getWorldTransform().invert(); skinData.rootBoneTransformOffset = spatial.getWorldTransform().invert();
skinData.rootBoneTransformOffset.combineWithParent(skinData.parent.getWorldTransform()); skinData.rootBoneTransformOffset.combineWithParent(skinData.parent.getWorldTransform());
} }