[Gzz-commits] libvob org/nongnu/libvob/gl/CachingPaperMill.ja...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/05 05:54:11

Modified files:
        org/nongnu/libvob/gl: CachingPaperMill.java PaperMill.java 
        org/nongnu/libvob/impl: DefaultVobMap.java 
        test/vob/gl    : paper.test 
        vob/demo/paper : util.py 
        vob/paper      : papermill.py 

Log message:
        Removing redundant window parameter from papermill

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/gl/CachingPaperMill.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/gl/PaperMill.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/impl/DefaultVobMap.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/gl/paper.test.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/paper/util.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/paper/papermill.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/gl/CachingPaperMill.java
diff -u libvob/org/nongnu/libvob/gl/CachingPaperMill.java:1.1 
libvob/org/nongnu/libvob/gl/CachingPaperMill.java:1.2
--- libvob/org/nongnu/libvob/gl/CachingPaperMill.java:1.1       Wed Mar 26 
11:06:14 2003
+++ libvob/org/nongnu/libvob/gl/CachingPaperMill.java   Tue Aug  5 05:54:11 2003
@@ -68,10 +68,10 @@
        }
     }
 
-    public Paper getOptimizedPaper(int seed, GraphicsAPI.RenderingSurface w) {
+    public Paper getOptimizedPaper(int seed) {
        Paper p = optCache.get(seed);
        if(p == null) {
-           p = realPaperMill.getOptimizedPaper(seed, w);
+           p = realPaperMill.getOptimizedPaper(seed);
            optCache.put(seed, p);
        }
        return p;
Index: libvob/org/nongnu/libvob/gl/PaperMill.java
diff -u libvob/org/nongnu/libvob/gl/PaperMill.java:1.3 
libvob/org/nongnu/libvob/gl/PaperMill.java:1.4
--- libvob/org/nongnu/libvob/gl/PaperMill.java:1.3      Thu Apr 10 10:00:17 2003
+++ libvob/org/nongnu/libvob/gl/PaperMill.java  Tue Aug  5 05:54:11 2003
@@ -46,7 +46,7 @@
      * guaranteed that the paper will be like that. Check it first.
      * @see GL.workaroundStupidBuggyAtiDrivers
      */
-    public Paper getOptimizedPaper(int seed, GraphicsAPI.RenderingSurface w) {
+    public Paper getOptimizedPaper(int seed) {
        return getPaper(seed);
     }
 
Index: libvob/org/nongnu/libvob/impl/DefaultVobMap.java
diff -u libvob/org/nongnu/libvob/impl/DefaultVobMap.java:1.6 
libvob/org/nongnu/libvob/impl/DefaultVobMap.java:1.7
--- libvob/org/nongnu/libvob/impl/DefaultVobMap.java:1.6        Thu May 29 
04:00:20 2003
+++ libvob/org/nongnu/libvob/impl/DefaultVobMap.java    Tue Aug  5 05:54:11 2003
@@ -32,7 +32,7 @@
 /** An implementation of VobMap.
  */
 public class DefaultVobMap implements VobMap {
-public static final String rcsid = "$Id: DefaultVobMap.java,v 1.6 2003/05/29 
08:00:20 tjl Exp $";
+public static final String rcsid = "$Id: DefaultVobMap.java,v 1.7 2003/08/05 
09:54:11 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
@@ -141,7 +141,7 @@
         * @return true, if the system was set; false if interpolation
         * can't be done so the vob should not be rendered.
         */
-       public boolean set(Vob.RenderInfo info, int cs);
+       boolean set(Vob.RenderInfo info, int cs);
     }
 
     /** Render the vobs in the given coordinate system.
Index: libvob/test/vob/gl/paper.test
diff -u libvob/test/vob/gl/paper.test:1.6 libvob/test/vob/gl/paper.test:1.7
--- libvob/test/vob/gl/paper.test:1.6   Thu May  8 09:21:35 2003
+++ libvob/test/vob/gl/paper.test       Tue Aug  5 05:54:11 2003
@@ -104,18 +104,19 @@
     """
     for i in range(0,5):
        p1 = PaperMill.getInstance().getPaper(i)
-       p2 = PaperMill.getInstance().getOptimizedPaper(i, win)
+       p2 = PaperMill.getInstance().getOptimizedPaper(i)
 
-       pq1 = GLRen.createPaperQuad(p1, 0, 0, 1, 1, 1)
-       pq2 = GLRen.createPaperQuad(p2, 0, 0, 1, 1, 1)
+       pq1 = GLRen.createFixedPaperQuad(p1, 0, 0, 150, 300, 0, 1, 1, 1)
+       pq2 = GLRen.createFixedPaperQuad(p2, 0, 0, 150, 300, 0, 1, 1, 1)
 
        vs = getvs()
        vs.map.put(SolidBackdropVob(Color.blue))
 
-       cs1 = vs.orthoCS(0, "1", 0, 0, 0, 150, 300)
-       cs2 = vs.orthoCS(0, "2", 0, 150, 0, 150, 300)
-       vs.map.put(pq1, cs1, 0)
-       vs.map.put(pq2, cs2, 0)
+       cs1 = vs.orthoCS(0, "1", 0, 0, 0, 1, 1)
+       cs2 = vs.orthoCS(0, "2", 0, 150, 0, 1, 1)
+
+       vs.map.put(pq1, cs1)
+       vs.map.put(pq2, cs2)
 
        render(vs)
 
Index: libvob/vob/demo/paper/util.py
diff -u libvob/vob/demo/paper/util.py:1.4 libvob/vob/demo/paper/util.py:1.5
--- libvob/vob/demo/paper/util.py:1.4   Sun Jul 13 15:07:43 2003
+++ libvob/vob/demo/paper/util.py       Tue Aug  5 05:54:11 2003
@@ -101,8 +101,7 @@
 
 def getpaper(seed, optimized=0):
     if optimized:
-       pap = ThePaperMill().getOptimizedPaper(seed, 
-               demowindow.w, passmask=passmask)
+       pap = ThePaperMill().getOptimizedPaper(seed, passmask=passmask)
     else:
        pap = ThePaperMill().getPaper(seed, passmask=passmask)
     print "Pq: ",seed
Index: libvob/vob/paper/papermill.py
diff -u libvob/vob/paper/papermill.py:1.8 libvob/vob/paper/papermill.py:1.9
--- libvob/vob/paper/papermill.py:1.8   Tue Aug  5 05:35:38 2003
+++ libvob/vob/paper/papermill.py       Tue Aug  5 05:54:11 2003
@@ -169,7 +169,7 @@
        pap.repeat = rootrep
         return pap
 
-    def getOptimizedPaper(self, seed, w, passmask = [1, 1, 1, 1, 1, 1, 1],
+    def getOptimizedPaper(self, seed, passmask = [1, 1, 1, 1, 1, 1, 1],
            numcolors = 8, minlum = 80, blend = 0):
        pap = self.getPaper(seed, passmask, numcolors, minlum, blend)