[Gzz-commits] gzz ./TODO gfx/demo/papertest.py

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/12/04 07:29:46

Modified files:
        .              : TODO 
        gfx/demo       : papertest.py 

Log message:
        Add paperopts fix task

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.435&tr2=1.436&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/papertest.py.diff?tr1=1.59&tr2=1.60&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.435 gzz/TODO:1.436
--- gzz/TODO:1.435      Wed Dec  4 06:33:25 2002
+++ gzz/TODO    Wed Dec  4 07:29:46 2002
@@ -93,6 +93,14 @@
        - figure out what material can be used to show xupdf when those pdf 
files
          are not available!!! Use some of our own? Provide URLs for
          canonical blocks?
+       - fix paperopts.use_opengl_1_1
+               - "f" in the papertest should not use LUMINANCE_ALPHA 
+                 textures for *both* types!
+               - the textures.py texture formats are currently specified 
+                 in at least three places and nowhere completely.
+                 Specify completely in one place.
+               - the use_opengl_1_1 state should probably be in papermill
+                 and not global.
        + Check graphics in client starting unit tests
 
 0.8alpha5: saving, loading etc. with mediaserver useful; tests
Index: gzz/gfx/demo/papertest.py
diff -u gzz/gfx/demo/papertest.py:1.59 gzz/gfx/demo/papertest.py:1.60
--- gzz/gfx/demo/papertest.py:1.59      Wed Dec  4 06:56:54 2002
+++ gzz/gfx/demo/papertest.py   Wed Dec  4 07:29:46 2002
@@ -122,20 +122,23 @@
        if not self.pq: self.initpaper()
        putnoc(vs, background(self.bgcolor))
 
-        w = size.width
-        h = size.height
-
-       cs1 = vs.coords.affineCoordsys(0, 10, 0, 0, w, 0, 0, h)
+       cs1 = vs.coords.affineCoordsys(0, 10, 0, 0,
+                                       size.width, 0,
+                                       0, size.height)
        scale = float(zoom)
-       cs2 = vs.coords.affineCoordsys(0, 0, 0, 0, scale / w, 0, 0, scale / h)
+       cs2 = vs.coords.affineCoordsys(0, 0, 0, 0,
+                                       scale / size.width, 0,
+                                       0, scale / size.height)
 
        cs1left = vs.coords.ortho(cs1, 0, 0, 0, .5, 1)
        cs1right = vs.coords.ortho(cs1, 0, .5, 0, .5, 1)
 
-       cs2left = vs.coords.ortho(0, 0, 0, 0, scale / w * 2, scale / h)
-       cs2right = vs.coords.ortho(0, 0, -1, 0, scale / w * 2, scale / h)
-
-        print scale, w, h
+       cs2left = vs.coords.ortho(0, 0, 0, 0,
+                                  scale / size.width * 2,
+                                  scale / size.height)
+       cs2right = vs.coords.ortho(0, 0, -1, 0,
+                                   scale / size.width * 2,
+                                   scale / size.height)
 
        vs.matcher.add(cs1, "1")
        vs.matcher.add(cs2, "2")
@@ -163,7 +166,9 @@
        else:
            print "ARGH ",self.optimized
 
-       cs3 = vs.coords.affineCoordsys(0, 0, 0, 0, h/2, 0, 0, h/2)
+       cs3 = vs.coords.affineCoordsys(0, 0, 0, 0,
+                                       size.height/2, 0,
+                                       0, size.height/2)
        vs.matcher.add(cs3, "txt")
 
         putText(vs, cs3, str(self.seed), color=(0,0,0), x=0, y=.12, h=.2)