[Gzz-commits] fenfire/org/fenfire/view PaperView2D.java

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/07/14 09:45:50

Modified files:
        org/fenfire/view: PaperView2D.java 

Log message:
        use solid paper if not paper paper

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PaperView2D.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/PaperView2D.java
diff -u fenfire/org/fenfire/view/PaperView2D.java:1.14 
fenfire/org/fenfire/view/PaperView2D.java:1.15
--- fenfire/org/fenfire/view/PaperView2D.java:1.14      Wed Jun 25 20:29:25 2003
+++ fenfire/org/fenfire/view/PaperView2D.java   Mon Jul 14 09:45:50 2003
@@ -36,15 +36,16 @@
  * 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.14 2003/06/26 
00:29:25 mudyc Exp $";
+public static final String rcsid = "$Id: PaperView2D.java,v 1.15 2003/07/14 
13:45:50 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PaperView2D::"+s); }
 
     public PaperMill paperMill;
     public float dicefactor = 1;
     public int flags = 0;
+    public boolean drawPaper = true;
 
-    public float paperScaling = 1; //1/200f;
+    public float paperScaling = 1; // 1/200f;
 
     public View2D getChildView2D() { return child; }
     protected View2D child;
@@ -72,14 +73,14 @@
        if (dbg) pa("begin render");
        if(paperMill == null) 
            paperMill = PaperMill.getInstance();
-
+           
        int seed = plane.hashCode();
 
-       Paper p = paperMill.getOptimizedPaper(seed, optWin);
-
-       org.nongnu.libvob.Vob v = GLRen.createEasyPaperQuad(
-                   p, dicefactor, flags);
-       
+       Paper p = (drawPaper == true ? 
+                  paperMill.getOptimizedPaper(seed, optWin) : 
+                  SpecialPapers.solidPaper(java.awt.Color.white) );
+           
+       org.nongnu.libvob.Vob v = GLRen.createEasyPaperQuad(p, dicefactor, 
flags);
        int magnified = box2paper;
        if(paperScaling != 1) {
            int magnify = vs.coords.scale(0, paperScaling, paperScaling);
@@ -89,11 +90,10 @@
                vs.coords.getSqSize(magnified, tmp2);
                pa("SQSIZES: "+tmp[0]+" "+tmp[1]+" "+tmp2[0]+" "+tmp2[1]);
            }
-
+               
        }
-
        vs.put(v, vs.translateCS(box2screen, "Papertr", 0, 0, 1000), 
-               magnified);
+              magnified);
 
        if(child != null)
            child.render(vs, plane, matchingParent,