[Gzz-commits] gzz gfx/libcoords/Coords.cxx test/gzz/gfx/gl/gl...

[Asko Soukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Asko Soukka <address@hidden>    03/03/04 05:26:24

Modified files:
        gfx/libcoords  : Coords.cxx 
        test/gzz/gfx/gl: glvobcoorder.test 

Log message:
        culling boxbugtest

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcoords/Coords.cxx.diff?tr1=1.72&tr2=1.73&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/gl/glvobcoorder.test.diff?tr1=1.37&tr2=1.38&r1=text&r2=text

Patches:
Index: gzz/gfx/libcoords/Coords.cxx
diff -u gzz/gfx/libcoords/Coords.cxx:1.72 gzz/gfx/libcoords/Coords.cxx:1.73
--- gzz/gfx/libcoords/Coords.cxx:1.72   Fri Feb 21 15:02:32 2003
+++ gzz/gfx/libcoords/Coords.cxx        Tue Mar  4 05:26:23 2003
@@ -1198,6 +1198,7 @@
          DBG(dbg_cull) << "called CullingCoordsys::findBoundingBox\n";
            float i, j;
            Pt box = cs->getSqSize();
+           DBG(dbg_cull) << "Box: (" << box.x << ", " << box.y << ")\n";
            float x1, y1, x2, y2;
            for (i=0; i<=box.x; i+=box.x) {
                for (j=0; j<=box.y; j+=box.y) {
@@ -1230,6 +1231,7 @@
          DBG(dbg_cull) << "called CullingCoordsys::findDistortedBoundingBox\n";
            double i, step_x, step_y;
            Pt box = cs->getSqSize();
+           DBG(dbg_cull) << "Box: (" << box.x << ", " << box.y << ")\n";
            float x1, y1, x2, y2;
            int check_dist;
 
@@ -1312,7 +1314,7 @@
            super->vertex(p);
        }
        virtual ZPt transform(const ZPt &p) const {
-         DBG(dbg_cull) << "called CullingCoordsys::transform\n";
+         //DBG(dbg_cull) << "called CullingCoordsys::transform\n";
          return super->transform(p);
        }
        virtual float nonlinearity(const ZPt &p, float radius) { 
Index: gzz/test/gzz/gfx/gl/glvobcoorder.test
diff -u gzz/test/gzz/gfx/gl/glvobcoorder.test:1.37 
gzz/test/gzz/gfx/gl/glvobcoorder.test:1.38
--- gzz/test/gzz/gfx/gl/glvobcoorder.test:1.37  Fri Feb 21 15:02:58 2003
+++ gzz/test/gzz/gfx/gl/glvobcoorder.test       Tue Mar  4 05:26:24 2003
@@ -272,7 +272,6 @@
 #test cull-clip interface
     font = GL.createFont("gfx/fonts/a010013l.pfb", 16)
     renderable = GLRen.createHorizText2(font, "FOO", 1, 1, 1, 1)
-
     
     cs = c.affineCoordsys(0, 0, 10, 10, 100, 0, 0, 100)
     cs_clip = c.affineCoordsys(0, 0, 0, 0, 200, 0, 0, 200)
@@ -296,6 +295,13 @@
     a = str(boxwh)
     failIf(boxwh[0] != 10.0, "%s != 10.0" % (boxwh[0]))
     failIf(boxwh[1] != 10.0, "%s != 10.0" % (boxwh[1]))
+
+#test findBoundingBox bugfix
+    cs_box = c.orthoBox(0, 0, 0, 0, 200, 100, 1, 2)
+    cs_clip = c.orthoBox(0, 0,100, 0, 100, 100, 1, 1)
+    cs_cull = c.cull(cs_box, cs_clip)
+    putThings()
+    checkNotAvgColor(0, 0, 200, 200, (255, 0, 0), delta=50)
        
 #test same area
     cs_clip = c.affineCoordsys(0, 0, 10, 10, 100, 0, 0, 100)