[Gzz-commits] gzz gfx/libpaper/papermill.py test/gzz/gfx/gl/p...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/10/23 12:55:21

Modified files:
        gfx/libpaper   : papermill.py 
        test/gzz/gfx/gl: paper.test 

Log message:
        YES

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/papermill.py.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/gl/paper.test.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gzz/gfx/libpaper/papermill.py
diff -u gzz/gfx/libpaper/papermill.py:1.56 gzz/gfx/libpaper/papermill.py:1.57
--- gzz/gfx/libpaper/papermill.py:1.56  Wed Oct 23 10:55:40 2002
+++ gzz/gfx/libpaper/papermill.py       Wed Oct 23 12:55:20 2002
@@ -148,7 +148,7 @@
        vs = w.createVobScene()
        vs.map.put(SolidBgVob(java.awt.Color.red))
 
-       cs1 = vs.coords.ortho(0, 0, 0, 0, s, s)
+       cs1 = vs.coords.ortho(0, 0, 0, 0, s+1, s+1)
        cs2 = vs.coords.affineCoordsys(
            0, 0, 0, 0, 
             v[0][0], v[0][1], v[1][0], v[1][1]
@@ -195,11 +195,12 @@
        """ % locals())
 
        ppass.setNTexGens(1)
-       t = pap.repeat.vecs
+       # t = pap.repeat.vecs
+       t = v
        print "T ",t
        ppass.putNormalTexGen(0, 
            [ t[0][0], t[0][1], 0, 0,
-             t[1][0], t[1][1], 0, 0,
+             -t[1][0], -t[1][1], 0, 0,
              0,        0,      0, 0,
              0,        0,      0, 0,])
 
Index: gzz/test/gzz/gfx/gl/paper.test
diff -u gzz/test/gzz/gfx/gl/paper.test:1.6 gzz/test/gzz/gfx/gl/paper.test:1.7
--- gzz/test/gzz/gfx/gl/paper.test:1.6  Wed Oct 23 10:55:40 2002
+++ gzz/test/gzz/gfx/gl/paper.test      Wed Oct 23 12:55:20 2002
@@ -36,8 +36,6 @@
        p1 = PaperMill.getInstance().getPaper(i)
        p2 = PaperMill.getInstance().getOptimizedPaper(i, win)
 
-       java.lang.Thread.sleep(3000)
-
        pq1 = GLRen.createPaperQuad(p1, 0, 0, 1, 1, 1)
        pq2 = GLRen.createPaperQuad(p2, 0, 0, 1, 1, 1)
 
@@ -48,10 +46,8 @@
        vs.put(pq2, 0, 150, 0, 150, 300)
 
        render(vs)
-       java.lang.Thread.sleep(4000)
 
-       if 0:
-         for x, y, w, h in [
+       for x, y, w, h in [
            (10, 10, 5, 5),
            (50, 20, 10, 5),
            (100, 200, 10, 30),