[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:14:17

Modified files:
        gfx/demo       : fontfilter.py 

Log message:
        swap rgb/a usage for halo/text

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

Patches:
Index: gzz/gfx/demo/fontfilter.py
diff -u gzz/gfx/demo/fontfilter.py:1.9 gzz/gfx/demo/fontfilter.py:1.10
--- gzz/gfx/demo/fontfilter.py:1.9      Wed Jan 29 07:59:25 2003
+++ gzz/gfx/demo/fontfilter.py  Wed Jan 29 08:14:17 2003
@@ -158,16 +158,16 @@
        CONST0 = %(s)s %(s)s %(s)s %(sharp)s
         CONST1 = %(b)s %(b)s %(b)s 0
 
-       SPARE0 = ((1-2*%(halotex)s) * CONST0 + CONST1) * %(scale)s
-       SPARE0.a = %(foo)s(CONST0.a * (1-TEX0.b) + (.5 - CONST0.a) * 
(1-TEX1.b)) * %(textscale)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.a = (1 - SPARE0.b) * (1-SPARE0.a)
 
-       color = (1-SPARE0.a) * SPARE0
+       color = (1-SPARE0) * SPARE0.a
        alpha = SPARE1.a
 
-        # a: text as 1 (SPARE0.a)
-        # b: text halo as 1 (SPARE0)
+        # a: text as 1 (SPARE0)
+        # b: text halo as 1 (SPARE0.a)
         # bg = DST * (1 - b) + b
         # blend = a * 0 + (1 - a) * bg
         #       = (1 - a) * b + (1 - a) * (1 - b) * DST