[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 07:42:22

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.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/fontfilter.py
diff -u gzz/gfx/demo/fontfilter.py:1.7 gzz/gfx/demo/fontfilter.py:1.8
--- gzz/gfx/demo/fontfilter.py:1.7      Wed Jan 29 05:50:23 2003
+++ gzz/gfx/demo/fontfilter.py  Wed Jan 29 07:42:21 2003
@@ -19,7 +19,6 @@
 
         self.tex2 = GL.hasExtension("GL_NV_register_combiners2")
         
-        self.scales = [ 1, 2, 4, 0, .5 ]
         self.textscales = [ 2, 4 ]
        self.key = KeyPresses(self,
            SlideLin("x", 0, 30, "x coord", "Left", "Right"),
@@ -31,7 +30,7 @@
            SlideLin("sharpness", .5, .25, "sharpness", "-", "+"),
            SlideLin("bias", 1, .25, "LOD bias", "B", "b"),
            SlideLin("bias2", 1, .25, "halo LOD bias", "H", "h"),
-           ListIndex("scaleind", "scales", 0, "text halo scale", "S", "s"),
+           SlideLin("scale", 1, .25, "text halo scale", "S", "s"),
            ListIndex("tscaleind", "textscales", 0, "text scale", "D", "d"),
            Toggle("texfilt", 1, "texture filtering", "f"),
             Action("Invert biases", "t", self.inv, noAnimation=1),
@@ -43,6 +42,9 @@
         self.prevseed = 0
 
     def scene(self, vs):
+        if self.scale > 8: self.scale = 8
+        if self.scale < 0: self.scale = 0
+        
        putnoc(vs, background((.5,.8,.5)))
 
         if self.prevseed != self.seed:
@@ -128,12 +130,19 @@
            600, 0, 0, 600)
 
         sharp = .5 + .5 * self.sharpness
-        scale = self.scales[self.scaleind]
-        s = 1
-        if scale == 0:
-            s = 0
+
+        t = self.scale
+        if t >= 4:
+            scale = 4
+        elif t >= 2:
+            scale = 2
+        elif t >= 1:
             scale = 1
-        b = self.halo_low
+        else:
+            scale = 0.5
+
+        s = t / (2.0 * scale)
+        b = -(1 - 2 * (1 - self.halo_low)) * s
 
         textscale = self.textscales[self.tscaleind]
 
@@ -147,7 +156,7 @@
        CONST0 = %(s)s %(s)s %(s)s %(sharp)s
         CONST1 = %(b)s %(b)s %(b)s 0
 
-       SPARE0 = ((1-%(halotex)s) * CONST0 - CONST1) * %(scale)s
+       SPARE0 = ((1-2*%(halotex)s) * CONST0 + CONST1) * %(scale)s
        SPARE0.a = (CONST0.a * (1-TEX0.b) + (.5 - CONST0.a) * (1-TEX1.b)) * 
%(textscale)s
 
         SPARE1.a = (1 - SPARE0.b) * (1-SPARE0.a)
@@ -185,11 +194,11 @@
 
         if self.tex2:
             putText(vs, cstext, "HALO = (TXB[%s] - %s) * %s" %
-                    (self.bias2, self.halo_low, self.scales[self.scaleind]),
+                    (self.bias2, self.halo_low, self.scale),
                     y = 1, color = (0,0,0), key = "line1")
         else:
             putText(vs, cstext, "HALO = (TXB[%s] - %s) * %s" %
-                    (self.bias, self.halo_low, self.scales[self.scaleind]),
+                    (self.bias, self.halo_low, self.scale),
                     y = 1, color = (0,0,0), key = "line1")
         
         putText(vs, cstext, "COL = (%s * TEX + %s * TXB[%s]) * %s" %