Revert "Merge pull request #2553 from riccardobl/gltfimp"

This reverts commit 169f395, reversing
changes made to fab757b.

Author: riccardobl

jme3-core/src/main/java/com/jme3/util/BufferInputStream.java

@@ -31,11 +31,11 @@
  */
 package jme3test.model;
 
+import com.jme3.anim.AnimClip;
 import com.jme3.anim.AnimComposer;
 import com.jme3.anim.SkinningControl;
 import com.jme3.app.*;
 import com.jme3.asset.plugins.FileLocator;
-import com.jme3.asset.plugins.UrlLocator;
 import com.jme3.input.KeyInput;
 import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.KeyTrigger;
@@ -82,7 +82,6 @@ public void simpleInitApp() {
 
         String folder = System.getProperty("user.home");
         assetManager.registerLocator(folder, FileLocator.class);
-        assetManager.registerLocator("https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/refs/heads/main/", UrlLocator.class);
 
         // cam.setLocation(new Vector3f(4.0339394f, 2.645184f, 6.4627485f));
         // cam.setRotation(new Quaternion(-0.013950467f, 0.98604023f, -0.119502485f, -0.11510504f));
@@ -153,14 +152,7 @@ public void simpleInitApp() {
 
 //        loadModel("Models/gltf/Corset/glTF/Corset.gltf", new Vector3f(0, -1, 0), 20f);
 //        loadModel("Models/gltf/BoxInterleaved/glTF/BoxInterleaved.gltf", new Vector3f(0, 0, 0), 1f);
-
-        // From url locator
-
-        // loadModel("Models/AnimatedColorsCube/glTF/AnimatedColorsCube.gltf", new Vector3f(0, 0f, 0), 0.1f);
-        // loadModel("Models/AntiqueCamera/glTF/AntiqueCamera.gltf", new Vector3f(0, 0, 0), 0.1f);
-        // loadModel("Models/AnimatedMorphCube/glTF/AnimatedMorphCube.gltf", new Vector3f(0, 0, 0), 0.1f);
-        // loadModel("Models/AnimatedMorphCube/glTF-Binary/AnimatedMorphCube.glb", new Vector3f(0, 0, 0), 0.1f);
-
+        
         probeNode.attachChild(assets.get(0));
 
         ChaseCameraAppState chaseCam = new ChaseCameraAppState();
@@ -239,10 +231,7 @@ private void loadModel(String path, Vector3f offset, float scale) {
     private void loadModel(String path, Vector3f offset, Vector3f scale) {
         GltfModelKey k = new GltfModelKey(path);
         //k.setKeepSkeletonPose(true);
-        long t  = System.currentTimeMillis();        
         Spatial s = assetManager.loadModel(k);
-        System.out.println("Load time : " + (System.currentTimeMillis() - t) + " ms");
-        
         s.scale(scale.x, scale.y, scale.z);
         s.move(offset);
         assets.add(s);

jme3-examples/src/main/java/jme3test/model/TestGltfLoading.java

@@ -32,11 +32,9 @@
 package com.jme3.scene.plugins.gltf;
 
 import com.jme3.asset.AssetInfo;
-import com.jme3.util.BufferUtils;
 import com.jme3.util.LittleEndien;
 
 import java.io.*;
-import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -52,12 +50,12 @@ public class GlbLoader extends GltfLoader {
      */
     private static final Logger logger = Logger.getLogger(GlbLoader.class.getName());
 
-    private ArrayList<ByteBuffer> data = new ArrayList<>();
+    private ArrayList<byte[]> data = new ArrayList<>();
 
     @Override
     public Object load(AssetInfo assetInfo) throws IOException {
         data.clear();
-        LittleEndien stream = new LittleEndien(new BufferedInputStream(assetInfo.openStream()));
+        LittleEndien stream = new LittleEndien(new DataInputStream(assetInfo.openStream()));
         /* magic */ stream.readInt();
 
         int version = stream.readInt();
@@ -78,11 +76,11 @@ public Object load(AssetInfo assetInfo) throws IOException {
             int chunkType = stream.readInt();
             if (chunkType == JSON_TYPE) {
                 json = new byte[chunkLength];
-                GltfUtils.readToByteArray(stream, json, chunkLength);
+                stream.read(json);
             } else {
-                ByteBuffer buff = BufferUtils.createByteBuffer(chunkLength);
-                GltfUtils.readToByteBuffer(stream, buff, chunkLength);
-                data.add(buff);
+                byte[] bin = new byte[chunkLength];
+                stream.read(bin);
+                data.add(bin);
             }
             //8 is the byte size of the 2 ints chunkLength and chunkType.
             length -= chunkLength + 8;
@@ -95,7 +93,7 @@ public Object load(AssetInfo assetInfo) throws IOException {
     }
 
     @Override
-    protected ByteBuffer getBytes(int bufferIndex, String uri, Integer bufferLength) throws IOException {
+    protected byte[] getBytes(int bufferIndex, String uri, Integer bufferLength) throws IOException {
         return data.get(bufferIndex);
     }
 

jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GlbLoader.java

@@ -48,14 +48,11 @@
 import static com.jme3.scene.plugins.gltf.GltfUtils.*;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture2D;
-import com.jme3.util.BufferInputStream;
-import com.jme3.util.BufferUtils;
 import com.jme3.util.IntMap;
 import com.jme3.util.mikktspace.MikktspaceTangentGenerator;
 import java.io.*;
 import java.net.URLDecoder;
 import java.nio.Buffer;
-import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 import java.util.*;
 import java.util.logging.Level;
@@ -112,6 +109,7 @@ public Object load(AssetInfo assetInfo) throws IOException {
 
     protected Object loadFromStream(AssetInfo assetInfo, InputStream stream) throws IOException {
         try {
+            dataCache.clear();
             info = assetInfo;
             skinnedSpatials.clear();
             rootNode = new Node();
@@ -183,27 +181,6 @@ protected Object loadFromStream(AssetInfo assetInfo, InputStream stream) throws
             throw new AssetLoadException("An error occurred loading " + assetInfo.getKey().getName(), e);
         } finally {
             stream.close();
-            dataCache.clear();
-            skinBuffers.clear();
-            skinnedSpatials.clear();
-            info = null;
-            docRoot = null;
-            rootNode = null;
-            defaultMat = null;
-            accessors = null;
-            bufferViews = null;
-            buffers = null;
-            scenes = null;
-            nodes = null;
-            meshes = null;
-            materials = null;
-            textures = null;
-            images = null;
-            samplers = null;
-            animations = null;
-            skins = null;
-            cameras = null;
-            useNormalsFlag = false;
         }
     }
 
@@ -576,15 +553,11 @@ public Object readBuffer(Integer bufferViewIndex, int byteOffset, int count, Obj
         // Not sure it's useful for us, but I guess it's useful when you map data directly to the GPU.
         // int target = getAsInteger(bufferView, "target", 0);
 
-        ByteBuffer data = readData(bufferIndex);
+        byte[] data = readData(bufferIndex);
         data = customContentManager.readExtensionAndExtras("bufferView", bufferView, data);
 
-        if(!(data instanceof ByteBuffer)){
-            throw new IOException("Buffer data is not a NIO Buffer");
-        }
-
         if (store == null) {
-            store = BufferUtils.createByteBuffer(byteLength);
+            store = new byte[byteLength];
         }
 
         if (count == -1) {
@@ -596,40 +569,14 @@ public Object readBuffer(Integer bufferViewIndex, int byteOffset, int count, Obj
         return store;
     }
 
-    public Buffer viewBuffer(Integer bufferViewIndex, int byteOffset, int count,  
-            int numComponents, VertexBuffer.Format originalFormat,  VertexBuffer.Format targetFormat) throws IOException {
-        JsonObject bufferView = bufferViews.get(bufferViewIndex).getAsJsonObject();
-        Integer bufferIndex = getAsInteger(bufferView, "buffer");
-        assertNotNull(bufferIndex, "No buffer defined for bufferView " + bufferViewIndex);
-        int bvByteOffset = getAsInteger(bufferView, "byteOffset", 0);
-        Integer byteLength = getAsInteger(bufferView, "byteLength");
-        assertNotNull(byteLength, "No byte length defined for bufferView " + bufferViewIndex);
-        int byteStride = getAsInteger(bufferView, "byteStride", 0);
-
-        ByteBuffer data = readData(bufferIndex);
-        data = customContentManager.readExtensionAndExtras("bufferView", bufferView, data);
-
-        if(!(data instanceof ByteBuffer)){
-            throw new IOException("Buffer data is not a NIO Buffer");
-        }
- 
-
-        if (count == -1) {
-            count = byteLength;
-        }
-
-        return GltfUtils.getBufferView(data, byteOffset + bvByteOffset, count, byteStride, numComponents, originalFormat, targetFormat );
-
-    }
-
-    public ByteBuffer readData(int bufferIndex) throws IOException {
+    public byte[] readData(int bufferIndex) throws IOException {
         assertNotNull(buffers, "No buffer defined");
 
         JsonObject buffer = buffers.get(bufferIndex).getAsJsonObject();
         String uri = getAsString(buffer, "uri");
         Integer bufferLength = getAsInteger(buffer, "byteLength");
         assertNotNull(bufferLength, "No byteLength defined for buffer " + bufferIndex);
-        ByteBuffer data = (ByteBuffer) fetchFromCache("buffers", bufferIndex, Object.class);
+        byte[] data = (byte[]) fetchFromCache("buffers", bufferIndex, Object.class);
         if (data != null) {
             return data;
         }
@@ -641,12 +588,12 @@ public ByteBuffer readData(int bufferIndex) throws IOException {
         return data;
     }
 
-    protected ByteBuffer getBytes(int bufferIndex, String uri, Integer bufferLength) throws IOException {
-        ByteBuffer data;
+    protected byte[] getBytes(int bufferIndex, String uri, Integer bufferLength) throws IOException {
+        byte[] data;
         if (uri != null) {
             if (uri.startsWith("data:")) {
                 // base 64 embed data
-                data = BufferUtils.createByteBuffer(Base64.getDecoder().decode(uri.substring(uri.indexOf(",") + 1)));
+                data = Base64.getDecoder().decode(uri.substring(uri.indexOf(",") + 1));
             } else {
                 // external file let's load it
                 String decoded = decodeUri(uri);
@@ -656,11 +603,11 @@ protected ByteBuffer getBytes(int bufferIndex, String uri, Integer bufferLength)
                 }
 
                 BinDataKey key = new BinDataKey(info.getKey().getFolder() + decoded);
-                try(InputStream input = (InputStream) info.getManager().loadAsset(key)){
-                    data = BufferUtils.createByteBuffer(bufferLength);
-                    GltfUtils.readToByteBuffer(input, data, bufferLength);
+                InputStream input = (InputStream) info.getManager().loadAsset(key);
+                data = new byte[bufferLength];
+                try (DataInputStream dataStream = new DataInputStream(input)) {
+                    dataStream.readFully(data);
                 }
-               
             }
         } else {
             // no URI, this should not happen in a gltf file, only in glb files.
@@ -837,23 +784,19 @@ public Texture2D readImage(int sourceIndex, boolean flip) throws IOException {
         if (uri == null) {
             assertNotNull(bufferView, "Image " + sourceIndex + " should either have an uri or a bufferView");
             assertNotNull(mimeType, "Image " + sourceIndex + " should have a mimeType");
-            ByteBuffer data = (ByteBuffer) viewBuffer(bufferView, 0, -1, 1, VertexBuffer.Format.Byte, VertexBuffer.Format.Byte);
-
+            byte[] data = (byte[]) readBuffer(bufferView, 0, -1, null, 1, VertexBuffer.Format.Byte);
             String extension = mimeType.split("/")[1];
             TextureKey key = new TextureKey("image" + sourceIndex + "." + extension, flip);
-            try(BufferedInputStream bis = new BufferedInputStream(new BufferInputStream(data))){
-                result = (Texture2D) info.getManager().loadAssetFromStream(key, bis);
-            }
+            result = (Texture2D) info.getManager().loadAssetFromStream(key, new ByteArrayInputStream(data));
+
         } else if (uri.startsWith("data:")) {
             // base64 encoded image
             String[] uriInfo = uri.split(",");
-            ByteBuffer data = BufferUtils.createByteBuffer(Base64.getDecoder().decode(uriInfo[1]));
+            byte[] data = Base64.getDecoder().decode(uriInfo[1]);
             String headerInfo = uriInfo[0].split(";")[0];
             String extension = headerInfo.split("/")[1];
             TextureKey key = new TextureKey("image" + sourceIndex + "." + extension, flip);
-            try(BufferedInputStream bis = new BufferedInputStream(new BufferInputStream(data))){
-                result = (Texture2D) info.getManager().loadAssetFromStream(key, bis);
-            }
+            result = (Texture2D) info.getManager().loadAssetFromStream(key, new ByteArrayInputStream(data));
         } else {
             // external file image
             String decoded = decodeUri(uri);
@@ -1395,14 +1338,13 @@ public VertexBuffer populate(Integer bufferViewIndex, int componentType, String
             }
             int numComponents = getNumberOfComponents(type);
 
+            Buffer buff = VertexBuffer.createBuffer(format, numComponents, count);
             int bufferSize = numComponents * count;
-            Buffer buff;
             if (bufferViewIndex == null) {
-                buff = VertexBuffer.createBuffer(format, numComponents, count);
                 // no referenced buffer, specs says to pad the buffer with zeros.
                 padBuffer(buff, bufferSize);
             } else {
-                buff = (Buffer) viewBuffer(bufferViewIndex, byteOffset, count, numComponents, originalFormat, format);
+                readBuffer(bufferViewIndex, byteOffset, count, buff, numComponents, originalFormat);
             }
 
             if (bufferType == VertexBuffer.Type.Index) {