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

Reverted accidental commit of GeometryList

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10442 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2013-02-26 21:55:59 +00:00
parent 4752376c01
commit 7a79d7160e
1 changed files with 10 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
engine/src/core/com/jme3/renderer/queue/GeometryList.java
View File

@ -33,7 +33,6 @@ 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.ListSort;
import com.jme3.util.SortUtil; import com.jme3.util.SortUtil;
/** /**
@ -49,16 +48,10 @@ 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 Geometry[] geometries2;
private ListSort listSort;
private int size; private int size;
private GeometryComparator comparator; private GeometryComparator comparator;
/*static private int count =0;
static private int cpt =0;
static private long time = 0;
*/
/** /**
* Initializes the GeometryList to use the given {@link GeometryComparator} * Initializes the GeometryList to use the given {@link GeometryComparator}
* to use for comparing geometries. * to use for comparing geometries.
@ -68,9 +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]; geometries2 = new Geometry[DEFAULT_SIZE];
this.comparator = comparator; this.comparator = comparator;
listSort = new ListSort<Geometry>();
} }
/** /**
@ -123,7 +115,7 @@ public class GeometryList {
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]; geometries2 = new Geometry[size * 2];
} }
geometries[size++] = g; geometries[size++] = g;
} }
@ -145,34 +137,14 @@ 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
// count++;
// long t = System.nanoTime();
if(listSort.getLength() != size){ // SortUtil.qsort(geometries, 0, size, comparator);
listSort.allocateStack(size); // Arrays.sort(geometries, 0, size, comparator);
}
listSort.sort(geometries,comparator);
// time += System.nanoTime() - t; System.arraycopy(geometries, 0, geometries2, 0, size);
SortUtil.msort(geometries2, geometries, 0, size-1, comparator);
// count++;
// long t = System.nanoTime();
// System.arraycopy(geometries, 0, geometries2, 0, size);
// SortUtil.msort(geometries2, geometries, 0, size-1, comparator);
// time += System.nanoTime() - t;
//
// count++;
// long t = System.nanoTime();
// Arrays.sort(geometries,0,size, comparator);
// time += System.nanoTime() - t;
} }
// if( count>50){
// count = 0;
// cpt++;
// System.err.println(50*cpt+"\t"+time/1000000);
// }
} }
} }