[Gzz-commits] libvob ./TODO org/nongnu/libvob/demo/paper/comb...

[Janne V. Kujala]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Janne V. Kujala <address@hidden>        03/03/26 15:28:52

Modified files:
        .              : TODO 
        org/nongnu/libvob/demo/paper: combiners.py combinerutil.py 
                                      multipaper.py util.py 
        org/nongnu/libvob/paper: papermill.py 
        test/vob/gl    : paper.test 

Log message:
        s/affineCoordsys/affine/ -> paper demo almost works but papers look 
wrong (just solid colors)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/TODO.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/demo/paper/combiners.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/demo/paper/combinerutil.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/demo/paper/multipaper.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/demo/paper/util.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/paper/papermill.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/gl/paper.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: libvob/TODO
diff -u libvob/TODO:1.18 libvob/TODO:1.19
--- libvob/TODO:1.18    Tue Mar 25 07:04:10 2003
+++ libvob/TODO Wed Mar 26 15:28:52 2003
@@ -2,6 +2,14 @@
 
 ---------: for porting xupdf, for demo on thursday
     tjl:
+       - try to fix papermill: 
+           - papers have solid colors and there's garbage in some textures
+             (see basis textures with 
+             make rundemo DEMO=org.nongnu.libvob.demo.paper
+              )
+           - optimized papers fail in paper.test
+             (and dicing paper test marked as failing because distort 
+             wasn't found)
        - port buoy code
        - image loading
        - mipzips
Index: libvob/org/nongnu/libvob/demo/paper/combiners.py
diff -u libvob/org/nongnu/libvob/demo/paper/combiners.py:1.1 
libvob/org/nongnu/libvob/demo/paper/combiners.py:1.2
--- libvob/org/nongnu/libvob/demo/paper/combiners.py:1.1        Wed Mar 26 
11:06:14 2003
+++ libvob/org/nongnu/libvob/demo/paper/combiners.py    Wed Mar 26 15:28:52 2003
@@ -56,7 +56,7 @@
        self.pt.place(vs, cs, "RGB0", self.combinercodes[self.ccind], "RGB1")
 
         for i in range(0,3):
-            cs = vs.coords.affineCoordsys(0, 10, 700 + (i-1)*80, 80, 50, 0, 0, 
50)
+            cs = vs.coords.affine(0, 10, 700 + (i-1)*80, 80, 50, 0, 0, 50)
            vs.matcher.add(cs, "col" + str(i))
             col = self.pt.cols[i].split()
             cq = coloredQuad((col[0], col[1], col[2]))
Index: libvob/org/nongnu/libvob/demo/paper/combinerutil.py
diff -u libvob/org/nongnu/libvob/demo/paper/combinerutil.py:1.1 
libvob/org/nongnu/libvob/demo/paper/combinerutil.py:1.2
--- libvob/org/nongnu/libvob/demo/paper/combinerutil.py:1.1     Wed Mar 26 
11:06:14 2003
+++ libvob/org/nongnu/libvob/demo/paper/combinerutil.py Wed Mar 26 15:28:52 2003
@@ -283,13 +283,13 @@
 
        sca = 2 * sca
 
-       cs1 = vs.coords.affineCoordsys(into, 10, self.x0, self.y0,
+       cs1 = vs.coords.affine(into, 10, self.x0, self.y0,
                                        self.texgen0.vecs[0][0]*sca,
                                        self.texgen0.vecs[1][0]*sca,
                                        self.texgen0.vecs[0][1]*sca,
                                        self.texgen0.vecs[1][1]*sca)
        vs.matcher.add(into, cs1, "1")
-       cs2 = vs.coords.affineCoordsys(into, 10, self.x1, self.y1,
+       cs2 = vs.coords.affine(into, 10, self.x1, self.y1,
                                        self.texgen1.vecs[0][0]*sca,
                                        self.texgen1.vecs[1][0]*sca,
                                        self.texgen1.vecs[0][1]*sca,
Index: libvob/org/nongnu/libvob/demo/paper/multipaper.py
diff -u libvob/org/nongnu/libvob/demo/paper/multipaper.py:1.1 
libvob/org/nongnu/libvob/demo/paper/multipaper.py:1.2
--- libvob/org/nongnu/libvob/demo/paper/multipaper.py:1.1       Wed Mar 26 
11:06:14 2003
+++ libvob/org/nongnu/libvob/demo/paper/multipaper.py   Wed Mar 26 15:28:52 2003
@@ -119,7 +119,7 @@
        print self.w, self.h
 
        scale = float(self.zoom)
-       cs2 = vs.coords.affineCoordsys(0, 1, 0, 0, scale/cs1w, 0, 0, scale/cs1h)
+       cs2 = vs.coords.affine(0, 1, 0, 0, scale/cs1w, 0, 0, scale/cs1h)
         vs.matcher.add(cs2, "tex")
 
         self.boxes = []
@@ -133,7 +133,7 @@
             self.boxes.append( (x - cs1w, y - cs1h,
                                 x + cs1w, y + cs1h ) )
             
-            cs1[i] = vs.coords.affineCoordsys(0, 100-i, x, y, cs1w, 0, 0, cs1h)
+            cs1[i] = vs.coords.affine(0, 100-i, x, y, cs1w, 0, 0, cs1h)
 
             
             vs.matcher.add(cs1[i], str(i))
Index: libvob/org/nongnu/libvob/demo/paper/util.py
diff -u libvob/org/nongnu/libvob/demo/paper/util.py:1.1 
libvob/org/nongnu/libvob/demo/paper/util.py:1.2
--- libvob/org/nongnu/libvob/demo/paper/util.py:1.1     Wed Mar 26 11:06:14 2003
+++ libvob/org/nongnu/libvob/demo/paper/util.py Wed Mar 26 15:28:52 2003
@@ -72,7 +72,7 @@
     def scene(self, vs):
        putnoc(vs, background(self.bgcolor))
 
-       cs1 = vs.coords.affineCoordsys(0, "1", 0, -90, 0, 1, 0, 0, 1)
+       cs1 = vs.coords.affine(0, "1", 0, -90, 0, 1, 0, 0, 1)
 
         putnoc(vs, getDListNocoords("""
             PointSize 1
@@ -121,7 +121,7 @@
 def toggleOpengl11(*args):
     org.nongnu.libvob.gl.PaperOptions.use_opengl_1_1 = \
            not org.nongnu.libvob.gl.PaperOptions.use_opengl_1_1
-    print 'Use of OpenGL 1.1:', org.nongnu.libvob.PaperOptions.use_opengl_1_1 
+    print 'Use of OpenGL 1.1:', 
org.nongnu.libvob.gl.PaperOptions.use_opengl_1_1 
 
 def togglePapermillDebug(*args):
     org.nongnu.libvob.paper.papermill.dbg = not 
org.nongnu.libvob.paper.papermill.dbg
Index: libvob/org/nongnu/libvob/paper/papermill.py
diff -u libvob/org/nongnu/libvob/paper/papermill.py:1.1 
libvob/org/nongnu/libvob/paper/papermill.py:1.2
--- libvob/org/nongnu/libvob/paper/papermill.py:1.1     Wed Mar 26 11:06:14 2003
+++ libvob/org/nongnu/libvob/paper/papermill.py Wed Mar 26 15:28:52 2003
@@ -183,7 +183,7 @@
        vs.map.put(SolidBackdropVob(java.awt.Color.red))
 
        cs1 = vs.coords.ortho(0, 0, 0, 0, s+1, s+1)
-       cs2 = vs.coords.affineCoordsys(
+       cs2 = vs.coords.affine(
            0, 0, 0, 0, 
             v[0][0], v[0][1], v[1][0], v[1][1]
        )
Index: libvob/test/vob/gl/paper.test
diff -u libvob/test/vob/gl/paper.test:1.2 libvob/test/vob/gl/paper.test:1.3
--- libvob/test/vob/gl/paper.test:1.2   Wed Mar 26 14:55:41 2003
+++ libvob/test/vob/gl/paper.test       Wed Mar 26 15:28:52 2003
@@ -23,7 +23,7 @@
 
 needGL()
 
-from org.nongnu.libvob import *
+from org.nongnu.libvob.vobs import *
 from java.awt import Color
 import java
 from org.nongnu.libvob.gl import GL, GLRen, GLCache, PaperMill
@@ -33,8 +33,6 @@
 def testPaperAnythingJava():
     """Test that libpaper, when called through
     the Java API, renders anything.
-
-    fail: GL
     """
     vs = getvs()
     vs.map.put(SolidBackdropVob(Color.black))
@@ -77,8 +75,6 @@
 def testOptimizedPaper():
     """See that optimized paper really is same as
     original.
-
-    fail: GL
     """
     for i in range(0,5):
        p1 = PaperMill.getInstance().getPaper(i)