[Gzz-commits] gzz gzz/gfx/gl/GLVobCoorder.java test/gzz/gfx/g...

[Tuomas J. Lukka]

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

Modified files:
        gzz/gfx/gl     : GLVobCoorder.java 
        test/gzz/gfx/gl: glvobcoorder.test 

Log message:
        Ooooops...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLVobCoorder.java.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/gl/glvobcoorder.test.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gzz/gzz/gfx/gl/GLVobCoorder.java
diff -c gzz/gzz/gfx/gl/GLVobCoorder.java:1.42 
gzz/gzz/gfx/gl/GLVobCoorder.java:1.43
*** gzz/gzz/gfx/gl/GLVobCoorder.java:1.42       Tue Oct 15 09:29:18 2002
--- gzz/gzz/gfx/gl/GLVobCoorder.java    Tue Oct 15 11:00:38 2002
***************
*** 29,35 ****
  import gzz.client.gl.*;
  
  public class GLVobCoorder extends AffineVobCoorder {
! public static final String rcsid = "$Id: GLVobCoorder.java,v 1.42 2002/10/15 
13:29:18 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.43 2002/10/15 
15:00:38 tjl Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 88,94 ****
        int was = ninds;
        ninds += 3;
  
!       setRotateParams(into, degrees);
  
        return was;
      }
--- 88,94 ----
        int was = ninds;
        ninds += 3;
  
!       setRotateParams(was, degrees);
  
        return was;
      }
***************
*** 181,187 ****
        int was = ninds;
        ninds += 3;
  
!       setScaleParams(into, sx, sy, sz);
  
        return was;
      }
--- 181,187 ----
        int was = ninds;
        ninds += 3;
  
!       setScaleParams(was, sx, sy, sz);
  
        return was;
      }
Index: gzz/test/gzz/gfx/gl/glvobcoorder.test
diff -c gzz/test/gzz/gfx/gl/glvobcoorder.test:1.9 
gzz/test/gzz/gfx/gl/glvobcoorder.test:1.10
*** gzz/test/gzz/gfx/gl/glvobcoorder.test:1.9   Sat Oct 12 06:18:09 2002
--- gzz/test/gzz/gfx/gl/glvobcoorder.test       Tue Oct 15 11:00:38 2002
***************
*** 14,23 ****
  def testTransform():
      c = GLVobCoorder()
  
!     cs1 = c.coordsys(0, 5, 10, 15, 0.5, 1)
      checkTrans(c, cs1, [0, 0, 0, 1, 1, 1], [10, 15, 5, 10.5, 16, 6])
  
!     cs2 = c.scaleXYZ(0, 2, 3, 4)
      checkTrans(c, cs2, [0, 0, 0, 1, 1, 1], [0, 0, 0, 2, 3, 4])
  
      cs3 = c.distort(0, 0, 0, 0.1, 0.1, 20, 5)
--- 14,23 ----
  def testTransform():
      c = GLVobCoorder()
  
!     cs1 = c.ortho(0, 5, 10, 15, 0.5, 1)
      checkTrans(c, cs1, [0, 0, 0, 1, 1, 1], [10, 15, 5, 10.5, 16, 6])
  
!     cs2 = c.scale(0, 2, 3, 4)
      checkTrans(c, cs2, [0, 0, 0, 1, 1, 1], [0, 0, 0, 2, 3, 4])
  
      cs3 = c.distort(0, 0, 0, 0.1, 0.1, 20, 5)
***************
*** 61,74 ****
      for i in range(0,5):
        c = GLVobCoorder()
  
!       cs_ortho = c.coordsys(0, 2, 3.5, 9.1, 1.2, 3.9)
!       cs_ortho2 = c.coordsys(cs_ortho, -1.92, 4.1, 2.951, 2.52, 291)
!       cs_rot = c.rotateXY(0, 15)
!       cs_rot2 = c.rotateXY(cs_ortho, 15.8)
        cs_rot3 = c.rotateXYZ(cs_rot2, 15, 1, 2, 3)
!       cs_ortho3 = c.coordsys(cs_rot, -1.92, 4.1, 2.951, 2.52, 291)
!       cs_ortho4 = c.coordsys(cs_rot2, -1.92, 4.1, 2.951, 2.52, 291)
!       cs_ortho5 = c.coordsys(cs_rot3, -1.92, 4.1, 2.951, 2.52, 291)
  
        checkInverse(c, cs_rot)
        checkInverse(c, cs_rot2)
--- 61,74 ----
      for i in range(0,5):
        c = GLVobCoorder()
  
!       cs_ortho = c.ortho(0, 2, 3.5, 9.1, 1.2, 3.9)
!       cs_ortho2 = c.ortho(cs_ortho, -1.92, 4.1, 2.951, 2.52, 291)
!       cs_rot = c.rotate(0, 15)
!       cs_rot2 = c.rotate(cs_ortho, 15.8)
        cs_rot3 = c.rotateXYZ(cs_rot2, 15, 1, 2, 3)
!       cs_ortho3 = c.ortho(cs_rot, -1.92, 4.1, 2.951, 2.52, 291)
!       cs_ortho4 = c.ortho(cs_rot2, -1.92, 4.1, 2.951, 2.52, 291)
!       cs_ortho5 = c.ortho(cs_rot3, -1.92, 4.1, 2.951, 2.52, 291)
  
        checkInverse(c, cs_rot)
        checkInverse(c, cs_rot2)