[Gzz-commits] libvob/org/nongnu/libvob VobCoorder.java VobSce...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/24 14:46:39

Modified files:
        org/nongnu/libvob: VobCoorder.java VobScene.java 
        org/nongnu/libvob/gl: IrregularFrame.java 
        org/nongnu/libvob/impl/gl: GLVobCoorder.java 

Log message:
        Inverse coordsyses

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/VobCoorder.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/VobScene.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/gl/IrregularFrame.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/impl/gl/GLVobCoorder.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/VobCoorder.java
diff -u libvob/org/nongnu/libvob/VobCoorder.java:1.4 
libvob/org/nongnu/libvob/VobCoorder.java:1.5
--- libvob/org/nongnu/libvob/VobCoorder.java:1.4        Thu Apr 24 08:04:13 2003
+++ libvob/org/nongnu/libvob/VobCoorder.java    Thu Apr 24 14:46:39 2003
@@ -138,6 +138,13 @@
        throw new Error("Not implemented in this coorder\n\n");
     }
 
+    /** Create a new transformation that is the inverse
+     * of an existing transformation.
+     */
+    public int invert(int f) {
+       throw new Error("Not implemented in this coorder\n\n");
+    }
+
     /** Get the size of the "unit square" of the given coordinate
      * system. This is the size that the unit square of unitSqCS() 
      * would be in the given coordinate system.
Index: libvob/org/nongnu/libvob/VobScene.java
diff -u libvob/org/nongnu/libvob/VobScene.java:1.5 
libvob/org/nongnu/libvob/VobScene.java:1.6
--- libvob/org/nongnu/libvob/VobScene.java:1.5  Wed Apr 16 04:27:31 2003
+++ libvob/org/nongnu/libvob/VobScene.java      Thu Apr 24 14:46:39 2003
@@ -240,6 +240,13 @@
        return matcher.add(into, coords.cull(into, test, clip), key);
     }
 
+    public int concatCS(int into, Object key, int other) {
+       return matcher.add(into, coords.concat(into, other), key);
+    }
+    public int invertCS(int into, Object key) {
+       return matcher.add(into, coords.invert(into), key);
+    }
+
     /** Determines size of the area designated for the <code>Vob</code>s.
      *  At least at the moment doesn't include margins.
      * Coordinates of the scene's
Index: libvob/org/nongnu/libvob/gl/IrregularFrame.java
diff -u libvob/org/nongnu/libvob/gl/IrregularFrame.java:1.2 
libvob/org/nongnu/libvob/gl/IrregularFrame.java:1.3
--- libvob/org/nongnu/libvob/gl/IrregularFrame.java:1.2 Tue Apr 15 14:53:13 2003
+++ libvob/org/nongnu/libvob/gl/IrregularFrame.java     Thu Apr 24 14:46:39 2003
@@ -47,11 +47,13 @@
      * the pixels that should be inside the frame.
      */
     abstract public Vob getContent();
+
     /** Return the renderable which will draw
      * the frame. May draw pixels inside the getContent()
      * area as well.
      */
     abstract public Vob getFrame();
+
     /** Get a renderable which will draw over ALL 
      * pixels drawn by the renderables returned by
      * getContent() and getFrame(), and possibly others,
Index: libvob/org/nongnu/libvob/impl/gl/GLVobCoorder.java
diff -u libvob/org/nongnu/libvob/impl/gl/GLVobCoorder.java:1.5 
libvob/org/nongnu/libvob/impl/gl/GLVobCoorder.java:1.6
--- libvob/org/nongnu/libvob/impl/gl/GLVobCoorder.java:1.5      Fri Mar 21 
04:42:51 2003
+++ libvob/org/nongnu/libvob/impl/gl/GLVobCoorder.java  Thu Apr 24 14:46:39 2003
@@ -32,7 +32,7 @@
 import java.util.HashMap;
 
 public abstract class GLVobCoorder extends AffineVobCoorder {
-public static final String rcsid = "$Id: GLVobCoorder.java,v 1.5 2003/03/21 
09:42:51 tjl Exp $";
+public static final String rcsid = "$Id: GLVobCoorder.java,v 1.6 2003/04/24 
18:46:39 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
@@ -176,6 +176,11 @@
        GL.transformSq(ninds, inds, floats, cs, into);
     }
 
+    abstract public int concatInverse(int f, int g);
+    // Then some simple implementations
+    public int invert(int f) {
+       return concatInverse(0, f);
+    }
 }