[Gzz-commits] gzz gfx/librenderables/renderables.py test/gzz/...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/01/27 14:49:02

Modified files:
        gfx/librenderables: renderables.py 
        test/gzz/gfx/gl: paper.test 

Log message:
        Ahh, we were locking too much

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.172&tr2=1.173&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/gl/paper.test.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: gzz/gfx/librenderables/renderables.py
diff -u gzz/gfx/librenderables/renderables.py:1.172 
gzz/gfx/librenderables/renderables.py:1.173
--- gzz/gfx/librenderables/renderables.py:1.172 Mon Jan 27 12:26:04 2003
+++ gzz/gfx/librenderables/renderables.py       Mon Jan 27 14:49:00 2003
@@ -752,7 +752,8 @@
            DBG(dbg_paperquad) << "Dice: " << dice <<"\\n";
 
            float *vertices = new float[dice * dice * 5];
-            int *indices = new int[(dice-1) * (2*dice)];
+
+            int *indices = new int[(dice) * (2*dice)];
 
             #define VERTICES3(x, y, z) vertices[((x)*dice + (y))*5 + (z)]
             #define VERTICES2(x, y)    vertices[((x)*dice + (y))*5]
@@ -801,7 +802,7 @@
            if(flags & PAPERQUAD_USE_VERTEX_PROGRAM) {
                glPushClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT);
                glInterleavedArrays(GL_T2F_V3F, 5*sizeof(float), vertices);
-               glLockArraysEXT(0, dice*dice*5);
+               glLockArraysEXT(0, dice*dice);
 
                for(Paper::Paper::iterator it = paper->begin(); it != 
paper->end(); ++it) {
 
Index: gzz/test/gzz/gfx/gl/paper.test
diff -u gzz/test/gzz/gfx/gl/paper.test:1.10 gzz/test/gzz/gfx/gl/paper.test:1.11
--- gzz/test/gzz/gfx/gl/paper.test:1.10 Mon Jan 27 14:39:40 2003
+++ gzz/test/gzz/gfx/gl/paper.test      Mon Jan 27 14:49:02 2003
@@ -35,11 +35,11 @@
     too short allocated arrays.
     """
     paper = PaperMill.getInstance().getPaper(57)
-    for df in (0, .1, .5, 1, 5, 10, 20, 37, 100):
+    for df in (0, .1, .5, 1, 5, 10, 20, 37, 100, 150):
        vs = getvs()
        vs.map.put(SolidBgVob(Color.black))
        pq = GLRen.createPaperQuad(paper, 0, 0, 1, 1, df)
-       cs1 = vs.coords.distort(0, 0, 0, 10, 10, 400, 40)
+       cs1 = vs.coords.distort(0, 0, 0, .5, .5, 800, 40)
        vs.map.put(pq, cs1, 0)
        vs.map.put(pq, cs1, 0)
        vs.map.put(pq, cs1, 0)