[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 02:13:10

Modified files:
        gfx/demo       : fontfilter.py 

Log message:
        try scaling the texture values

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

Patches:
Index: gzz/gfx/demo/fontfilter.py
diff -u gzz/gfx/demo/fontfilter.py:1.1 gzz/gfx/demo/fontfilter.py:1.2
--- gzz/gfx/demo/fontfilter.py:1.1      Tue Jan 28 11:29:11 2003
+++ gzz/gfx/demo/fontfilter.py  Wed Jan 29 02:13:10 2003
@@ -12,8 +12,13 @@
 rect = GLSpans.getRect(pis.getCurrent())
 
 class Scene:
+    def inv(self, *args):
+        self.bias, self.sharpness = -self.bias, -self.sharpness
+        print self.bias, self.sharpness
     def __init__(self):
+        
         self.scales = [ 1, 2, 4, 0, .5 ]
+        self.textscales = [ 2, 4 ]
        self.key = KeyPresses(self,
            SlideLin("x", 0, 30, "x coord", "Left", "Right"),
            SlideLin("y", 0, 30, "x coord", "Up", "Down"),
@@ -21,10 +26,14 @@
            SlideLin("yg", 0, 30, "x coord", "i", ","),
            SlideLog("ps", 800, "paper scale", "<", ">"),
            SlideLin("ang", 0,  5, "angle", "Prior", "Next"),
-           SlideLin("sharpness", .75, .125, "sharpness", "-", "+"),
+           SlideLin("sharpness", .5, .25, "sharpness", "-", "+"),
            SlideLin("bias", 1, .25, "LOD bias", "B", "b"),
            ListIndex("scaleind", "scales", 0, "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),
        )
 
     def scene(self, vs):
@@ -70,13 +79,15 @@
 
        texid = rect.texId
 
-        sharp = self.sharpness
+        sharp = .5 + .5 * self.sharpness
         scale = self.scales[self.scaleind]
         s = 1
         if scale == 0:
             s = 0
             scale = 1
         bias = self.bias
+
+        textscale = self.textscales[self.tscaleind]
         
        code = parseCombiner("""
        BindTexture TEXTURE_2D %(texid)s
@@ -97,18 +108,18 @@
        CONST0 = %(s)s %(s)s %(s)s %(sharp)s
 
        SPARE0 = ((1-TEX1) * CONST0) * %(scale)s
-       SPARE0.a = (CONST0.a * TEX0.b + (.5 - CONST0.a) * TEX1.b) * 2
+       SPARE0.a = (CONST0.a * (1-TEX0.b) + (.5 - CONST0.a) * (1-TEX1.b)) * 
%(textscale)s
 
-        SPARE1.a = (1 - SPARE0.b) * SPARE0.a
+        SPARE1.a = (1 - SPARE0.b) * (1-SPARE0.a)
 
-       color = SPARE0.a * SPARE0
+       color = (1-SPARE0.a) * SPARE0
        alpha = SPARE1.a
 
-        # a: text as 0 (SPARE0.a)
+        # a: text as 1 (SPARE0.a)
         # b: text halo as 1 (SPARE0)
         # bg = DST * (1 - b) + b
-        # blend = (1-a) * 0 + a * bg
-        #       = a * b + a * (1 - b) * DST
+        # blend = a * 0 + (1 - a) * bg
+        #       = (1 - a) * b + (1 - a) * (1 - b) * DST
 
        Disable ALPHA_TEST
        Enable BLEND
@@ -126,6 +137,10 @@
         """ % locals())
        #print code
         vs.map.put(getDList(code), cs1)
+
+        print "HALO = TXB[%s] * %s" % (bias, self.scales[self.scaleind])
+        print "COL = (%s * TEX + %s * TXB[%s]) * %s" % (1 + self.sharpness, 
-self.sharpness, bias, self.textscales[self.tscaleind]*.5)
+        print "BLEND = lerp( lerp(DST, 1, HALO), 0, COL )"
 
 
 currentScene = Scene()