[Gzz-commits] libvob/org/nongnu/libvob/impl OrthoCoorder.java

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/23 12:46:02

Modified files:
        org/nongnu/libvob/impl: OrthoCoorder.java 

Log message:
        Orthocoorder should be a little faster now...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/impl/OrthoCoorder.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/impl/OrthoCoorder.java
diff -u libvob/org/nongnu/libvob/impl/OrthoCoorder.java:1.11 
libvob/org/nongnu/libvob/impl/OrthoCoorder.java:1.12
--- libvob/org/nongnu/libvob/impl/OrthoCoorder.java:1.11        Tue Apr  8 
08:52:31 2003
+++ libvob/org/nongnu/libvob/impl/OrthoCoorder.java     Wed Apr 23 12:46:02 2003
@@ -35,9 +35,8 @@
  */
 
 public class OrthoCoorder extends VobCoorder {
-public static final String rcsid = "$Id: OrthoCoorder.java,v 1.11 2003/04/08 
12:52:31 mudyc Exp $";
+public static final String rcsid = "$Id: OrthoCoorder.java,v 1.12 2003/04/23 
16:46:02 tjl Exp $";
     public static boolean dbg = false;
-    private static void p(String s) { if(dbg) pa(s); }
     private static void pa(String s) { System.out.println("OrthoCoorder::"+s); 
}
 
     public OrthoCoorder(float width, float height) {
@@ -77,7 +76,7 @@
                        yscale * i(cs1rect[3], cs2rect[3], fract),
                        0, 0, xscale * wh[2], yscale * wh[3]);
            // XXX Cliprect wrong
-           p("SetInterp: "+info.x+" "+info.y+" "+info.w+" "+info.h +
+           if(dbg) pa("SetInterp: "+info.x+" "+info.y+" "+info.w+" "+info.h +
                        " \n\t"+xoffs+" "+yoffs+" "+xscale+" "+yscale);
     }
 
@@ -92,7 +91,7 @@
                    w=sys.cw(cs)*sys.w[cs], 
                    h=sys.ch(cs)*sys.h[cs];
 
-           p("contains x: "+x+", y: "+y+", w: "+w+", h: "+h);
+           if(dbg) pa("contains x: "+x+", y: "+y+", w: "+w+", h: "+h);
 
            if(px >= x && py >= y &&
                px < x + w && py < y + h) {
@@ -239,7 +238,7 @@
                            final float xscale,
                            final float yscale)
     {
-       p("Rendervobs "+xoffs+" "+yoffs+" "+xscale+" "+yscale);
+       if(dbg) pa("Rendervobs "+xoffs+" "+yoffs+" "+xscale+" "+yscale);
        sys.sorter.sort();
        if(dbg) dump();
         if(dbg) map.dump();
@@ -258,9 +257,9 @@
            public boolean set(Vob.RenderInfo info, int my) {
                int other = -1;
                if(interpTo != null) {
-                   p("...interpTo != null");
+                   if(dbg) pa("...interpTo != null");
                     if(my == 0) {
-                        p("...my == 0.");
+                        if(dbg) pa("...my == 0.");
                         setInterpInfo(my, interpTo, 0, fract,
                                       xoffs, yoffs, xscale, yscale,
                                       (OrthoRenderInfo) info);
@@ -281,25 +280,25 @@
                                  xoffs, yoffs, xscale, yscale,
                                  (OrthoRenderInfo)info);
                } else {
-                   p("...interpTo == null");
+                   if(dbg) pa("...interpTo == null");
                    setInfo(my, xoffs, yoffs, xscale, yscale,
                            (OrthoRenderInfo)info);
                }
-               p("...ok.");
+               if(dbg) pa("...ok.");
                return true;
            }
        };
-       p("Start rendering.");
+       if(dbg) pa("Start rendering.");
        int[] sorted = sys.sorter.sorted;
        int nsorted = sys.sorter.nsorted;
        for(int i=nsorted-1; i>=0; i--) {
-           p("...set: "+sorted[i]);
+           if(dbg) pa("...set: "+sorted[i]);
            if(setter.set(info, sorted[i])) {
-               p("...render: "+sorted[i]);
+               if(dbg) pa("...render: "+sorted[i]);
                map.renderCS(sorted[i], info, g, setter, info2);
            }
        }
-       p("End rendervobs "+xoffs+" "+yoffs);
+       if(dbg) pa("End rendervobs "+xoffs+" "+yoffs);
     }
 
     public boolean needInterp(VobCoorder interpTo0, int[] interpList) {
@@ -313,7 +312,7 @@
     }
 
     public Vob.RenderInfo getRenderInfo(int cs) {
-       p("GetRenderinfo "+cs);
+       if(dbg) pa("GetRenderinfo "+cs);
        OrthoRenderInfo info = new OrthoRenderInfo();
        setInfo(cs, 0, 0, 1, 1, info);
        return info;