Skip to content

Improved fix for IndexOutOfBoundsException #2403

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
yaRnMcDonuts merged 1 commit into from
Apr 21, 2025
Merged

Improved fix for IndexOutOfBoundsException #2403

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 23 additions & 27 deletions jme3-core/src/main/java/com/jme3/scene/BatchNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,6 @@
*/
package com.jme3.scene;

import java.nio.Buffer;
import java.nio.FloatBuffer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;

import com.jme3.collision.Collidable;
import com.jme3.collision.CollisionResults;
import com.jme3.material.Material;
Expand All @@ -50,6 +41,14 @@
import com.jme3.util.TempVars;
import com.jme3.util.clone.Cloner;
import com.jme3.util.clone.JmeCloneable;
import java.nio.Buffer;
import java.nio.FloatBuffer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;

/**
* BatchNode holds geometries that are a batched version of all the geometries that are in its sub scenegraph.
Expand Down Expand Up @@ -188,6 +187,11 @@ protected void doBatch() {
Map<Material, List<Geometry>> matMap = new HashMap<>();
int nbGeoms = 0;

// Recalculate the maxVertCount during gatherGeometries() so it's always
// accurate. Keep track of what it used to be so we know if temp arrays need
// to be reallocated.
int oldMaxVertCount = maxVertCount;
maxVertCount = 0;
gatherGeometries(matMap, this, needsFullRebatch);
if (needsFullRebatch) {
for (Batch batch : batches.getArray()) {
Expand All @@ -196,10 +200,6 @@ protected void doBatch() {
batches.clear();
batchesByGeom.clear();
}
//only reset maxVertCount if there is something new to batch
if (matMap.size() > 0) {
maxVertCount = 0;
}

for (Map.Entry<Material, List<Geometry>> entry : matMap.entrySet()) {
Mesh m = new Mesh();
Expand Down Expand Up @@ -244,8 +244,8 @@ protected void doBatch() {
logger.log(Level.FINE, "Batched {0} geometries in {1} batches.", new Object[]{nbGeoms, batches.size()});
}

//init the temp arrays if something has been batched only.
if (matMap.size() > 0) {
//init the temp arrays if the size has changed
if (oldMaxVertCount != maxVertCount) {
initTempFloatArrays();
}
}
Expand Down Expand Up @@ -285,6 +285,13 @@ private void gatherGeometries(Map<Material, List<Geometry>> map, Spatial n, bool

if (!isBatch(n) && n.getBatchHint() != BatchHint.Never) {
Geometry g = (Geometry) n;

// Need to recalculate the max vert count whether we are rebatching this
// particular geometry or not.
if (maxVertCount < g.getVertexCount()) {
maxVertCount = g.getVertexCount();
}

if (!g.isGrouped() || rebatch) {
if (g.getMaterial() == null) {
throw new IllegalStateException("No material is set for Geometry: " + g.getName() + " please set a material before batching");
Expand Down Expand Up @@ -385,11 +392,8 @@ private void mergeGeometries(Mesh outMesh, List<Geometry> geometries) {
totalVerts += geom.getVertexCount();
totalTris += geom.getTriangleCount();
totalLodLevels = Math.min(totalLodLevels, geom.getMesh().getNumLodLevels());
if (maxVertCount < geom.getVertexCount()) {
maxVertCount = geom.getVertexCount();
}

Mesh.Mode listMode;
//float listLineWidth = 1f;
int components;
switch (geom.getMesh().getMode()) {
case Points:
Expand Down Expand Up @@ -530,7 +534,6 @@ private void doTransforms(FloatBuffer bindBufPos, FloatBuffer bindBufNorm, Float
Vector3f norm = vars.vect2;
Vector3f tan = vars.vect3;

validateTempFloatArrays(end - start);
int length = (end - start) * 3;
int tanLength = (end - start) * 4;

Expand Down Expand Up @@ -611,13 +614,6 @@ private void doTransforms(FloatBuffer bindBufPos, FloatBuffer bindBufNorm, Float
}
}

private void validateTempFloatArrays(int vertCount) {
if (maxVertCount < vertCount) {
maxVertCount = vertCount;
initTempFloatArrays();
}
}

private void initTempFloatArrays() {
//TODO these arrays should be allocated by chunk instead to avoid recreating them each time the batch is changed.
tmpFloat = new float[maxVertCount * 3];
Expand Down