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

Some clean up

Browse Source
This commit is contained in:
Nehon 2017-08-31 21:15:53 +02:00 committed by Rémy Bouquet
parent 7166906908
commit bed3cc8a17
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,8 +94,7 @@ public class GltfLoader implements AssetLoader {
String version = getAsString(asset, "version"); String version = getAsString(asset, "version");
String minVersion = getAsString(asset, "minVersion"); String minVersion = getAsString(asset, "minVersion");
if (!isSupported(version, minVersion)) { if (!isSupported(version, minVersion)) {
//TODO maybe just warn. gltf specs claims it will be backward compatible so at worst the user will miss some data. logger.log(Level.SEVERE, "Gltf Loader doesn't support this gltf version: " + version + (minVersion != null ? ("/" + minVersion) : ""));
throw new AssetLoadException("Gltf Loader doesn't support this gltf version: " + version + (minVersion != null ? ("/" + minVersion) : ""));
} }
scenes = docRoot.getAsJsonArray("scenes"); scenes = docRoot.getAsJsonArray("scenes");
@ -448,10 +447,8 @@ public class GltfLoader implements AssetLoader {
boolean normalized = getAsBoolean(accessor, "normalized", false); boolean normalized = getAsBoolean(accessor, "normalized", false);
//TODO support packed data //TODO min / max...don't know what to do about them.
//TODO min / max
//TODO sparse //TODO sparse
//TODO extras?
R data = populator.populate(bufferViewIndex, componentType, type, count, byteOffset, normalized); R data = populator.populate(bufferViewIndex, componentType, type, count, byteOffset, normalized);
data = customContentManager.readExtensionAndExtras("accessor", accessor, data); data = customContentManager.readExtensionAndExtras("accessor", accessor, data);
@ -478,9 +475,6 @@ public class GltfLoader implements AssetLoader {
populateBuffer(store, data, bufferSize, byteOffset + bvByteOffset, byteStride, numComponents, format); populateBuffer(store, data, bufferSize, byteOffset + bvByteOffset, byteStride, numComponents, format);
//TODO extras?
} }
public byte[] readData(int bufferIndex) throws IOException { public byte[] readData(int bufferIndex) throws IOException {
@ -1015,9 +1009,7 @@ public class GltfLoader implements AssetLoader {
//The child might be a Geom //The child might be a Geom
if (getAsInteger(childNode, "mesh") != null) { if (getAsInteger(childNode, "mesh") != null) {
//this is a geometry, let's load it as a spatial //this is a geometry, let's load it as a spatial
Spatial s = (Spatial) readNode(childIndex); bw.attachedSpatial = (Spatial) readNode(childIndex);
bw.attachedSpatial = s;
// addToCache("nodes", nodeIndex, s, nodes.size());
} }
} }
} }