[Gzz-commits] fenfire/org/fenfire spanimages/gl/PlainPaperMak...

[Tuomas J. Lukka]

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

Modified files:
        org/fenfire/spanimages/gl: PlainPaperMaker.java 
        org/fenfire/view: PaperView2D.java TextNodeView.test 
                          irregularviewport.test papercanvas2d.test 
                          paperview2d.test 

Log message:
        Removing redundant window parameter from papermill

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PaperView2D.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextNodeView.test.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/irregularviewport.test.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/papercanvas2d.test.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/paperview2d.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java
diff -u fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java:1.8 
fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java:1.9
--- fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java:1.8  Wed Jun 25 
07:02:27 2003
+++ fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java      Tue Aug  5 
05:54:18 2003
@@ -45,7 +45,6 @@
     Object depends;
 
     PaperMill papermill;
-    GraphicsAPI.RenderingSurface w;
 
     /** Create a new PlainPaperMaker that just copies the texture value
      * to the screen.
@@ -80,14 +79,12 @@
      * @param papermill The papermill to use to make the optimized background 
paper
      */
     public PlainPaperMaker(int n, String setup, String teardown, 
-                       Object depends, PaperMill papermill,
-                       GraphicsAPI.RenderingSurface w) {
+                       Object depends, PaperMill papermill) {
        this.n = n;
        this.setup = setup;
        this.teardown = teardown;
        this.depends = depends;
        this.papermill = papermill;
-       this.w = w;
     }
 
     public Paper makePaper(SingleImage img, float[] texgen) {
@@ -97,7 +94,7 @@
        StringBuffer buf = new StringBuffer();
        if(papermill != null) {
            p = (Paper) papermill.getOptimizedPaper(
-                       img.scrollBlock.hashCode(), w).clone();
+                       img.scrollBlock.hashCode()).clone();
            if(p.getNPasses() != 1)
                throw new Error("Invalid paper gotten back: npasses "+
                                p.getNPasses()+" "+p);
Index: fenfire/org/fenfire/view/PaperView2D.java
diff -u fenfire/org/fenfire/view/PaperView2D.java:1.15 
fenfire/org/fenfire/view/PaperView2D.java:1.16
--- fenfire/org/fenfire/view/PaperView2D.java:1.15      Mon Jul 14 09:45:50 2003
+++ fenfire/org/fenfire/view/PaperView2D.java   Tue Aug  5 05:54:18 2003
@@ -36,7 +36,7 @@
  * this other view is rendered on top of the paper.
  */
 public class PaperView2D extends View2D {
-public static final String rcsid = "$Id: PaperView2D.java,v 1.15 2003/07/14 
13:45:50 mudyc Exp $";
+public static final String rcsid = "$Id: PaperView2D.java,v 1.16 2003/08/05 
09:54:18 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PaperView2D::"+s); }
 
@@ -50,17 +50,13 @@
     public View2D getChildView2D() { return child; }
     protected View2D child;
     
-    public PaperView2D(GraphicsAPI.RenderingSurface optWin) { 
-       this(optWin, null);
+    public PaperView2D() { 
+       this(null);
     }
-    public PaperView2D(GraphicsAPI.RenderingSurface optWin,
-                      View2D child) { 
-       this.optWin = optWin;
+    public PaperView2D(View2D child) { 
        this.child = child; 
     }
 
-    public GraphicsAPI.RenderingSurface optWin;
-
     private float[] tmp = new float[2];
     private float[] tmp2 = new float[2];
 
@@ -77,7 +73,7 @@
        int seed = plane.hashCode();
 
        Paper p = (drawPaper == true ? 
-                  paperMill.getOptimizedPaper(seed, optWin) : 
+                  paperMill.getOptimizedPaper(seed) : 
                   SpecialPapers.solidPaper(java.awt.Color.white) );
            
        org.nongnu.libvob.Vob v = GLRen.createEasyPaperQuad(p, dicefactor, 
flags);
Index: fenfire/org/fenfire/view/TextNodeView.test
diff -u fenfire/org/fenfire/view/TextNodeView.test:1.6 
fenfire/org/fenfire/view/TextNodeView.test:1.7
--- fenfire/org/fenfire/view/TextNodeView.test:1.6      Tue Jul  1 12:33:33 2003
+++ fenfire/org/fenfire/view/TextNodeView.test  Tue Aug  5 05:54:18 2003
@@ -48,7 +48,7 @@
     textnodeview = ff.view.TextNodeView(fen.txtfunc, textstyle, 1)
     view = ff.view.CanvasView2D(fen, textnodeview)
     view.cull = 1
-    paperview = ff.view.PaperView2D(gfx.win, view)
+    paperview = ff.view.PaperView2D(view)
 
     note = ff.swamp.Nodes.N()
     paper = ff.util.RDFUtil.N(fen.graph, ff.vocab.CANVAS2D.Canvas)
Index: fenfire/org/fenfire/view/irregularviewport.test
diff -u fenfire/org/fenfire/view/irregularviewport.test:1.3 
fenfire/org/fenfire/view/irregularviewport.test:1.4
--- fenfire/org/fenfire/view/irregularviewport.test:1.3 Wed Jun 11 13:40:54 2003
+++ fenfire/org/fenfire/view/irregularviewport.test     Tue Aug  5 05:54:18 2003
@@ -33,7 +33,7 @@
     vs = gfx.getvs()
 
     vs.map.put(vob.vobs.SolidBackdropVob(java.awt.Color.black))
-    childv2d = fenfire.view.PaperView2D(gfx.win)
+    childv2d = fenfire.view.PaperView2D()
     v2d = fenfire.view.IrregularViewportView2D(childv2d)
     v2d.debugFlags = v2d.DEBUG_CONTENT
     
Index: fenfire/org/fenfire/view/papercanvas2d.test
diff -u fenfire/org/fenfire/view/papercanvas2d.test:1.13 
fenfire/org/fenfire/view/papercanvas2d.test:1.14
--- fenfire/org/fenfire/view/papercanvas2d.test:1.13    Mon Jun 16 07:55:04 2003
+++ fenfire/org/fenfire/view/papercanvas2d.test Tue Aug  5 05:54:18 2003
@@ -78,7 +78,7 @@
 
     canvasView2D = ff.view.CanvasView2D(fen, textnodeview)
 
-    paperView2D = ff.view.PaperView2D(None, canvasView2D)
+    paperView2D = ff.view.PaperView2D(canvasView2D)
     paperView2D.paperMill = DummyMill(
        vob.gl.SpecialPapers.solidPaper(Color.yellow)
        )
Index: fenfire/org/fenfire/view/paperview2d.test
diff -u fenfire/org/fenfire/view/paperview2d.test:1.4 
fenfire/org/fenfire/view/paperview2d.test:1.5
--- fenfire/org/fenfire/view/paperview2d.test:1.4       Wed Jun 11 13:40:54 2003
+++ fenfire/org/fenfire/view/paperview2d.test   Tue Aug  5 05:54:18 2003
@@ -33,7 +33,7 @@
     vs = gfx.getvs()
 
     vs.map.put(vob.vobs.SolidBackdropVob(java.awt.Color.black))
-    v2d = fenfire.view.PaperView2D(gfx.win)
+    v2d = fenfire.view.PaperView2D()
     b2s = vs.orthoCS(0, "A", 0, 100, 100, 100, 100)
     v2d.render(vs, "A", 0, b2s, 0)