From 0d8b86b66f1df02d102101aeb4f1aa4185d2f3a2 Mon Sep 17 00:00:00 2001 From: Nehon Date: Sun, 24 Dec 2017 22:16:18 +0100 Subject: [PATCH] Add default config for glb loader --- .gitignore | 1 + jme3-core/src/main/resources/com/jme3/asset/General.cfg | 1 + .../src/gltf/java/com/jme3/scene/plugins/gltf/GlbLoader.java | 4 ---- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dc6d9aec8..ce4b6840a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ **/.classpath **/.settings **/.project +**/out /.gradle/ /.nb-gradle/ /.idea/ diff --git a/jme3-core/src/main/resources/com/jme3/asset/General.cfg b/jme3-core/src/main/resources/com/jme3/asset/General.cfg index 80b038ba6..2b3b25d93 100644 --- a/jme3-core/src/main/resources/com/jme3/asset/General.cfg +++ b/jme3-core/src/main/resources/com/jme3/asset/General.cfg @@ -25,3 +25,4 @@ LOADER com.jme3.shader.plugins.GLSLLoader : vert, frag, geom, tsctrl, tseval, gl LOADER com.jme3.scene.plugins.fbx.FbxLoader : fbx LOADER com.jme3.scene.plugins.gltf.GltfLoader : gltf LOADER com.jme3.scene.plugins.gltf.BinLoader : bin +LOADER com.jme3.scene.plugins.gltf.GlbLoader : glb diff --git a/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GlbLoader.java b/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GlbLoader.java index 7ca499c9d..c3fe31103 100644 --- a/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GlbLoader.java +++ b/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GlbLoader.java @@ -22,9 +22,6 @@ public class GlbLoader extends GltfLoader { int magic = stream.readInt(); int version = stream.readInt(); int length = stream.readInt(); - System.err.println(magic == GLTF_MAGIC ? "gltf" : "no no no"); - System.err.println(version); - System.err.println(length); byte[] json = null; @@ -37,7 +34,6 @@ public class GlbLoader extends GltfLoader { if (chunkType == JSON_TYPE) { json = new byte[chunkLength]; stream.read(json); - System.err.println(new String(json)); } else { byte[] bin = new byte[chunkLength]; stream.read(bin);