[Gzz-commits] gzz/gfx libcallgl/callgl.cxx libpaper/texcomb_G...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/10/09 08:23:58

Modified files:
        gfx/libcallgl  : callgl.cxx 
        gfx/libpaper   : texcomb_GL1_1.py 

Log message:
        oneliners..

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcallgl/callgl.cxx.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texcomb_GL1_1.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gfx/libcallgl/callgl.cxx
diff -c gzz/gfx/libcallgl/callgl.cxx:1.20 gzz/gfx/libcallgl/callgl.cxx:1.21
*** gzz/gfx/libcallgl/callgl.cxx:1.20   Tue Oct  1 09:38:03 2002
--- gzz/gfx/libcallgl/callgl.cxx        Wed Oct  9 08:23:57 2002
***************
*** 524,530 ****
  
        gltoken *t = (gltoken*)bsearch(str, tokenarr, 
sizeof(tokenarr)/sizeof(tokenarr[0])-1, sizeof(tokenarr[0]), cmptoken);
        if (t == NULL) {
!       cerr << "Unkonwn token \"" << tok << "\"\n";
        return 0;
        }
        //cout << "getToken(\"" << tok << "\") = " << t->value << "\n";
--- 524,530 ----
  
        gltoken *t = (gltoken*)bsearch(str, tokenarr, 
sizeof(tokenarr)/sizeof(tokenarr[0])-1, sizeof(tokenarr[0]), cmptoken);
        if (t == NULL) {
!       cerr << "Unknown token \"" << tok << "\"\n";
        return 0;
        }
        //cout << "getToken(\"" << tok << "\") = " << t->value << "\n";
Index: gzz/gfx/libpaper/texcomb_GL1_1.py
diff -c gzz/gfx/libpaper/texcomb_GL1_1.py:1.1 
gzz/gfx/libpaper/texcomb_GL1_1.py:1.2
*** gzz/gfx/libpaper/texcomb_GL1_1.py:1.1       Mon Oct  7 11:20:06 2002
--- gzz/gfx/libpaper/texcomb_GL1_1.py   Wed Oct  9 08:23:58 2002
***************
*** 39,47 ****
              # CombinerParameterNV NUM_GENERAL_COMBINERS_NV 2
  
  
  
!             #TexEnv 
! 
  
            
              # CombinerParameterNV CONSTANT_COLOR0_NV %(r0)s
--- 39,49 ----
              # CombinerParameterNV NUM_GENERAL_COMBINERS_NV 2
  
  
+             # First texenv p. 402
+             TexEnv GL_TEXTURE_ENV GL_TEXTURE_ENV_MODE GL_BLEND
  
!             # Multitexturing
!             #Multitexture 
  
            
              # CombinerParameterNV CONSTANT_COLOR0_NV %(r0)s