Update of /cvsroot/jrman/drafts/src/org/jrman/render
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6599/src/org/jrman/render
Modified Files:
Bucket.java RendererHidden.java MemoryBucket.java
Log Message:
no message
Index: RendererHidden.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/RendererHidden.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** RendererHidden.java 30 Jan 2007 05:09:32 -0000 1.76
--- RendererHidden.java 1 Feb 2007 20:30:14 -0000 1.77
***************
*** 280,284 ****
private Bucket getBucket(int column, int row) {
! return buckets[row * bucketColumns + column];
}
--- 280,291 ----
private Bucket getBucket(int column, int row) {
! int idx = row * bucketColumns + column;
! if (buckets[idx] == null)
! buckets[idx] = new MemoryBucket();
! return buckets[idx];
! }
!
! private void discardBucket(int column, int row) {
! buckets[row * bucketColumns + column] = null;
}
***************
*** 394,398 ****
if (bucket.hasMoreMicropolygons())
sampler.sampleBucket(bucket);
! bucket.flush();
if (displayMode == Display.Mode.RGB || displayMode == Display.Mode.RGBA) {
sampler.getColors(
--- 401,405 ----
if (bucket.hasMoreMicropolygons())
sampler.sampleBucket(bucket);
! discardBucket(column, row);
if (displayMode == Display.Mode.RGB || displayMode == Display.Mode.RGBA) {
sampler.getColors(
***************
*** 508,515 ****
System.err.println("Error writing image file: " + e);
}
- for (int i = 0; i < buckets.length; i++) {
- if (buckets[i].hasMorePrimitives())
- System.out.println("More primitives: " + i);
- }
long end = System.currentTimeMillis();
float time = (end - start) / 1000f;
--- 515,518 ----
***************
*** 697,702 ****
else
hExtra = 0;
- for (int i = 0; i < buckets.length; i++)
- buckets[i] = new MemoryBucket();
}
--- 700,703 ----
Index: Bucket.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/Bucket.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Bucket.java 20 Sep 2004 21:09:06 -0000 1.11
--- Bucket.java 1 Feb 2007 20:30:14 -0000 1.12
***************
*** 36,41 ****
Micropolygon getNextMicropolygon();
- void flush();
-
void sortPrimitives();
--- 36,39 ----
Index: MemoryBucket.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/MemoryBucket.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MemoryBucket.java 6 Jul 2005 22:53:23 -0000 1.10
--- MemoryBucket.java 1 Feb 2007 20:30:14 -0000 1.11
***************
*** 49,53 ****
tmp = new Primitive[50];
else
! tmp = new Primitive[primitiveCount * 4];
System.arraycopy(primitives, 0, tmp, 0, primitiveCount);
primitives = tmp;
--- 49,53 ----
tmp = new Primitive[50];
else
! tmp = new Primitive[primitiveCount * 2];
System.arraycopy(primitives, 0, tmp, 0, primitiveCount);
primitives = tmp;
***************
*** 89,93 ****
tmp = new Micropolygon[1024];
else
! tmp = new Micropolygon[micropolygonCount * 4];
System.arraycopy(micropolygons, 0, tmp, 0, micropolygonCount);
micropolygons = tmp;
--- 89,93 ----
tmp = new Micropolygon[1024];
else
! tmp = new Micropolygon[micropolygonCount * 2];
System.arraycopy(micropolygons, 0, tmp, 0, micropolygonCount);
micropolygons = tmp;
***************
*** 107,120 ****
}
- public void flush() {
- flushed = true;
- for (int i = 0; i < primitiveCount; i++)
- primitives[i] = null;
- primitiveCount = 0;
- for (int i = 0; i < micropolygonCount; i++)
- micropolygons[i] = null;
- micropolygons = null;
- micropolygonCount = 0;
- }
-
}
--- 107,109 ----
|
