[Gzz-commits] gzz gzz/vob/TestSpotVob.java test/gzz/vob/vobco...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/10/29 10:35:51

Modified files:
        gzz/vob        : TestSpotVob.java 
        test/gzz/vob   : vobcoorder.test 
        test/tools     : gfx.py 

Log message:
        Fix testspot

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/TestSpotVob.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/vob/vobcoorder.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/tools/gfx.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gzz/gzz/vob/TestSpotVob.java
diff -u gzz/gzz/vob/TestSpotVob.java:1.1 gzz/gzz/vob/TestSpotVob.java:1.2
--- gzz/gzz/vob/TestSpotVob.java:1.1    Tue Oct 29 09:13:39 2002
+++ gzz/gzz/vob/TestSpotVob.java        Tue Oct 29 10:35:51 2002
@@ -12,7 +12,7 @@
  * This is most likely not useful for anything else. 
  */
 public class TestSpotVob extends Vob {
-public static final String rcsid = "$Id: TestSpotVob.java,v 1.1 2002/10/29 
14:13:39 tjl Exp $";
+public static final String rcsid = "$Id: TestSpotVob.java,v 1.2 2002/10/29 
15:35:51 tjl Exp $";
 
     float x, y, z;
 
@@ -48,7 +48,7 @@
 "              PointSize 3     \n" +
 "              Color 1 1 1     \n" +
 "              Begin POINTS     \n" +
-"              Vertex %s %s %s     \n" +
+"              Vertex "+x+" "+y+" "+z+" \n" +
 "              End     \n" +
 "              PopAttrib     \n"
            );
Index: gzz/test/gzz/vob/vobcoorder.test
diff -u gzz/test/gzz/vob/vobcoorder.test:1.1 
gzz/test/gzz/vob/vobcoorder.test:1.2
--- gzz/test/gzz/vob/vobcoorder.test:1.1        Tue Oct 29 09:09:32 2002
+++ gzz/test/gzz/vob/vobcoorder.test    Tue Oct 29 10:35:51 2002
@@ -14,4 +14,49 @@
     cs2 = c.scale(0, 2, 3, 4)
     checkTrans(vs, cs2, [0, 0, 0, 1, 1, 1], [0, 0, 0, 2, 3, 4])
 
+def testActivateSimply():
+    """First, trivial test: two "buttons", activate
+    each separately.
+    """
+
+    cs1 = c.ortho(0, 0, 100, 100, 50, 50)
+    cs2 = c.ortho(0, 0, 200, 100, 50, 50)
+
+    failUnlessEqual(-1, c.getCSAt(0, 125, 125, None))
+    failUnlessEqual(-1, c.getCSAt(0, 225, 125, None))
+    failUnlessEqual(-1, c.getCSAt(0, 175, 125, None))
+
+    c.activate(cs1)
+
+    failUnlessEqual(cs1, c.getCSAt(0, 125, 125, None))
+    failUnlessEqual(-1, c.getCSAt(0, 225, 125, None))
+    failUnlessEqual(-1, c.getCSAt(0, 175, 125, None))
+
+    c.activate(cs2)
+
+    failUnlessEqual(cs1, c.getCSAt(0, 125, 125, None))
+    failUnlessEqual(cs2, c.getCSAt(0, 225, 125, None))
+    failUnlessEqual(-1, c.getCSAt(0, 175, 125, None))
+
+def testActivateDepth():
+    """Test that depths work right with activation
+    """
+
+    cs1 = c.ortho(0, 50, 100, 100, 100, 100)
+    cs2 = c.ortho(0, 75, 100, 100, 100, 100)
+    cs3 = c.ortho(0, 100, 100, 100, 100, 100)
+
+    failUnlessEqual(-1, c.getCSAt(0, 150, 150, None))
+
+    c.activate(cs2)
+
+    failUnlessEqual(cs2, c.getCSAt(0, 150, 150, None))
+
+    c.activate(cs3)
+
+    failUnlessEqual(cs2, c.getCSAt(0, 150, 150, None))
+
+    c.activate(cs1)
+
+    failUnlessEqual(cs1, c.getCSAt(0, 150, 150, None))
 
Index: gzz/test/tools/gfx.py
diff -u gzz/test/tools/gfx.py:1.6 gzz/test/tools/gfx.py:1.7
--- gzz/test/tools/gfx.py:1.6   Tue Oct 29 09:09:32 2002
+++ gzz/test/tools/gfx.py       Tue Oct 29 10:35:51 2002
@@ -1,6 +1,9 @@
 from jarray import array, zeros
 
+from java.awt import Color
+from gzz.vob import *
 import gzz
+
 print "Init test.gfx"
 print dir(gzz)
 print dir(gzz.client)
@@ -53,7 +56,8 @@
     dst = zeros(len(src), 'f')
     vs.coords.transformPoints3(cs, src, dst)
     for i in range(0, len(src)):
-       failIf(abs(dst[i]-dstlist[i]) > delta, str([srclist, dstlist, dst, i, 
dst[i], dstlist[i]]))
+       if abs(dst[i]-dstlist[i]) > delta:
+           raise str([srclist, dstlist, dst, i, dst[i], dstlist[i]])
     if alsoGL:
        for i in range(0, len(src), 3):
            vs.map.clear()
@@ -68,8 +72,9 @@
 def checkInterp(vs1, vs2, i, fract, cs, srclist, dstlist, delta=0):
     src = array(srclist, 'f')
     dst = zeros(len(src), 'f')
-    failUnless(vs1.coords.transformPoints3_interp(i, vs2.coords, 
-                   fract, 0, cs, src, dst))
+    if not vs1.coords.transformPoints3_interp(i, vs2.coords, fract, 0, cs, 
src, dst):
+       raise str("transformpoints for checkinterp negative!", vs1, vs2, cs)
     for i in range(0, len(src)):
-       failIf(abs(dst[i]-dstlist[i]) > delta, str([srclist, dstlist, dst, i, 
dst[i], dstlist[i]]))
+       if abs(dst[i]-dstlist[i]) > delta:
+           raise str([srclist, dstlist, dst, i, dst[i], dstlist[i]])