[Gzz-commits] gzz/gfx/librenderables Renderables.cxx Renderab...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/10/01 13:05:32

Modified files:
        gfx/librenderables: Renderables.cxx Renderables.hxx 
                            renderables.py 

Log message:
        Put the more verbose renderables into their own dbg vars

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/Renderables.cxx.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/Renderables.hxx.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.90&tr2=1.91&r1=text&r2=text

Patches:
Index: gzz/gfx/librenderables/Renderables.cxx
diff -c gzz/gfx/librenderables/Renderables.cxx:1.5 
gzz/gfx/librenderables/Renderables.cxx:1.6
*** gzz/gfx/librenderables/Renderables.cxx:1.5  Sun Sep 29 11:00:37 2002
--- gzz/gfx/librenderables/Renderables.cxx      Tue Oct  1 13:05:32 2002
***************
*** 14,19 ****
--- 14,21 ----
  
      DBGVAR(dbg, "Renderable.general");
      DBGVAR(dbg_horiztext2, "Renderable.horiztext2");
+     DBGVAR(dbg_paperquad, "Renderable.paperquad");
+     DBGVAR(dbg_irregularquad, "Renderable.irregularquad");
  
      void setStandardCoordinates(Vec windowSize) {
        int w = (int)windowSize.x;
Index: gzz/gfx/librenderables/Renderables.hxx
diff -c gzz/gfx/librenderables/Renderables.hxx:1.16 
gzz/gfx/librenderables/Renderables.hxx:1.17
*** gzz/gfx/librenderables/Renderables.hxx:1.16 Sun Sep 29 11:00:37 2002
--- gzz/gfx/librenderables/Renderables.hxx      Tue Oct  1 13:05:32 2002
***************
*** 65,71 ****
--- 65,73 ----
  namespace Renderables {
  
      PREDBGVAR(dbg);
+     PREDBGVAR(dbg_paperquad);
      PREDBGVAR(dbg_horiztext2);
+     PREDBGVAR(dbg_irregularquad);
  
      using Util::ObjectStorer;
  
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.90 
gzz/gfx/librenderables/renderables.py:1.91
*** gzz/gfx/librenderables/renderables.py:1.90  Tue Oct  1 08:56:35 2002
--- gzz/gfx/librenderables/renderables.py       Tue Oct  1 13:05:32 2002
***************
*** 363,369 ****
              lightParam.Light = ZVec(-1,-1,1);
              lightParam.Light_w = 0.0;
  
!           DBG(dbg) << "Paperquad: " <<
                    lightParam.orig << " " <<
                    lightParam.e0 << " " <<
                    lightParam.e1 << " " <<
--- 363,369 ----
              lightParam.Light = ZVec(-1,-1,1);
              lightParam.Light_w = 0.0;
  
!           DBG(dbg_paperquad) << "Paperquad: " <<
                    lightParam.orig << " " <<
                    lightParam.e0 << " " <<
                    lightParam.e1 << " " <<
***************
*** 382,388 ****
            double nonl = coords1.nonlinearity(ctr, len);
            
            int dice = (int)(len * nonl * dicefactor) + 2;
!           DBG(dbg) << "Dice: " << dice <<"\\n";
  
            float vertices[dice][dice][5];
            int indices[dice-1][2*dice];
--- 382,388 ----
            double nonl = coords1.nonlinearity(ctr, len);
            
            int dice = (int)(len * nonl * dicefactor) + 2;
!           DBG(dbg_paperquad) << "Dice: " << dice <<"\\n";
  
            float vertices[dice][dice][5];
            int indices[dice-1][2*dice];
***************
*** 408,414 ****
                    ZPt t = coords2inv.transform(p);
                    vertices[ix][iy][0] = t.x;
                    vertices[ix][iy][1] = t.y;
!                   DBG(dbg) << "   vert: " << 
                            ix << " " <<
                            iy << " : " <<
                            vertices[ix][iy][0] << " " <<
--- 408,414 ----
                    ZPt t = coords2inv.transform(p);
                    vertices[ix][iy][0] = t.x;
                    vertices[ix][iy][1] = t.y;
!                   DBG(dbg_paperquad) << "   vert: " << 
                            ix << " " <<
                            iy << " : " <<
                            vertices[ix][iy][0] << " " <<
***************
*** 426,450 ****
  
            for(Paper::Paper::iterator it = paper->begin(); it != paper->end(); 
++it) {
  
!               DBG(dbg) << "Pass\\n";
                (*it).setUp_VP(&lightParam);
  
!               DBG(dbg) << "Going to multidraw\\n";
                GLERR
                glMultiDrawElementsEXT(GL_QUAD_STRIP,
                        counts, GL_UNSIGNED_INT, (const GLvoid **)indps, 
dice-1);
  
!               DBG(dbg) << "Teardown\\n";
                GLERR
                (*it).tearDown_VP();
                GLERR
!               DBG(dbg) << "Pass over\\n";
  
            }
  
            glUnlockArraysEXT();
            glPopClientAttrib();
!           DBG(dbg) << "Pass over\\n";
  
            GLERR
        """,
--- 426,450 ----
  
            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();
            glPopClientAttrib();
!           DBG(dbg_paperquad) << "Passes over\\n";
  
            GLERR
        """,
***************
*** 653,659 ****
              
      """,
      "RenderCode" : """
!         DBG(dbg) << "Irregular quad\\n";
  
          setup();
          GLERR;
--- 653,659 ----
              
      """,
      "RenderCode" : """
!         DBG(dbg_irregularquad) << "Irregular quad\\n";
  
          setup();
          GLERR;
***************
*** 713,719 ****
           */
          float texf = 0.5;
  
!         DBG(dbg) << "Dice: " << dicex << " " << dicey << " " << diceb << "\n";
  
          for (int pass = 0; pass < (mode ? 4 : 1); pass++) {
  
--- 713,719 ----
           */
          float texf = 0.5;
  
!         DBG(dbg_irregularquad) << "Dice: " << dicex << " " << dicey << " " << 
diceb << "\n";
  
          for (int pass = 0; pass < (mode ? 4 : 1); pass++) {