[Gzz-commits] gzz/gfx/libpaper texcomb_NV1X.py

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/09/06 06:11:00

Modified files:
        gfx/libpaper   : texcomb_NV1X.py 

Log message:
        Choose combiner type randomly; add transparency to 
dot3-3color-interpolating combiner

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texcomb_NV1X.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gzz/gfx/libpaper/texcomb_NV1X.py
diff -c gzz/gfx/libpaper/texcomb_NV1X.py:1.7 
gzz/gfx/libpaper/texcomb_NV1X.py:1.8
*** gzz/gfx/libpaper/texcomb_NV1X.py:1.7        Thu Sep  5 08:34:25 2002
--- gzz/gfx/libpaper/texcomb_NV1X.py    Fri Sep  6 06:11:00 2002
***************
*** 83,89 ****
                FCI G SPARE0_NV UNSIGNED_INVERT_NV ALPHA
  
            """)
!       elif 1:
            # Band-like texture.
            #
            # A little different from what Tjl and Jvk originally
--- 83,89 ----
                FCI G SPARE0_NV UNSIGNED_INVERT_NV ALPHA
  
            """)
!       elif rnd.nextInt(2):
            # Band-like texture.
            #
            # A little different from what Tjl and Jvk originally
***************
*** 123,128 ****
--- 123,135 ----
              # d0 = t0 . r0
              # d1 = r1 . r1
              # lerp(d1, lerp(d0, c0, c1), c2)
+             # The alpha value is computed as d0^2 - d1^2
+ 
+             if trans > 0:
+                 finalG = "SPARE1_NV UNSIGNED_IDENTITY_NV"
+             else:
+                 finalG = "ZERO UNSIGNED_INVERT_NV"
+             
            c = ("""
                CI0 RGB A TEXTURE%(t0)s EXPAND_NORMAL_NV RGB
                  CI0 RGB B CONSTANT_COLOR0_NV EXPAND_NORMAL_NV RGB
***************
*** 136,147 ****
                CI1 RGB D SPARE0_NV UNSIGNED_INVERT_NV RGB
                CO1 RGB DISCARD_NV DISCARD_NV PRIMARY_COLOR_NV NONE NONE FALSE 
FALSE FALSE
  
                  FCI A SPARE1_NV UNSIGNED_IDENTITY_NV RGB
                  FCI B PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
                  FCI C FOG UNSIGNED_IDENTITY_NV RGB
                  FCI D ZERO UNSIGNED_IDENTITY_NV RGB
  
!               FCI G ZERO UNSIGNED_INVERT_NV ALPHA
            """)
              
              
--- 143,160 ----
                CI1 RGB D SPARE0_NV UNSIGNED_INVERT_NV RGB
                CO1 RGB DISCARD_NV DISCARD_NV PRIMARY_COLOR_NV NONE NONE FALSE 
FALSE FALSE
  
+                 CI1 ALPHA A SPARE0_NV SIGNED_IDENTITY_NV BLUE
+                 CI1 ALPHA B SPARE0_NV SIGNED_IDENTITY_NV BLUE
+                 CI1 ALPHA C SPARE1_NV SIGNED_NEGATE_NV BLUE
+                 CI1 ALPHA D SPARE1_NV SIGNED_IDENTITY_NV BLUE
+                 CO1 ALPHA DISCARD_NV DISCARD_NV SPARE1_NV NONE NONE FALSE 
FALSE FALSE
+ 
                  FCI A SPARE1_NV UNSIGNED_IDENTITY_NV RGB
                  FCI B PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
                  FCI C FOG UNSIGNED_IDENTITY_NV RGB
                  FCI D ZERO UNSIGNED_IDENTITY_NV RGB
  
!               FCI G %(finalG)s ALPHA
            """)