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

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/11/26 05:52:13

Modified files:
        gfx/demo       : paperbasis.py 

Log message:
        Fit BAND2 and BAND3 in two stages

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

Patches:
Index: gzz/gfx/demo/paperbasis.py
diff -u gzz/gfx/demo/paperbasis.py:1.23 gzz/gfx/demo/paperbasis.py:1.24
--- gzz/gfx/demo/paperbasis.py:1.23     Tue Nov 26 05:48:41 2002
+++ gzz/gfx/demo/paperbasis.py  Tue Nov 26 05:52:13 2002
@@ -59,22 +59,22 @@
     """),
     "BAND2" : nvcode.parseCombiner("""
        SPARE0 = ((2*TEX0-1) . (2*TEX1-1)) * 4
-       SPARE1 = ((2*TEX0-1).(2*CONST0-1)) * 2
+       SPARE1 = ((2*TEX0-1).(2*CONST0-1)) * 4
        SPARE1.a = ((TEX1.blue)*(TEX0.blue)) * 4
 
        SPARE0 = ((+SPARE0)*(+SPARE0)) * 2
-       SPARE1 = (SPARE1) + (SPARE1.a)
+       SPARE1 = ((SPARE1) * (SPARE1.a)) * 2
 
        color = SPARE0 * SPARE1
        alpha = 1
     """),
     "BAND3" : nvcode.parseCombiner("""
        SPARE0 = ((2*TEX0-1) . (2*TEX1-1)) * 4
-       SPARE1 = ((2*TEX0-1).(2*CONST0-1)) * 2
+       SPARE1 = ((2*TEX0-1).(2*CONST0-1)) * 4
        SPARE1.a = ((TEX1.blue)*(TEX0.blue)) * 4
 
        SPARE0 = ((+SPARE0)*(+SPARE0)) * 2
-       SPARE1 = (SPARE1) + (SPARE1.a)
+       SPARE1 = ((SPARE1) * (SPARE1.a)) * 2
 
        EF = SPARE0 * SPARE1
        color = EF*COL0 + (1-EF)*COL1