[Gzz-commits] gzz gfx/demo/mipzip.py gzz/gfx/gl/MipzipMemoryC...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/01/20 02:00:53

Modified files:
        gfx/demo       : mipzip.py 
        gzz/gfx/gl     : MipzipMemoryConsumer.java 
        test/gzz/mem   : partition.test 

Log message:
        Rewriting glspans as glspanner for mipzip

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/mipzip.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/MipzipMemoryConsumer.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/mem/partition.test.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/mipzip.py
diff -u gzz/gfx/demo/mipzip.py:1.8 gzz/gfx/demo/mipzip.py:1.9
--- gzz/gfx/demo/mipzip.py:1.8  Sat Jan 18 16:08:27 2003
+++ gzz/gfx/demo/mipzip.py      Mon Jan 20 02:00:53 2003
@@ -15,7 +15,7 @@
 
 class Scene:
     def __init__(self):
-       self.mem = MemoryPartitioner(80 * 1024 * 1024)
+       self.mem = MemoryPartitioner(40 * 1024 * 1024)
        self.files = []
        self.tex = []
        for f in glob.glob("../mstmpimg/*.mipzip"):
Index: gzz/gzz/gfx/gl/MipzipMemoryConsumer.java
diff -u gzz/gzz/gfx/gl/MipzipMemoryConsumer.java:1.3 
gzz/gzz/gfx/gl/MipzipMemoryConsumer.java:1.4
--- gzz/gzz/gfx/gl/MipzipMemoryConsumer.java:1.3        Sat Jan 18 15:24:26 2003
+++ gzz/gzz/gfx/gl/MipzipMemoryConsumer.java    Mon Jan 20 02:00:53 2003
@@ -41,6 +41,9 @@
        return mipzip.getQuality();
     }
 
+    /** The public API: ask for the texture at given
+     * importance and quality.
+     */
     public GL.Texture getTexture(float importance, float quality) { 
        if(dbg) pa("MipzipMemcons getTexture "+mipzip+" "+
                    importance+" "+quality);
Index: gzz/test/gzz/mem/partition.test
diff -u gzz/test/gzz/mem/partition.test:1.9 gzz/test/gzz/mem/partition.test:1.10
--- gzz/test/gzz/mem/partition.test:1.9 Mon Jan 13 01:48:50 2003
+++ gzz/test/gzz/mem/partition.test     Mon Jan 20 02:00:53 2003
@@ -12,7 +12,7 @@
        self.qual = 0
     def getMaxBytes(self, qual):
        return 230
-    def setReservation(self, byt, qual, o):
+    def setReservation(self, priority, byt, qual, o):
        self.rese = byt
        self.qual = qual
        return byt
@@ -23,7 +23,7 @@
 
 def waitFor(f, dontStop = 0):
     for i in range(0,30):
-       java.lang.Thread.sleep(100)
+       java.lang.Thread.sleep(500)
        if f():
            if not dontStop: pool.stop()
            return