[ff-cvs] libvob src/texture/irregu.texture vob/putil/eff...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/16 08:22:24

Modified files:
        src/texture    : irregu.texture 
        vob/putil      : effects.py 

Log message:
        Silence and less accuracy

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/texture/irregu.texture.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/effects.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: libvob/src/texture/irregu.texture
diff -u libvob/src/texture/irregu.texture:1.5 
libvob/src/texture/irregu.texture:1.6
--- libvob/src/texture/irregu.texture:1.5       Sat Aug 16 08:20:14 2003
+++ libvob/src/texture/irregu.texture   Sat Aug 16 08:22:24 2003
@@ -95,8 +95,10 @@
 
     tr(texparams, ',', ' ');
 
+    bool dbg = 0;
+
     {
-       fprintf(stderr, "reading\n");
+       if(dbg) fprintf(stderr, "reading\n");
        char s[1000];
        sprintf(s, "../libvob/src/texture/%s.bin %d %d %d %d %s", 
                texture,
@@ -114,7 +116,7 @@
 
        fread(data, sizeof(float), width * height * depth * 4, f);
        pclose(f);
-       fprintf(stderr, "read\n");
+       if(dbg) fprintf(stderr, "read\n");
     }
 
     for (i = 0; i < width * height * depth * 4; i++) {
@@ -139,7 +141,7 @@
        if (angles)
            data[i] = floor(data[i] * quantize + 0.5) / quantize;
     }
-    fprintf(stderr, "l1\n");
+    if(dbg) fprintf(stderr, "l1\n");
     
     for (int comp = 0; comp < angles && comp < components; comp++) {
 
@@ -215,14 +217,14 @@
                data[i+3]);
     }
 #endif
-    fprintf(stderr, "l2\n");
+    if(dbg) fprintf(stderr, "l2\n");
 
     for (int i = 0; i < width * height * depth; i++)
        for (int c = angles; c < components; c++) 
            origdata[i * components + c] = data[4 * i + 3 - (c - angles)];
 
     delete[] data;
-    fprintf(stderr, "done\n");
+    if(dbg) fprintf(stderr, "done\n");
 }
 
 
Index: libvob/vob/putil/effects.py
diff -u libvob/vob/putil/effects.py:1.3 libvob/vob/putil/effects.py:1.4
--- libvob/vob/putil/effects.py:1.3     Sat Aug 16 08:20:14 2003
+++ libvob/vob/putil/effects.py Sat Aug 16 08:22:24 2003
@@ -28,11 +28,13 @@
 from vob.putil.nvcode import parseCombiner
 from vob.paper.texcache import getCachedTexture
 
+dbg = 0
+
 class IrreguFrame(IrregularFrame):
     dicefactor = .4
     # dicefactor = 0.03
 
-    print "Start Irregu shading..."
+    if dbg: print "Start Irregu shading..."
 
     tex = GL.createTexture()
     tex = getCachedTexture([128, 128, 0, 1, "INTENSITY", "LUMINANCE",
@@ -42,18 +44,18 @@
     #                       "scale", "0.2", "freq", "1", "df", "2", 
     #                       "scale2", "0.05", "freq2", "12", "df2", "1.5"])
 
-    print "part 1 done"
+    if dbg: print "part 1 done"
     ripple_scale = 0.25
     tex2 = getCachedTexture([256, 256, 0, 4, "RGBA", "RGBA",
                              "irregu", ["radius", "2",
                                         "ripple_scale", str(ripple_scale),
                                         "angle", "0",
                                         "angles", "3",
-                                        "eps", ".125",
+                                        "eps", ".250",
                                         "scaling", "const"]],
                             shade_all_levels = 1)
 
-    print "done"
+    if dbg: print "done"
 
     boxtex = GL.createTexture()