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

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/10/10 10:41:05

Modified files:
        gfx/librenderables: renderables.py 

Log message:
        Sorry, need to go - just makeing mess - try to fix tomorrow.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.102&tr2=1.103&r1=text&r2=text

Patches:
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.102 
gzz/gfx/librenderables/renderables.py:1.103
*** gzz/gfx/librenderables/renderables.py:1.102 Mon Oct  7 10:23:11 2002
--- gzz/gfx/librenderables/renderables.py       Thu Oct 10 10:41:05 2002
***************
*** 409,428 ****
  
            for(Paper::Paper::iterator it = paper->begin(); it != paper->end(); 
++it) {
  
!               DBG(dbg_paperquad) << "Pass\\n";
!               (*it).setUp_VP(&lightParam);
! 
!               DBG(dbg_paperquad) << "Going to multidraw\\n";
!               GLERR
!               glMultiDrawElementsEXT(GL_QUAD_STRIP,
!                       counts, GL_UNSIGNED_INT, (const GLvoid **)indps, 
dice-1);
! 
!               DBG(dbg_paperquad) << "Teardown\\n";
!               GLERR
!               (*it).tearDown_VP();
!               GLERR
!               DBG(dbg_paperquad) << "Pass over\\n";
! 
            }
  
            glUnlockArraysEXT();
--- 409,450 ----
  
            for(Paper::Paper::iterator it = paper->begin(); it != paper->end(); 
++it) {
  
!                 // XXX
!                 if (true) {
!                     DBG(dbg_paperquad) << "Pass\\n";
!                     GLERR
!                     (*it).setUp_VP(&lightParam);
!                     
!                     DBG(dbg_paperquad) << "Going to multidraw\\n";
!                     GLERR
!                     glMultiDrawElementsEXT(GL_QUAD_STRIP, counts,
!                        GL_UNSIGNED_INT, (const GLvoid **)indps, dice-1);
!                     DBG(dbg_paperquad) << "Teardown\\n";
!                     GLERR
!                     (*it).tearDown_VP();
!                 
!                     GLERR
!                     DBG(dbg_paperquad) << "Pass over\\n";
!                 } else {
!                     DBG(dbg_paperquad) << "Pass\\n";
!                     GLERR
!                     (*it).setUp_explicit(&lightParam);
!                     
!                     DBG(dbg_paperquad) << "Going to draw elements\\n";
!                     GLERR
!                     for(int i=0; i<dice-1; i++) {
!                        if (*(counts+i)>0)
!                           glDrawElements(GL_QUAD_STRIP, *(counts+i),
!                              GL_UNSIGNED_INT, (const GLvoid *) *(indps+i));
!                     }
! 
!                     DBG(dbg_paperquad) << "Teardown\\n";
!                     GLERR
!                     (*it).tearDown_explicit();
!                 
!                     GLERR
!                     DBG(dbg_paperquad) << "Pass over\\n";
!                 }
            }
  
            glUnlockArraysEXT();
***************
*** 571,590 ****
  
            for(Paper::Paper::iterator it = paper->begin(); it != paper->end(); 
++it) {
  
!               DBG(dbg_paperquad) << "Pass\\n";
!               (*it).setUp_VP(&lightParam);
! 
!               DBG(dbg_paperquad) << "Going to multidraw\\n";
!               GLERR
!               glMultiDrawElementsEXT(GL_QUAD_STRIP,
!                       counts, GL_UNSIGNED_INT, (const GLvoid **)indps, 
dice-1);
! 
!               DBG(dbg_paperquad) << "Teardown\\n";
!               GLERR
!               (*it).tearDown_VP();
!               GLERR
!               DBG(dbg_paperquad) << "Pass over\\n";
! 
            }
  
            glUnlockArraysEXT();
--- 593,634 ----
  
            for(Paper::Paper::iterator it = paper->begin(); it != paper->end(); 
++it) {
  
!                 // XXX
!                 if (true) {
!                   DBG(dbg_paperquad) << "Pass\\n";
!                     (*it).setUp_VP(&lightParam);
! 
!                     DBG(dbg_paperquad) << "Going to multidraw\\n";
!                     GLERR
!                     glMultiDrawElementsEXT(GL_QUAD_STRIP,
!                       counts, GL_UNSIGNED_INT, (const GLvoid **)indps, 
dice-1);
!                     DBG(dbg_paperquad) << "Teardown\\n";
!                     GLERR
!                     (*it).tearDown_VP();
!                     GLERR
!                     DBG(dbg_paperquad) << "Pass over\\n";
!                 } else {
!                   DBG(dbg_paperquad) << "Pass\\n";
!                     (*it).setUp_VP(&lightParam);
!                     (*it).setUp_explicit(&lightParam);
!                 
! 
!                     DBG(dbg_paperquad) << "Going to draw elements\\n";
!                     GLERR
! 
!                     for(int i=0; i<dice-1; i++) {
!                         if (*(counts+i)>0)
!                            glDrawElements(GL_QUAD_STRIP, *(counts+i),
!                            GL_UNSIGNED_INT, (const GLvoid *) *(indps+i));
!                     }
! 
! 
!                     DBG(dbg_paperquad) << "Teardown\\n";
!                     GLERR
!                     (*it).tearDown_explicit();
!                     GLERR
!                     DBG(dbg_paperquad) << "Pass over\\n";
!                 }
            }
  
            glUnlockArraysEXT();
***************
*** 1305,1313 ****
--- 1349,1361 ----
      }
  
      public static gzz.vob.Vob createCallList(String s) {
+         // XXX Convert to if (dbg)...
+         //System.err.println(\"callist: \" + s );
        return createCallList(createDisplayList(s));
      }
      public static gzz.vob.Vob createCallListCoorded(String s) {
+         // XXX Convert to if (dbg)...
+         //System.err.println(\"callist: \" + s );
        return createCallListCoorded(createDisplayList(s));
      }