[Gzz-commits] gzz/gzz/vob AffineVobCoorder.java GLTextStyle.j...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/10/06 11:08:02

Modified files:
        gzz/vob        : AffineVobCoorder.java GLTextStyle.java 
                         VobCoorder.java 

Log message:
        New convention of coordsys

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/AffineVobCoorder.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/GLTextStyle.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/VobCoorder.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: gzz/gzz/vob/AffineVobCoorder.java
diff -c gzz/gzz/vob/AffineVobCoorder.java:1.10 
gzz/gzz/vob/AffineVobCoorder.java:1.11
*** gzz/gzz/vob/AffineVobCoorder.java:1.10      Fri Sep 27 05:48:17 2002
--- gzz/gzz/vob/AffineVobCoorder.java   Sun Oct  6 11:08:02 2002
***************
*** 30,37 ****
       */
      public int coordsys(int into, float depth,
                float x, float y, float w, float h) {
!       return affineCoordsys(into, depth, x+w/2.0f, y+h/2.0f,
!                           w/2.0f, 0, 0, h/2.0f);
      }
  
      public abstract int affineCoordsys(int into, float depth,
--- 30,37 ----
       */
      public int coordsys(int into, float depth,
                float x, float y, float w, float h) {
!       return affineCoordsys(into, depth, 
!               x, y, w, 0, 0, h);
      }
  
      public abstract int affineCoordsys(int into, float depth,
Index: gzz/gzz/vob/GLTextStyle.java
diff -c gzz/gzz/vob/GLTextStyle.java:1.12 gzz/gzz/vob/GLTextStyle.java:1.13
*** gzz/gzz/vob/GLTextStyle.java:1.12   Mon Sep 23 04:24:26 2002
--- gzz/gzz/vob/GLTextStyle.java        Sun Oct  6 11:08:02 2002
***************
*** 33,39 ****
   * it's much better to use GraphicsAPI.getTextStyle.
   */
  public class GLTextStyle extends TextStyle {
! public static final String rcsid = "$Id: GLTextStyle.java,v 1.12 2002/09/23 
08:24:26 tjl Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 33,39 ----
   * it's much better to use GraphicsAPI.getTextStyle.
   */
  public class GLTextStyle extends TextStyle {
! public static final String rcsid = "$Id: GLTextStyle.java,v 1.13 2002/10/06 
15:08:02 tjl Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 57,63 ****
  
      float fontScale;
      GL.Font theFont;
!     short[] charWidths = new short[256];
  
      private GLTextStyle(GL.Font f, float scale) {
        this.theFont = f;
--- 57,63 ----
  
      float fontScale;
      GL.Font theFont;
!     float[] charWidths = new float[256];
  
      private GLTextStyle(GL.Font f, float scale) {
        this.theFont = f;
Index: gzz/gzz/vob/VobCoorder.java
diff -c gzz/gzz/vob/VobCoorder.java:1.16 gzz/gzz/vob/VobCoorder.java:1.17
*** gzz/gzz/vob/VobCoorder.java:1.16    Mon Sep 30 18:20:28 2002
--- gzz/gzz/vob/VobCoorder.java Sun Oct  6 11:08:02 2002
***************
*** 42,48 ****
      abstract public int coordsys(int into, float depth, float x, float y, 
float w, float h);
  
      public int translateXY(int into, float x, float y) {
!       return coordsys(into, 0, x-1, y-1, 2, 2);
      }
  
      abstract public int getCSIndexAt(float x, float y);
--- 42,48 ----
      abstract public int coordsys(int into, float depth, float x, float y, 
float w, float h);
  
      public int translateXY(int into, float x, float y) {
!       return coordsys(into, 0, x, y, 1, 1);
      }
  
      abstract public int getCSIndexAt(float x, float y);