[Gzz-commits] gzz/gzz client/awt/AWTScreen.java client/gl/GLR...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/01/05 11:32:51

Modified files:
        gzz/client/awt : AWTScreen.java 
        gzz/client/gl  : GLRenderingSurface.java 
        gzz/vob        : VobMatcher.java 
        gzz/vob/impl   : DefaultVobMatcher.java 

Log message:
        Add new interpList API, use it, remove old setKeyMap from 
DefaultVobMatcher. Next: make basic routines for new keymap.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/awt/AWTScreen.java.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/gl/GLRenderingSurface.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/VobMatcher.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/impl/DefaultVobMatcher.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gzz/gzz/client/awt/AWTScreen.java
diff -u gzz/gzz/client/awt/AWTScreen.java:1.28 
gzz/gzz/client/awt/AWTScreen.java:1.29
--- gzz/gzz/client/awt/AWTScreen.java:1.28      Sat Dec 28 21:01:41 2002
+++ gzz/gzz/client/awt/AWTScreen.java   Sun Jan  5 11:32:51 2003
@@ -37,7 +37,7 @@
 public abstract class AWTScreen
        extends GraphicsAPI.AbstractWindow
        implements MouseListener, MouseMotionListener, Obs, 
JUpdateManager.EventProcessor {
-    public static final String rcsid = "$Id: AWTScreen.java,v 1.28 2002/12/29 
02:01:41 benja Exp $";
+    public static final String rcsid = "$Id: AWTScreen.java,v 1.29 2003/01/05 
16:32:51 tjl Exp $";
 
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println(s); }
@@ -173,10 +173,12 @@
        } else {
            VobScene sc = prev;
            VobScene osc = next;
+           boolean towardsOther = true;
            if (fract > AbstractUpdateManager.jumpFract) {
                sc = next;
                osc = prev;
                fract = 1-fract;
+               towardsOther = false;
            }
            if(osc == null) osc = sc;
            if(dbg) pa("Going to render: "+sc+" "+osc+" "+fract);
@@ -186,7 +188,8 @@
            if(sc != listprev || osc != listnext) {
                listprev = sc;
                listnext = osc;
-               interplist = sc.matcher.interpList(osc.matcher);
+               interplist = sc.matcher.interpList(osc.matcher,
+                                   towardsOther);
            }
 
            ((OrthoCoorder)sc.coords).renderVobs((DefaultVobMap)sc.map,
Index: gzz/gzz/client/gl/GLRenderingSurface.java
diff -u gzz/gzz/client/gl/GLRenderingSurface.java:1.1 
gzz/gzz/client/gl/GLRenderingSurface.java:1.2
--- gzz/gzz/client/gl/GLRenderingSurface.java:1.1       Thu Dec  5 05:57:34 2002
+++ gzz/gzz/client/gl/GLRenderingSurface.java   Sun Jan  5 11:32:51 2003
@@ -35,7 +35,7 @@
 import java.util.HashMap;
 
 public class GLRenderingSurface extends GraphicsAPI.AbstractRenderingSurface {
-public static final String rcsid = "$Id: GLRenderingSurface.java,v 1.1 
2002/12/05 10:57:34 tjl Exp $";
+public static final String rcsid = "$Id: GLRenderingSurface.java,v 1.2 
2003/01/05 16:32:51 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
@@ -87,10 +87,12 @@
        if(dbg) pa("glscreen renderanim "+fract+" "+lod);
        VobScene sc = prev;
        VobScene osc = next;
+       boolean towardsOther = true;
        if (fract > AbstractUpdateManager.jumpFract) {
            sc = next;
            osc = prev;
            fract = 1-fract;
+           towardsOther = false;
        }
        if(osc == null) osc = sc;
        if(dbg) {
@@ -101,7 +103,7 @@
        if(sc != listprev || osc != listnext) {
            listprev = sc;
            listnext = osc;
-           interplist = sc.matcher.interpList(osc.matcher);
+           interplist = sc.matcher.interpList(osc.matcher, towardsOther);
            interplist[0] = interplist.length;
        }
 
Index: gzz/gzz/vob/VobMatcher.java
diff -u gzz/gzz/vob/VobMatcher.java:1.5 gzz/gzz/vob/VobMatcher.java:1.6
--- gzz/gzz/vob/VobMatcher.java:1.5     Fri Dec  6 07:20:16 2002
+++ gzz/gzz/vob/VobMatcher.java Sun Jan  5 11:32:51 2003
@@ -69,8 +69,14 @@
      * giving the coordinate system of the other matcher that system should 
move
      * to. A number smaller than zero means that the the coordsys
      * should not be interpolated.
+     * @param other The other vobmatcher; the interp list is constructed
+     *                 between this and the other matcher.
+     * @param towardsOther Whether we are interpolating towards or away from 
the
+     *                 `other` parameter. This has effect when key mappings 
are used,
+     *                 but currently no official API is provided for setting 
them;
+     * @see DefaultVobMap
      */
-    int[] interpList(VobMatcher other);
+    int[] interpList(VobMatcher other, boolean towardsOther);
 }
 
 
Index: gzz/gzz/vob/impl/DefaultVobMatcher.java
diff -u gzz/gzz/vob/impl/DefaultVobMatcher.java:1.6 
gzz/gzz/vob/impl/DefaultVobMatcher.java:1.7
--- gzz/gzz/vob/impl/DefaultVobMatcher.java:1.6 Thu Dec 12 10:39:31 2002
+++ gzz/gzz/vob/impl/DefaultVobMatcher.java     Sun Jan  5 11:32:51 2003
@@ -128,14 +128,6 @@
        }
     }
 
-    /** Set a map from keys of this vobcoorder to keys of the
-     * one being interpolated to this.
-     * Useful for specifying e.g. buoy interpolation.
-     */
-    public void setKeyMap(Map m) {
-       keymap = m;
-    }
-
     /** Map a key to a key of the other interpolating
      * vobmatcher.
      */
@@ -146,7 +138,7 @@
        return o;
     }
 
-    public int[] interpList(VobMatcher other0) {
+    public int[] interpList(VobMatcher other0, boolean towardsOther) {
         DefaultVobMatcher other = (DefaultVobMatcher)other0;
        int[] interpList = new int[maxcs+1];
        if(dbg) pa("interplist: "+interpList[0]);
@@ -162,12 +154,7 @@
                // XXX assumes that parent is set already
                int other_parent = interpList[k.parent];
 
-               // KLUDGE!
-               Object mappedKey ; 
-               if(other == this)
-                   mappedKey = k.key;
-               else
-                   mappedKey = mapkey(k.key);
+               Object mappedKey = k.key; 
                Key other_key = new Key(mappedKey, other_parent);
                interpList[i] = other.getCSByKeyObject(other_key);