From 1b43cb6d4a131ca918458f56c7c22d58cf1dfabb Mon Sep 17 00:00:00 2001 From: Rena4ka Date: Wed, 17 Sep 2014 10:09:46 +0400 Subject: [PATCH] Fix some FBX loader problems Fix exception when loading geometry without gui, fix loading nodes without models (nested nodes) --- .../java/com/jme3/scene/plugins/fbx/SceneLoader.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/SceneLoader.java b/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/SceneLoader.java index db0925643..bf9b95823 100644 --- a/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/SceneLoader.java +++ b/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/SceneLoader.java @@ -780,8 +780,8 @@ public class SceneLoader implements AssetLoader { int index = unIndexMap[i]; if(index > srcCount) throw new AssetLoadException("Invalid texcoord mapping. Unexpected lookup texcoord " + index + " from " + srcCount); - float u = (float) data.uv[2 * index + 0]; - float v = (float) data.uv[2 * index + 1]; + float u = index >= 0 ? (float) data.uv[2 * index + 0] : 0; + float v = index >= 0 ? (float) data.uv[2 * index + 1] : 0; tcBuf.put(u).put(v); } } @@ -959,10 +959,8 @@ public class SceneLoader implements AssetLoader { // Build mesh nodes for(long nodeId : modelDataMap.keySet()) { ModelData data = modelDataMap.get(nodeId); - if(data.type.equals("Mesh")) { - Node node = createNode(data); - modelMap.put(nodeId, node); - } + Node node = createNode(data); + modelMap.put(nodeId, node); } // Link model nodes into scene for(long modelId : modelMap.keySet()) {