Skip to content

Solve issue #2127 (excessive memory use while loading GLB) #2128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 28, 2023
Merged

Solve issue #2127 (excessive memory use while loading GLB) #2128

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6cb4ac0
Cache the materials
tonihele Oct 23, 2023
a7227c0
Try with resources to make sure we close the stream
tonihele Oct 23, 2023
0244dee
Conform cache naming to the other cache usages
tonihele Oct 23, 2023
cc1d57d
Just use the cache in the read method as the other caches do
tonihele Oct 23, 2023
47ab89b
Clone the material
tonihele Oct 23, 2023
efe77d4
Cache textures locally to avoid embedded textures to be read many times
tonihele Oct 24, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,9 +605,9 @@ protected byte[] getBytes(int bufferIndex, String uri, Integer bufferLength) thr
BinDataKey key = new BinDataKey(info.getKey().getFolder() + decoded);
InputStream input = (InputStream) info.getManager().loadAsset(key);
data = new byte[bufferLength];
DataInputStream dataStream = new DataInputStream(input);
dataStream.readFully(data);
dataStream.close();
try (DataInputStream dataStream = new DataInputStream(input)) {
dataStream.readFully(data);
}
}
} else {
// no URI, this should not happen in a gltf file, only in glb files.
Expand All @@ -619,6 +619,11 @@ protected byte[] getBytes(int bufferIndex, String uri, Integer bufferLength) thr
public Material readMaterial(int materialIndex) throws IOException {
assertNotNull(materials, "There is no material defined yet a mesh references one");

Material material = fetchFromCache("materials", materialIndex, Material.class);
if (material != null) {
return material.clone();
}

JsonObject matData = materials.get(materialIndex).getAsJsonObject();
JsonObject pbrMat = matData.getAsJsonObject("pbrMetallicRoughness");

Expand Down Expand Up @@ -688,7 +693,10 @@ public Material readMaterial(int materialIndex) throws IOException {

adapter.setParam("emissiveTexture", readTexture(matData.getAsJsonObject("emissiveTexture")));

return adapter.getMaterial();
material = adapter.getMaterial();
addToCache("materials", materialIndex, material, materials.size());

return material;
}

public void readCameras() throws IOException {
Expand Down Expand Up @@ -746,12 +754,17 @@ public Texture2D readTexture(JsonObject texture, boolean flip) throws IOExceptio
Integer textureIndex = getAsInteger(texture, "index");
assertNotNull(textureIndex, "Texture has no index");
assertNotNull(textures, "There are no textures, yet one is referenced by a material");

Texture2D texture2d = fetchFromCache("textures", textureIndex, Texture2D.class);
if (texture2d != null) {
return texture2d;
}

JsonObject textureData = textures.get(textureIndex).getAsJsonObject();
Integer sourceIndex = getAsInteger(textureData, "source");
Integer samplerIndex = getAsInteger(textureData, "sampler");

Texture2D texture2d = readImage(sourceIndex, flip);
texture2d = readImage(sourceIndex, flip);

if (samplerIndex != null) {
texture2d = readSampler(samplerIndex, texture2d);
Expand All @@ -761,6 +774,8 @@ public Texture2D readTexture(JsonObject texture, boolean flip) throws IOExceptio

texture2d = customContentManager.readExtensionAndExtras("texture", texture, texture2d);

addToCache("textures", textureIndex, texture2d, textures.size());

return texture2d;
}

Expand Down