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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/11/26 05:48:41

Modified files:
        gfx/demo       : paperbasis.py 
        gfx/libutil    : nvcode.py 

Log message:
        Better...

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

Patches:
Index: gzz/gfx/demo/paperbasis.py
diff -u gzz/gfx/demo/paperbasis.py:1.22 gzz/gfx/demo/paperbasis.py:1.23
--- gzz/gfx/demo/paperbasis.py:1.22     Tue Nov 26 05:32:57 2002
+++ gzz/gfx/demo/paperbasis.py  Tue Nov 26 05:48:41 2002
@@ -80,14 +80,25 @@
        color = EF*COL0 + (1-EF)*COL1
        alpha = 1
     """),
-    "BANDX_2" : nvcode.parseCombiner("""
+    "SHAPEX_2" : nvcode.parseCombiner("""
        SPARE0 = ((2*TEX0-1) * (2*TEX1-1)) * 4
 
-       SPARE0 = ((+SPARE0).(2*CONST0-1)) * 2
+       SPARE0 = ((+SPARE0).(2*CONST0-1)) * 1
 
        color = SPARE0 
        alpha = 1
     """),
+    "SHAPEX_3" : nvcode.parseCombiner("""
+       SPARE0 = ((2*TEX0-1) * (2*TEX1-1)) * 4
+       SPARE1.a = ((TEX1.blue)*(TEX0.blue)) * 4
+
+       SPARE0 = ((+SPARE0).(2*CONST0-1)) * 1
+       COL0 = COL0 * (SPARE1.a)
+
+       EF = FOG * (1-SPARE1.a)
+       color = SPARE0 * COL0 + (1-SPARE0) * COL1 + EF
+       alpha = 1
+    """),
 }
 
 
@@ -327,9 +338,13 @@
        
        self.pt.place(vs,
            vs.orthoCS(0, "S8", 0, 500, 150, 400, 400),
-           "RGB0", "BANDX_2", "RGB1")
+           "RGB0", "SHAPEX_2", "RGB1")
+       
+       self.pt.place(vs,
+           vs.orthoCS(0, "S9", 0, 700, 350, 400, 400),
+           "RGB0", "SHAPEX_3", "RGB1")
 
-       print texcodes["BANDX_2"]
+       print texcodes["SHAPEX_3"]
 
 currentScene = PaperFlowScene()        
 
Index: gzz/gfx/libutil/nvcode.py
diff -u gzz/gfx/libutil/nvcode.py:1.11 gzz/gfx/libutil/nvcode.py:1.12
--- gzz/gfx/libutil/nvcode.py:1.11      Mon Nov 25 11:38:39 2002
+++ gzz/gfx/libutil/nvcode.py   Tue Nov 26 05:48:41 2002
@@ -271,7 +271,7 @@
                 else: out[reg] = "ZERO UNSIGNED_INVERT_NV ALPHA"
                 neg >>= 1
     else:
-        print "ERROR: General combiner function", key, "not recognized"
+        print "ERROR: General combiner function", key, "not recognized", tree
         return None
 
     return out