[Gzz-commits] gzz/gzz/modules/pp2 PPCanvasCursor.java PPCanva...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/02/12 09:49:09

Modified files:
        gzz/modules/pp2: PPCanvasCursor.java PPCanvasNode.java 
                         SinglePaper.java 

Log message:
        PP buoy interpolation

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasCursor.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasNode.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/SinglePaper.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp2/PPCanvasCursor.java
diff -u gzz/gzz/modules/pp2/PPCanvasCursor.java:1.12 
gzz/gzz/modules/pp2/PPCanvasCursor.java:1.13
--- gzz/gzz/modules/pp2/PPCanvasCursor.java:1.12        Wed Feb 12 09:10:27 2003
+++ gzz/gzz/modules/pp2/PPCanvasCursor.java     Wed Feb 12 09:49:09 2003
@@ -41,7 +41,7 @@
 /** XXX
  */
 public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.12 
2003/02/12 14:10:27 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.13 
2003/02/12 14:49:09 tjl Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("PPCanvasCursor:"+s); }
 
@@ -147,15 +147,19 @@
     private void setZoomPan(VobScene vs, int mainFrame) {
        DefaultVobMatcher m = (DefaultVobMatcher)vs.matcher;
        int cs = m.getCS(mainFrame, "C2F");
+       int csinv = m.getCS(mainFrame, "C2FINV");
        vs.coords.setOrthoParams(cs, 0, -panx*zoom, -pany*zoom, zoom, zoom);
+       vs.coords.setOrthoParams(cs, 0, panx, pany, 1/zoom, 1/zoom);
     }
 
     private int c2fCS = -1;
     public void renderMain(VobScene vs, int into) {
        c2fCS = vs.coords.ortho(0, 0, 0, 0, 10, 10);
+       int c2fCSInv = vs.coords.ortho(0, 0, 0, 0, 10, 10);
        vs.matcher.add(into, c2fCS, "C2F");
+       vs.matcher.add(into, c2fCSInv, "C2FINV");
        setZoomPan(vs, into);
-       SinglePaper.i(space, d, window, current).render(vs, into, c2fCS, hook);
+       SinglePaper.i(space, d, window, current).render(vs, into, c2fCS, 
c2fCSInv, hook);
     }
 
     public void keystroke(String s) {
Index: gzz/gzz/modules/pp2/PPCanvasNode.java
diff -u gzz/gzz/modules/pp2/PPCanvasNode.java:1.13 
gzz/gzz/modules/pp2/PPCanvasNode.java:1.14
--- gzz/gzz/modules/pp2/PPCanvasNode.java:1.13  Wed Feb 12 05:57:44 2003
+++ gzz/gzz/modules/pp2/PPCanvasNode.java       Wed Feb 12 09:49:09 2003
@@ -33,7 +33,7 @@
 /** XXX
  */
 public class PPCanvasNode implements CellBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.13 2003/02/12 
10:57:44 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.14 2003/02/12 
14:49:09 tjl Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPCanvasNode:"+s); }
 
@@ -97,9 +97,12 @@
        int[] pan = getCoords(c);
        final int c2fCS = 
            vs.coords.ortho(0, 0,  -pan[0]*buoyZoom, -pan[1]*buoyZoom, 
buoyZoom, buoyZoom);
+       final int c2fCSInv = 
+           vs.coords.ortho(0, 0,  pan[0], pan[1], 1/buoyZoom, 1/buoyZoom);
        vs.matcher.add(into, c2fCS, "C2F");
+       vs.matcher.add(into, c2fCS, "C2FINV");
 
-       SinglePaper.i(space, d,win,c).render(vs, into, c2fCS, null);
+       SinglePaper.i(space, d,win,c).render(vs, into, c2fCS, c2fCSInv, null);
        return into;
     }
 
Index: gzz/gzz/modules/pp2/SinglePaper.java
diff -u gzz/gzz/modules/pp2/SinglePaper.java:1.9 
gzz/gzz/modules/pp2/SinglePaper.java:1.10
--- gzz/gzz/modules/pp2/SinglePaper.java:1.9    Wed Feb 12 09:31:56 2003
+++ gzz/gzz/modules/pp2/SinglePaper.java        Wed Feb 12 09:49:09 2003
@@ -37,7 +37,7 @@
  * the background and the vobs inside the plane.
  */
 public class SinglePaper {
-private static final String rcsid = "$Id: SinglePaper.java,v 1.9 2003/02/12 
14:31:56 tjl Exp $";  
+private static final String rcsid = "$Id: SinglePaper.java,v 1.10 2003/02/12 
14:49:09 tjl Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("SinglePaper:"+s); }
 
@@ -122,7 +122,8 @@
      *                 will be set to the center of the frameCS, and
      *                 the scale is 1 to 1 pixel.
      */
-    void render(final VobScene vs, final int frameCS, final int panZoom,
+    void render(final VobScene vs, final int frameCS, final int panZoom, 
+                   final int inversePanZoom,
                    CellPlacementHook hook) {
        final CellPlacementHook hook_final = hook;
 
@@ -157,11 +158,8 @@
 
        final int frameUnit = vs.unitSqCS(frameCS, "USQ");
 
-       // Irregu needs frame 2 paper
-       final int screen2paper = glc.invert(paper2screen);
-       vs.matcher.add(paper2screen, screen2paper, "INVER2S");
-       final int frameUnit2paper = glc.concat(screen2paper, frameUnit);
-       vs.matcher.add(screen2paper, frameUnit2paper, "f2pap");
+       final int frameUnit2paper = vs.orthoCS(0, "PZIN", 0, -sqs[0]/2, 
-sqs[1]/2, sqs[0], sqs[1]);
+           
 
        final int paper2screen_shifted = vs.translateCS(paper2screen,
                                                        "SHIFTUP",