[Gzz-commits] gzz gfx/util/papersampler.py gzz/gfx/gl/MipzipL...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/03 10:43:02

Modified files:
        gfx/util       : papersampler.py 
        gzz/gfx/gl     : MipzipLoader.java 

Log message:
        Fix textures in others subjects; problem was discarding mipzip levels 
improperly in MipzipLoader

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/util/papersampler.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/MipzipLoader.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text

Patches:
Index: gzz/gfx/util/papersampler.py
diff -u gzz/gfx/util/papersampler.py:1.11 gzz/gfx/util/papersampler.py:1.12
--- gzz/gfx/util/papersampler.py:1.11   Mon Mar  3 10:35:12 2003
+++ gzz/gfx/util/papersampler.py        Mon Mar  3 10:43:01 2003
@@ -84,7 +84,7 @@
     vs.put(background((.36, .84, 1.0)))
     scene(vs)
     w.renderStill(vs, 0)
-    saveanim.saveframe(filename, w)
+    # saveanim.saveframe(filename, w)
     java.lang.System.gc()
     GL.freeQueue()
 
Index: gzz/gzz/gfx/gl/MipzipLoader.java
diff -u gzz/gzz/gfx/gl/MipzipLoader.java:1.20 
gzz/gzz/gfx/gl/MipzipLoader.java:1.21
--- gzz/gzz/gfx/gl/MipzipLoader.java:1.20       Mon Mar  3 07:25:48 2003
+++ gzz/gzz/gfx/gl/MipzipLoader.java    Mon Mar  3 10:43:01 2003
@@ -243,9 +243,12 @@
     synchronized public void loadToBaseLevelSynch(int level) throws 
IOException {
        int cur = currentBaseLevel;
        setBaseLevel(level);
-       if(currentBaseLevel > cur)
+       if(currentBaseLevel > cur) {
+           for(int j=0; j<currentBaseLevel; j++)
+               levels[j].wasDiscarded();
            GLUtil.reloadCompressed(tex, 
                        currentBaseLevel, levels.length);
+       }
        for(int i=currentBaseLevel; i<levels.length; i++) {
            levels[i].loadData();
            levels[i].texImage();