[Gzz-commits] libvob src/paper/Paper.cxx vob/paper/textures.p...

[Matti Katila]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Matti Katila <address@hidden>   03/05/01 20:06:30

Modified files:
        src/paper      : Paper.cxx 
        vob/paper      : textures.py 
        vob/putil      : misc.py nvcode.py 

Log message:
        commit against my proposal mail of better dbg msgs

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/paper/Paper.cxx.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/paper/textures.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/misc.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/nvcode.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: libvob/src/paper/Paper.cxx
diff -u libvob/src/paper/Paper.cxx:1.3 libvob/src/paper/Paper.cxx:1.4
--- libvob/src/paper/Paper.cxx:1.3      Tue Apr  1 06:03:54 2003
+++ libvob/src/paper/Paper.cxx  Thu May  1 20:06:30 2003
@@ -366,7 +366,7 @@
     
     code += "END\n";
     
-    std::cerr << "Creating VPCode with the source " << code << "\n";
+    //std::cerr << "Creating VPCode with the source " << code << "\n";
     
     texgenvp = ARBVertexProgram(code.c_str());
   }
Index: libvob/vob/paper/textures.py
diff -u libvob/vob/paper/textures.py:1.1 libvob/vob/paper/textures.py:1.2
--- libvob/vob/paper/textures.py:1.1    Thu Apr 10 10:00:19 2003
+++ libvob/vob/paper/textures.py        Thu May  1 20:06:30 2003
@@ -37,6 +37,8 @@
 import java
 from math import exp
 
+dbg = 0
+
 texture_format = "RGBA"
 texture_components = 4
 
@@ -67,7 +69,8 @@
 
     def getTexId(self):
         if not hasattr(self, "texture"):
-            print "Generating texture: ", self.name, self.args
+            if dbg:
+                print "Generating texture: ", self.name, self.args
             self.texture = getCachedTexture(self.args)
             # XXX: FIXME: 1D/3D textures!!!
             target = "TEXTURE_2D"
@@ -425,7 +428,8 @@
             text_comps, text_form = 4, 'RGBA'
             
         self.textures = init(text_comps, text_form)
-        print "Textures created: components: %d, format: %s" % (text_comps, 
text_form)
+        if dbg:
+            print "Textures created: components: %d, format: %s" % 
(text_comps, text_form)
 
         
     def getPaperTexture(self, type, gen):
Index: libvob/vob/putil/misc.py
diff -u libvob/vob/putil/misc.py:1.2 libvob/vob/putil/misc.py:1.3
--- libvob/vob/putil/misc.py:1.2        Fri Apr 11 08:51:28 2003
+++ libvob/vob/putil/misc.py    Thu May  1 20:06:30 2003
@@ -20,6 +20,8 @@
 # 
 # 
 
+dbg = 0
+
 import java
 
 import vob
@@ -160,9 +162,11 @@
     key = str(args)
     if not textures.has_key(key):
        textures[key] = GL.createTexture()
-       print "Generating texture: ", args
+        if dbg:
+            print "Generating texture: ", args
        res = textures[key].shade(*args)
-       print "SHADER: ", res
+        if dbg:
+            print "SHADER: ", res
     return textures[key]
 
 
Index: libvob/vob/putil/nvcode.py
diff -u libvob/vob/putil/nvcode.py:1.1 libvob/vob/putil/nvcode.py:1.2
--- libvob/vob/putil/nvcode.py:1.1      Thu Apr 10 10:00:19 2003
+++ libvob/vob/putil/nvcode.py  Thu May  1 20:06:30 2003
@@ -24,6 +24,8 @@
 # Some code to make it easier to deal with NVidia
 # OpenGL extensions
 
+dbg = 0
+
 def combinercode(c):
     return (c.replace("CI0", "CombinerInputNV COMBINER0_NV").
                replace("CI1", "CombinerInputNV COMBINER1_NV").
@@ -902,7 +904,8 @@
         fp = fpcodes[fpcode]
     else:
         fp = GL.createProgram(fpcode)
-        print "Creating fragment program %s" % fp.getProgId()
+        if dbg:
+            print "Creating fragment program %s" % fp.getProgId()
         fpcodes[fpcode] = fp
 
     return """