[Gzz-commits] gzz/gfx/demo fontfilter.py

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        03/01/29 08:41:22

Modified files:
        gfx/demo       : fontfilter.py 

Log message:
        Add halo amplitude control

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

Patches:
Index: gzz/gfx/demo/fontfilter.py
diff -u gzz/gfx/demo/fontfilter.py:1.11 gzz/gfx/demo/fontfilter.py:1.12
--- gzz/gfx/demo/fontfilter.py:1.11     Wed Jan 29 08:26:36 2003
+++ gzz/gfx/demo/fontfilter.py  Wed Jan 29 08:41:22 2003
@@ -38,6 +38,7 @@
            Toggle("aniso", 1, "anisotropic filter", "a"),
            SlideLog("aspect", 1, "aspect ratio", "Home", "End"),
            SlideLin("halo_low", 0, 1./32, "halo threshold", "Y", "y"),
+           SlideLin("halo_high", 1, 1./32, "halo amplitude", "U", "u"),
        )
         self.prevseed = 0
 
@@ -144,6 +145,8 @@
         s = t / (4.0 * scale)
         b = -(1 - 2 * (1 - self.halo_low)) * s
 
+        clamp = self.halo_high 
+
         textscale = self.textscales[self.tscaleind]
         foo = ""
         if textscale == 0: foo = "(0)#"
@@ -156,19 +159,22 @@
        code = parseCombiner("""
        Enable REGISTER_COMBINERS_NV
        CONST0 = %(s)s %(s)s %(s)s %(sharp)s
-        CONST1 = %(b)s %(b)s %(b)s 0
+        CONST1 = %(b)s %(b)s %(b)s %(clamp)s
 
        SPARE0.a = ((1-2*%(halotex)s.b) * CONST0.b + CONST1.b) * %(scale)s
        SPARE0 = %(foo)s(CONST0.a * (1-TEX0) + (.5 - CONST0.a) * (1-TEX1)) * 
%(textscale)s
 
-        SPARE1 = (1 - SPARE0) * (1-2*SPARE0.a)
         SPARE0.a = (SPARE0.a) * 2
 
+        SPARE0.a = SPARE0.a * CONST1.a
+
+        SPARE1 = (1 - SPARE0) * (1-SPARE0.a)
+
        color = (1-SPARE0) * SPARE0.a
        alpha = SPARE1.b
 
         # text as 1 = SPARE0
-        # halo as 1 = 2*SPARE0.a
+        # halo as 1 = SPARE0.a
         # bg = DST * (1 - halo) + halo
         # blend = text * 0 + (1 - text) * bg
         #       = (1 - text) * halo + (1 - text) * (1 - halo) * DST
@@ -196,8 +202,8 @@
         cstext = vs.affineCS(0, "text", 0, 0, 0, 40, 0, 0, 40)
 
         if self.tex2:
-            putText(vs, cstext, "HALO = (TXB[%s] - %s) * %s" %
-                    (self.bias2, self.halo_low, self.scale),
+            putText(vs, cstext, "HALO = clamp((TXB[%s] - %s) * %s) * %s" %
+                    (self.bias2, self.halo_low, self.scale, self.halo_high),
                     y = 1, color = (0,0,0), key = "line1")
         else:
             putText(vs, cstext, "HALO = (TXB[%s] - %s) * %s" %