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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/01/17 14:44:34

Modified files:
        gfx/demo       : mipzip.py 
        gzz/gfx/gl     : MipzipLoader.java 

Log message:
        Hmm, working somewhat, but deadlocking in Bg threads. Argggg..

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/mipzip.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/MipzipLoader.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/mipzip.py
diff -u gzz/gfx/demo/mipzip.py:1.2 gzz/gfx/demo/mipzip.py:1.3
--- gzz/gfx/demo/mipzip.py:1.2  Fri Jan 17 10:06:37 2003
+++ gzz/gfx/demo/mipzip.py      Fri Jan 17 14:44:34 2003
@@ -18,12 +18,15 @@
        self.mem = MemoryPartitioner(4 * 1024 * 1024)
        self.files = []
        self.tex = []
-       for f in glob.glob("../mstmpimg/*.mipzip")[0:5]:
+       for f in glob.glob("../mstmpimg/*.mipzip")[0:10]:
            ml = MipzipLoader(File(f))
+           # ml.loadToBaseLevelSynch(0)
            mc = MipzipMemoryConsumer(self.mem, ml)
            self.files.append(mc)
            self.tex.append(getDListNocoords("""
                BindTexture TEXTURE_2D %s
+               TexParameter TEXTURE_2D TEXTURE_MIN_FILTER LINEAR_MIPMAP_LINEAR
+               TexParameter TEXTURE_2D TEXTURE_MAG_FILTER LINEAR
            """ % mc.getTexture(0, 0).getTexId()))
        self.nrows = int(math.sqrt(len(self.files))) + 1
        self.x = 512
@@ -36,12 +39,12 @@
            Vertex 0 0
            TexCoord %(x0)s %(y1)s
            Vertex 0 1
-           TexCoord %(x1)s %(y0)s
-           Vertex 1 1
            TexCoord %(x1)s %(y1)s
+           Vertex 1 1
+           TexCoord %(x1)s %(y0)s
            Vertex 1 0
            End
-       """ % { "x0" : .3, "y0" : .3, "x1": .35, "y1":.35 })
+       """ % { "x0" : 0, "y0" : 0, "x1": .5, "y1":.5 })
     def scene(self, vs):
        vs.map.put(background((.3,.7,.8)))
        AbstractUpdateManager.setNoAnimation()
Index: gzz/gzz/gfx/gl/MipzipLoader.java
diff -u gzz/gzz/gfx/gl/MipzipLoader.java:1.7 
gzz/gzz/gfx/gl/MipzipLoader.java:1.8
--- gzz/gzz/gfx/gl/MipzipLoader.java:1.7        Fri Jan 17 10:06:37 2003
+++ gzz/gzz/gfx/gl/MipzipLoader.java    Fri Jan 17 14:44:34 2003
@@ -62,7 +62,12 @@
            ZipEntry e = f.getEntry(name);
            byte[] loadedData = new byte[(int)e.getSize()];
            InputStream i = f.getInputStream(e);
-           i.read(loadedData);
+           int offs = 0;
+           while(offs < loadedData.length) {
+               int res = i.read(loadedData, offs, loadedData.length - offs);
+               if(res < 0) throw new IOException("EOF");
+               offs += res;
+           }
            i.close();
            return loadedData;
        }
@@ -194,7 +199,8 @@
      */
     synchronized public void setGoalBaseLevel(int level,
                                Background bg, float priority) {
-       if(dbg) pa("MipzipLoader "+this+" goal "+level);
+       if(dbg) pa("MipzipLoader "+this+" goal "+level+
+                       " now at "+currentBaseLevel);
        this.goalBaseLevel = level;
        this.bg = bg;
        this.priority = priority;