[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/24 12:11:41

Modified files:
        gfx/libpaper   : texcomb_NV1X.py 

Log message:
        Fraction-line combiner works now

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

Patches:
Index: gzz/gfx/libpaper/texcomb_NV1X.py
diff -c gzz/gfx/libpaper/texcomb_NV1X.py:1.12 
gzz/gfx/libpaper/texcomb_NV1X.py:1.13
*** gzz/gfx/libpaper/texcomb_NV1X.py:1.12       Tue Sep 24 11:58:20 2002
--- gzz/gfx/libpaper/texcomb_NV1X.py    Tue Sep 24 12:11:41 2002
***************
*** 44,49 ****
--- 44,52 ----
            Fog FOG_COLOR %(c2)s
        """ 
  
+         type = rnd.nextInt(3)
+         # types: 0=BAND-LIKE, 1=3-COL-LERP, 2=FRACTION-LINE
+ 
        # Then, select the combiner path type.
        if 0:
            # Stage 0: calculate dot products of the textures, and of
***************
*** 87,93 ****
                FCI G SPARE0_NV UNSIGNED_INVERT_NV ALPHA
  
            """)
!       elif rnd.nextInt(2):
            # Band-like texture.
            #
            # A little different from what Tjl and Jvk originally
--- 90,96 ----
                FCI G SPARE0_NV UNSIGNED_INVERT_NV ALPHA
  
            """)
!       elif type == 0:
            # Band-like texture.
            #
            # A little different from what Tjl and Jvk originally
***************
*** 128,134 ****
  
                FCI G %(finalG)s UNSIGNED_INVERT_NV BLUE
            """)
!         elif 1:
              # Interpolate between three colors:
              # d0 = t0 . r0
              # d1 = t1 . r1
--- 131,137 ----
  
                FCI G %(finalG)s UNSIGNED_INVERT_NV BLUE
            """)
!         elif type == 1:
              # Interpolate between three colors:
              # d0 = t0 . r0
              # d1 = t1 . r1
***************
*** 196,204 ****
                  # SPARE1 <- -(TEX0 . TEX1) 
                CI0 RGB A TEXTURE%(t0)s EXPAND_NORMAL_NV RGB
                CI0 RGB B TEXTURE%(t1)s EXPAND_NORMAL_NV RGB
!               CI0 RGB A TEXTURE%(t0)s EXPAND_NEGATE_NV RGB
!               CI0 RGB B TEXTURE%(t1)s EXPAND_NORMAL_NV RGB
!               CO0 RGB SPARE0_NV SPARE1_NV DISCARD_NV NONE NONE TRUE TRUE FALSE
  
                  # PRI_COL <- lerp(SPARE1, SEC_COL, PRI_COL)
                CI1 RGB A PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
--- 199,207 ----
                  # SPARE1 <- -(TEX0 . TEX1) 
                CI0 RGB A TEXTURE%(t0)s EXPAND_NORMAL_NV RGB
                CI0 RGB B TEXTURE%(t1)s EXPAND_NORMAL_NV RGB
!               CI0 RGB C TEXTURE%(t0)s EXPAND_NEGATE_NV RGB
!               CI0 RGB D TEXTURE%(t1)s EXPAND_NORMAL_NV RGB
!               CO0 RGB SPARE0_NV SPARE1_NV DISCARD_NV SCALE_BY_ONE_HALF_NV 
NONE TRUE TRUE FALSE
  
                  # PRI_COL <- lerp(SPARE1, SEC_COL, PRI_COL)
                CI1 RGB A PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
***************
*** 213,219 ****
                  FCI C FOG UNSIGNED_IDENTITY_NV RGB 
                  FCI D ZERO UNSIGNED_IDENTITY_NV RGB 
  
!                 # SPARE1.alpha <- t0.b * c0b + t1.b * c1.b
                  CI1 ALPHA A TEXTURE%(t0)s EXPAND_NORMAL_NV BLUE
                  CI1 ALPHA B CONSTANT_COLOR0_NV EXPAND_NORMAL_NV BLUE
                  CI1 ALPHA C TEXTURE%(t1)s EXPAND_NORMAL_NV BLUE
--- 216,222 ----
                  FCI C FOG UNSIGNED_IDENTITY_NV RGB 
                  FCI D ZERO UNSIGNED_IDENTITY_NV RGB 
  
!                 # SPARE1.alpha <- TEX0.b * CONST0.b + TEX1.b * CONST1.b
                  CI1 ALPHA A TEXTURE%(t0)s EXPAND_NORMAL_NV BLUE
                  CI1 ALPHA B CONSTANT_COLOR0_NV EXPAND_NORMAL_NV BLUE
                  CI1 ALPHA C TEXTURE%(t1)s EXPAND_NORMAL_NV BLUE