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

Revert 04f8956

Browse Source 
The inconsistent compare function errors are due to user error, not engine error.
This commit is contained in:
shadowislord 2014-09-07 15:38:07 -04:00
parent 1d29bc3197
commit 73fc9bc1fd
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jme3-core/src/main/java/com/jme3/renderer/queue/GeometryList.java
View File

@ -33,7 +33,7 @@ package com.jme3.renderer.queue;
import com.jme3.renderer.Camera; import com.jme3.renderer.Camera;
import com.jme3.scene.Geometry; import com.jme3.scene.Geometry;
import com.jme3.util.SortUtil; import com.jme3.util.ListSort;
/** /**
* This class is a special purpose list of {@link Geometry} objects for render * This class is a special purpose list of {@link Geometry} objects for render
@ -48,7 +48,7 @@ public class GeometryList {
private static final int DEFAULT_SIZE = 32; private static final int DEFAULT_SIZE = 32;
private Geometry[] geometries; private Geometry[] geometries;
private Geometry[] geometries2; private ListSort listSort;
private int size; private int size;
private GeometryComparator comparator; private GeometryComparator comparator;
@ -61,8 +61,8 @@ public class GeometryList {
public GeometryList(GeometryComparator comparator) { public GeometryList(GeometryComparator comparator) {
size = 0; size = 0;
geometries = new Geometry[DEFAULT_SIZE]; geometries = new Geometry[DEFAULT_SIZE];
geometries2 = new Geometry[DEFAULT_SIZE];
this.comparator = comparator; this.comparator = comparator;
listSort = new ListSort<Geometry>();
} }
public void setComparator(GeometryComparator comparator) { public void setComparator(GeometryComparator comparator) {
@ -118,8 +118,6 @@ public class GeometryList {
Geometry[] temp = new Geometry[size * 2]; Geometry[] temp = new Geometry[size * 2];
System.arraycopy(geometries, 0, temp, 0, size); System.arraycopy(geometries, 0, temp, 0, size);
geometries = temp; // original list replaced by double-size list geometries = temp; // original list replaced by double-size list
geometries2 = new Geometry[size * 2];
} }
geometries[size++] = g; geometries[size++] = g;
} }
@ -141,10 +139,10 @@ public class GeometryList {
public void sort() { public void sort() {
if (size > 1) { if (size > 1) {
// sort the spatial list using the comparator // sort the spatial list using the comparator
System.arraycopy(geometries, 0, geometries2, 0, size); if(listSort.getLength() != size){
SortUtil.msort(geometries2, geometries, 0, size-1, comparator); listSort.allocateStack(size);
}
listSort.sort(geometries,comparator);
} }
} }
} }