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

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/10/22 04:21:50

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

Log message:
        Fix ripple scale arg

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/irregu3.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libtexture/irregu.texture.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/irregu3.py
diff -u gzz/gfx/demo/irregu3.py:1.11 gzz/gfx/demo/irregu3.py:1.12
--- gzz/gfx/demo/irregu3.py:1.11        Tue Oct 22 03:14:12 2002
+++ gzz/gfx/demo/irregu3.py     Tue Oct 22 04:21:50 2002
@@ -1,14 +1,15 @@
 from math import sin,cos,sqrt,pi
 
 ripple_scale = .25
+size = 256
 
-args = ["radius", "2", str(ripple_scale), "0.25",
+args = ["radius", "2", "ripple_scale", str(ripple_scale),
         "scale", ".25", "bias", ".75", "eps", ".125"]
 
 tex = GL.createTexture()
 texinv = GL.createTexture()
-tex.shade_all_levels(128, 128, 0, 4, "RGBA", "RGBA", "irregu", args)
-texinv.shade_all_levels(128, 128, 0, 4, "RGBA", "RGBA", "irregu", args +
+tex.shade_all_levels(size, size, 0, 4, "RGBA", "RGBA", "irregu", args)
+texinv.shade_all_levels(size, size, 0, 4, "RGBA", "RGBA", "irregu", args +
                         ["invert", "1"])
 
 
@@ -208,7 +209,7 @@
 
 class IrreguScene:
     def __init__(self):
-        self.scale = 128
+        self.scale = size
         self.dist = 1
         self.angle = 0
         self.pos = 0
Index: gzz/gfx/libtexture/irregu.texture
diff -u gzz/gfx/libtexture/irregu.texture:1.6 
gzz/gfx/libtexture/irregu.texture:1.7
--- gzz/gfx/libtexture/irregu.texture:1.6       Mon Oct 21 13:37:08 2002
+++ gzz/gfx/libtexture/irregu.texture   Tue Oct 22 04:21:50 2002
@@ -6,6 +6,8 @@
 #define INVERT(i, x) ((i) + 2 * (0.5 - (i)) * (x))
 
 float func(float x, float y) {
+    x*=2;
+    y*=2;
     float t = x*5;
     float u = y*7;
     return  .5 + .1 * sin(x*M_PI*2*4) - .1*(t-floor(t)) + .1*sin(y*M_PI*2)