[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:26:36

Modified files:
        gfx/demo       : fontfilter.py 

Log message:
        Increase halo scaling range

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

Patches:
Index: gzz/gfx/demo/fontfilter.py
diff -u gzz/gfx/demo/fontfilter.py:1.10 gzz/gfx/demo/fontfilter.py:1.11
--- gzz/gfx/demo/fontfilter.py:1.10     Wed Jan 29 08:14:17 2003
+++ gzz/gfx/demo/fontfilter.py  Wed Jan 29 08:26:36 2003
@@ -42,7 +42,7 @@
         self.prevseed = 0
 
     def scene(self, vs):
-        if self.scale > 8: self.scale = 8
+        if self.scale > 16: self.scale = 16
         if self.scale < 0: self.scale = 0
         
        putnoc(vs, background((.5,.8,.5)))
@@ -131,17 +131,17 @@
 
         sharp = .5 + .5 * self.sharpness
 
-        t = self.scale
-        if t >= 4:
+        t = self.scale 
+        if t >= 8:
             scale = 4
-        elif t >= 2:
+        elif t >= 4:
             scale = 2
-        elif t >= 1:
+        elif t >= 2:
             scale = 1
         else:
             scale = 0.5
 
-        s = t / (2.0 * scale)
+        s = t / (4.0 * scale)
         b = -(1 - 2 * (1 - self.halo_low)) * s
 
         textscale = self.textscales[self.tscaleind]
@@ -161,16 +161,17 @@
        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)
+        SPARE1 = (1 - SPARE0) * (1-2*SPARE0.a)
+        SPARE0.a = (SPARE0.a) * 2
 
        color = (1-SPARE0) * SPARE0.a
-       alpha = SPARE1.a
+       alpha = SPARE1.b
 
-        # 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
+        # text as 1 = SPARE0
+        # halo as 1 = 2*SPARE0.a
+        # bg = DST * (1 - halo) + halo
+        # blend = text * 0 + (1 - text) * bg
+        #       = (1 - text) * halo + (1 - text) * (1 - halo) * DST
 
        Disable ALPHA_TEST
        Enable BLEND