From 96b95b9a1e1593bb81a3e63da92799e2152a7ef9 Mon Sep 17 00:00:00 2001
From: Nehon <remy.bouquet@gmail.com>
Date: Sun, 7 Jan 2018 15:34:01 +0100
Subject: [PATCH] Fixes issues in the gltf loader when there are several skins

---
 .../jme3/scene/plugins/gltf/GltfLoader.java   | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java b/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java
index 9796b046d..0b1350845 100644
--- a/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java
+++ b/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java
@@ -924,6 +924,7 @@ public class GltfLoader implements AssetLoader {
             //no skins, no bone animation.
             return;
         }
+        List<JsonArray> allJoints = new ArrayList<>();
         for (int index = 0; index < skins.size(); index++) {
             JsonObject skin = skins.get(index).getAsJsonObject();
 
@@ -933,6 +934,15 @@ public class GltfLoader implements AssetLoader {
 
             JsonArray joints = skin.getAsJsonArray("joints");
             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),
             //since the skeleton in not guaranteed to be exported in bind pose.
@@ -1063,13 +1073,17 @@ public class GltfLoader implements AssetLoader {
         if (children != null) {
             for (JsonElement child : children) {
                 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);
                 if (cbw != null) {
                     bw.bone.addChild(cbw.bone);
                     bw.children.add(childIndex);
                 } else {
                     //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();
                     readChild(n, child);
                     Spatial s = n.getChild(0);
@@ -1086,12 +1100,15 @@ public class GltfLoader implements AssetLoader {
         for (SkinData skinData : skinnedSpatials.keySet()) {
             List<Spatial> spatials = skinnedSpatials.get(skinData);
             Spatial spatial = skinData.parent;
+            if (spatials.isEmpty()) {
+                continue;
+            }
 
             if (spatials.size() >= 1) {
                 spatial = findCommonAncestor(spatials);
             }
 
-            if (spatial != skinData.parent) {
+            if (skinData.parent != null && spatial != skinData.parent) {
                 skinData.rootBoneTransformOffset = spatial.getWorldTransform().invert();
                 skinData.rootBoneTransformOffset.combineWithParent(skinData.parent.getWorldTransform());
             }