[Gzz-commits] gzz ./TODO gzz/gfx/gl/GLVobCoorder.java gzz/vob...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/26 05:09:53

Modified files:
        .              : TODO 
        gzz/gfx/gl     : GLVobCoorder.java 
        gzz/vob        : AffineVobCoorder.java 

Log message:
        Start working on rotation

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.141&tr2=1.142&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLVobCoorder.java.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/AffineVobCoorder.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.141 gzz/TODO:1.142
*** gzz/TODO:1.141      Thu Sep 26 04:36:52 2002
--- gzz/TODO    Thu Sep 26 05:09:53 2002
***************
*** 40,46 ****
      jvk:
        - fix irregularquad to work with new coordsys stuff
      tjl:
!       - make distorted and rotated coordinate systems work
        - make paperquad use nonlinearity
        + fix coordsys to take an iterator, which does the lerping,
          so we can store parameters more naturally and also create 
--- 40,47 ----
      jvk:
        - fix irregularquad to work with new coordsys stuff
      tjl:
!       - make distorted and rotated coordinate systems work from Java
!           - demo using hierarchical rotations
        - make paperquad use nonlinearity
        + fix coordsys to take an iterator, which does the lerping,
          so we can store parameters more naturally and also create 
Index: gzz/gzz/gfx/gl/GLVobCoorder.java
diff -c gzz/gzz/gfx/gl/GLVobCoorder.java:1.28 
gzz/gzz/gfx/gl/GLVobCoorder.java:1.29
*** gzz/gzz/gfx/gl/GLVobCoorder.java:1.28       Wed Sep 25 10:45:43 2002
--- gzz/gzz/gfx/gl/GLVobCoorder.java    Thu Sep 26 05:09:53 2002
***************
*** 29,35 ****
  import gzz.client.gl.*;
  
  public class GLVobCoorder extends AffineVobCoorder {
! public static final String rcsid = "$Id: GLVobCoorder.java,v 1.28 2002/09/25 
14:45:43 tjl Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 29,35 ----
  import gzz.client.gl.*;
  
  public class GLVobCoorder extends AffineVobCoorder {
! public static final String rcsid = "$Id: GLVobCoorder.java,v 1.29 2002/09/26 
09:09:53 tjl Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 50,56 ****
        if(dbg) pa("AffineCoordSys "+ninds/3+": "+into+" '"+depth+" --- "+
                    cx+" "+cy+" "+x_x+" "+x_y+" "+y_x+" "+y_y);
  
!       floats[nfloats + 0]     = cx;
        floats[nfloats + 1] = cy;
        floats[nfloats + 2] = depth;
        floats[nfloats + 3] = x_x;
--- 50,56 ----
        if(dbg) pa("AffineCoordSys "+ninds/3+": "+into+" '"+depth+" --- "+
                    cx+" "+cy+" "+x_x+" "+x_y+" "+y_x+" "+y_y);
  
!       floats[nfloats + 0] = cx;
        floats[nfloats + 1] = cy;
        floats[nfloats + 2] = depth;
        floats[nfloats + 3] = x_x;
***************
*** 64,69 ****
--- 64,83 ----
        inds[ninds + 1] = into;
        inds[ninds + 2] = paramInd;
  
+       int was = ninds / 3;
+       ninds += 3;
+ 
+       return was;
+     }
+ 
+     public int rotateXY(int into, float degrees) {
+       floats[nfloats + 0] = degrees;
+       int paramInd = nfloats;
+       nfloats += 1;
+ 
+       inds[ninds + 0] = 1; // rotation = 2
+       inds[ninds + 1] = into;
+       inds[ninds + 2] = paramInd;
        int was = ninds / 3;
        ninds += 3;
  
Index: gzz/gzz/vob/AffineVobCoorder.java
diff -c gzz/gzz/vob/AffineVobCoorder.java:1.8 
gzz/gzz/vob/AffineVobCoorder.java:1.9
*** gzz/gzz/vob/AffineVobCoorder.java:1.8       Wed Sep 25 10:45:43 2002
--- gzz/gzz/vob/AffineVobCoorder.java   Thu Sep 26 05:09:53 2002
***************
*** 38,43 ****
--- 38,45 ----
            float x, float y, 
                float xx, float xy, float yx, float yy);
  
+     public abstract int rotateXY(int into, float degrees);
+ 
  }