[Gzz-commits] gzz/gfx demo/irregu4.py libtexture/irregu.texture

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/11/14 05:48:52

Modified files:
        gfx/demo       : irregu4.py 
        gfx/libtexture : irregu.texture 

Log message:
        Use "," as params separtor in irregu.texture

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/irregu4.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libtexture/irregu.texture.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/irregu4.py
diff -u gzz/gfx/demo/irregu4.py:1.9 gzz/gfx/demo/irregu4.py:1.10
--- gzz/gfx/demo/irregu4.py:1.9 Wed Nov 13 11:28:44 2002
+++ gzz/gfx/demo/irregu4.py     Thu Nov 14 05:48:51 2002
@@ -8,21 +8,29 @@
 pap = ThePaperMill().getPaper(seed)
 paperquad = GLRen.createPaperQuad(pap, -2, -2, 2, 2, 0)
 
+texture = "sawnoise"
+params = "bias,0.5,scale,0.15,freq,1,df,2,scale2,0.25,freq2,10,df2,.5"
 
 ripple_scale = 0.25
-texRGBA = getCachedTexture([128, 128, 0, 4, "RGBA", "RGBA",
-                         "irregu", ["radius", "2",
-                                    "ripple_scale", str(ripple_scale),
-                                    "angle", "0",
-                                    "angles", "3",
-                                    "eps", ".125",
-                                    "scaling", "const"]],
-                        shade_all_levels = 1)
-texINTENSITY = getCachedTexture([128, 128, 0, 1, "INTENSITY", "LUMINANCE",
-                         "irregu", ["radius", "2",
-                                    "ripple_scale", str(ripple_scale),
-                                    ]],
-                        shade_all_levels = 1)
+texRGBA = getCachedTexture(
+    [128, 128, 0, 4, "RGBA", "RGBA", "irregu",
+     [ "texture", texture,
+       "params", params,
+       "ripple_scale", str(ripple_scale),
+       "radius", "2",
+       "angle", "0",
+       "angles", "3",
+       "eps", ".125",
+       "scaling", "const"]],
+    shade_all_levels = 1)
+
+texINTENSITY = getCachedTexture(
+    [128, 128, 0, 1, "INTENSITY", "LUMINANCE", "irregu",
+     [ "texture", texture,
+       "params", params,
+       "ripple_scale", str(ripple_scale),
+       ]],
+    shade_all_levels = 1)
 
 class IrreguScene:
     def __init__(self):
Index: gzz/gfx/libtexture/irregu.texture
diff -u gzz/gfx/libtexture/irregu.texture:1.17 
gzz/gfx/libtexture/irregu.texture:1.18
--- gzz/gfx/libtexture/irregu.texture:1.17      Wed Nov 13 10:58:38 2002
+++ gzz/gfx/libtexture/irregu.texture   Thu Nov 14 05:48:51 2002
@@ -24,6 +24,10 @@
        data[(ix1 + w * iy1) * c] * fx * fy;
 }
 
+void tr(char *s, char a, char b) {
+    while ((s = strchr(s, a)) != 0) *s = b;
+}
+
 void GENERATE(TextureParam *params, int width, int height, int depth, int 
components, float *data) {
     FPARAM(bias, 0);
     FPARAM(scale, 1);
@@ -57,12 +61,18 @@
     float xstep = 1.0 / width;
     float ystep = 1.0 / height;
 
+    const char *texture = params->getString("texture", "sawnoise");
+    char *texparams = strdup(params->getString("params", 
+           "bias,0.5,scale,0.15,freq,1,df,2,scale2,0.25,freq2,10,df2,.5"));
+
+    tr(texparams, ',', ' ');
+
     {
        char s[1000];
-       sprintf(s, "gfx/libtexture/%s %d %d %d %d %s", 
-               params->getString("texture", "sawnoise.bin"),
+       sprintf(s, "gfx/libtexture/%s.bin %d %d %d %d %s", 
+               texture,
                width, height, depth, 4, 
-               params->getString("params", "bias 0.5 scale 0.15 freq 1 df 2 
scale2 0.25 freq2 10 df2 .5"));    
+               texparams);     
        fprintf(stderr, "popen: %s", s);
        
        // XXX SECURITY