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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/03 07:54:30

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

Log message:
        Ok, at least somewhat working

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/util/papersampler.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLSpanner.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/MipzipMemoryConsumer.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gzz/gfx/util/papersampler.py
diff -u gzz/gfx/util/papersampler.py:1.4 gzz/gfx/util/papersampler.py:1.5
--- gzz/gfx/util/papersampler.py:1.4    Mon Mar  3 07:40:32 2003
+++ gzz/gfx/util/papersampler.py        Mon Mar  3 07:54:27 2003
@@ -14,6 +14,8 @@
 from gfx.util.misc import *
 from gfx.libutil import saveanim    
 
+import traceback
+
 xs = 1024
 ys = 768
 
@@ -25,9 +27,9 @@
        self.opts = opts
     def getPaper(self,*args):
        print "GETPAPER",args
-       return mill.getPaper(args[0], **opts)
+       return self.mill.getPaper(args[0], **self.opts)
     def getOptimizedPaper(self, seed, w):
-       return mill.getOptimizedPaper(seed, w, **opts)
+       return self.mill.getOptimizedPaper(seed, w, **self.opts)
 
 lightnesses = [
        { "numcolors" : 8, "minlum" : 80 },
@@ -48,7 +50,7 @@
 textureSeeds = [i for i in range(523, 523+current.length())]
 
 class PSPMaker(gzz.view.PageSpanCellView.PageSpanPaperMaker):
-    def getPaper(spanpage, pagespan):
+    def getPaper(self, spanpage, pagespan):
        return gzz.gfx.gl.PageSpanPaper(spanpage, 
                                    textureSeeds[pagespan.offset()])
 
@@ -99,11 +101,14 @@
        pageSpanCellView.pageSpanPaperMaker = PSPMaker()
 
        for page in pages:
+           zoom = zooms.pop()
            for opts in lightnesses:
                gzz.gfx.gl.PageSpanPaper.paperMill = OptMill(
                                            ThePaperMill(), opts)
+               gzz.gfx.gl.PageSpanPaper.paperMillWindow = w
                layout = pageSpanCellView.getLayout(page)
-               zoom = zooms.pop()
+               doFrame(lambda vs: textPaperScene(vs, layout, zoom),
+                   "tmp/tmp_%s_%s_%s"%(subj, page, opts))
 
 
   
Index: gzz/gzz/gfx/gl/GLSpanner.java
diff -u gzz/gzz/gfx/gl/GLSpanner.java:1.16 gzz/gzz/gfx/gl/GLSpanner.java:1.17
--- gzz/gzz/gfx/gl/GLSpanner.java:1.16  Mon Mar  3 07:25:48 2003
+++ gzz/gzz/gfx/gl/GLSpanner.java       Mon Mar  3 07:54:29 2003
@@ -113,7 +113,8 @@
        public GL.Texture getTexture(float importance, float pixels) {
            if(pool == null) {
                if(currentlyLoaded != consumer) {
-                   currentlyLoaded.loadToBaseLevelSynch(1000);
+                   if(currentlyLoaded != null)
+                       currentlyLoaded.loadToBaseLevelSynch(1000);
                    currentlyLoaded = consumer;
                    currentlyLoaded.loadToBaseLevelSynch(0);
                }
Index: gzz/gzz/gfx/gl/MipzipMemoryConsumer.java
diff -u gzz/gzz/gfx/gl/MipzipMemoryConsumer.java:1.7 
gzz/gzz/gfx/gl/MipzipMemoryConsumer.java:1.8
--- gzz/gzz/gfx/gl/MipzipMemoryConsumer.java:1.7        Mon Mar  3 07:25:48 2003
+++ gzz/gzz/gfx/gl/MipzipMemoryConsumer.java    Mon Mar  3 07:54:30 2003
@@ -81,7 +81,8 @@
     public GL.Texture getTexture(float importance, float quality) { 
        if(dbg) pa("MipzipMemcons getTexture "+mipzip+" "+
                    importance+" "+quality);
-       pool.request(this, importance, quality, null);
+       if(pool != null)
+           pool.request(this, importance, quality, null);
        return mipzip.getTexture(); 
     }