[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/09 08:00:05

Modified files:
        gfx/libpaper   : texcomb_NV1X.py 

Log message:
        Comment combiners; the comments are redundant but they make the code 
much easier to read

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

Patches:
Index: gzz/gfx/libpaper/texcomb_NV1X.py
diff -c gzz/gfx/libpaper/texcomb_NV1X.py:1.8 
gzz/gfx/libpaper/texcomb_NV1X.py:1.9
*** gzz/gfx/libpaper/texcomb_NV1X.py:1.8        Fri Sep  6 06:11:00 2002
--- gzz/gfx/libpaper/texcomb_NV1X.py    Mon Sep  9 08:00:05 2002
***************
*** 96,116 ****
              else:
                  finalG = "ZERO"
  
-           # Stage 0: multiply the two textures
            c = ("""
                CI0 RGB A TEXTURE%(t0)s EXPAND_NORMAL_NV RGB
                CI0 RGB B TEXTURE%(t1)s EXPAND_NORMAL_NV RGB
                CO0 RGB SPARE0_NV DISCARD_NV DISCARD_NV NONE NONE TRUE FALSE 
FALSE
  
                CI1 RGB A SPARE0_NV SIGNED_IDENTITY_NV RGB
                CI1 RGB B SPARE0_NV SIGNED_IDENTITY_NV RGB
                CI1 RGB C TEXTURE%(t0)s EXPAND_NORMAL_NV RGB
                CI1 RGB D CONSTANT_COLOR0_NV EXPAND_NORMAL_NV RGB
                CO1 RGB SPARE1_NV SPARE0_NV DISCARD_NV SCALE_BY_TWO_NV NONE 
FALSE TRUE FALSE
  
                FCI E SPARE1_NV UNSIGNED_INVERT_NV RGB
                FCI F SPARE0_NV UNSIGNED_IDENTITY_NV RGB
  
                FCI A E_TIMES_F_NV UNSIGNED_IDENTITY_NV RGB
                FCI B PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
                FCI C SECONDARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
--- 96,122 ----
              else:
                  finalG = "ZERO"
  
            c = ("""
+                 # Band-like texture
+                 
+                 # SPARE0 <- (TEX0 . TEX1)
                CI0 RGB A TEXTURE%(t0)s EXPAND_NORMAL_NV RGB
                CI0 RGB B TEXTURE%(t1)s EXPAND_NORMAL_NV RGB
                CO0 RGB SPARE0_NV DISCARD_NV DISCARD_NV NONE NONE TRUE FALSE 
FALSE
  
+                 # SPARE1 <- SPARE0 * SPARE0 * 2 
+                 # SPARE0 <- (TEX0 . CONST0) * 2
                CI1 RGB A SPARE0_NV SIGNED_IDENTITY_NV RGB
                CI1 RGB B SPARE0_NV SIGNED_IDENTITY_NV RGB
                CI1 RGB C TEXTURE%(t0)s EXPAND_NORMAL_NV RGB
                CI1 RGB D CONSTANT_COLOR0_NV EXPAND_NORMAL_NV RGB
                CO1 RGB SPARE1_NV SPARE0_NV DISCARD_NV SCALE_BY_TWO_NV NONE 
FALSE TRUE FALSE
  
+                 # EF <- SPARE0 * SPARE1
                FCI E SPARE1_NV UNSIGNED_INVERT_NV RGB
                FCI F SPARE0_NV UNSIGNED_IDENTITY_NV RGB
  
+                 # lerp(EF, PRI_COL, SEC_COL)
                FCI A E_TIMES_F_NV UNSIGNED_IDENTITY_NV RGB
                FCI B PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
                FCI C SECONDARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
***************
*** 131,154 ****
--- 137,167 ----
                  finalG = "ZERO UNSIGNED_INVERT_NV"
              
            c = ("""
+                 # Interpolate between three colors using two dot products
+             
+                 # SPARE0 <- (TEX0 . CONST0)
+                 # SPARE1 <- (TEX1 . CONST1)
                CI0 RGB A TEXTURE%(t0)s EXPAND_NORMAL_NV RGB
                  CI0 RGB B CONSTANT_COLOR0_NV EXPAND_NORMAL_NV RGB
                CI0 RGB C TEXTURE%(t1)s EXPAND_NORMAL_NV RGB
                  CI0 RGB D CONSTANT_COLOR1_NV EXPAND_NORMAL_NV RGB
                CO0 RGB SPARE0_NV SPARE1_NV DISCARD_NV NONE NONE TRUE TRUE FALSE
  
+                 # PRI_COL <- lerp(SPARE0, PRI_COL, SEC_COL)
                CI1 RGB A PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
                CI1 RGB B SPARE0_NV UNSIGNED_IDENTITY_NV RGB
                CI1 RGB C SECONDARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
                CI1 RGB D SPARE0_NV UNSIGNED_INVERT_NV RGB
                CO1 RGB DISCARD_NV DISCARD_NV PRIMARY_COLOR_NV NONE NONE FALSE 
FALSE FALSE
  
+                 # SPARE1.alpha <- SPARE0^2 - SPARE1^2
                  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
  
+                 # lerp(SPARE1, PRI_COL, FOG)
                  FCI A SPARE1_NV UNSIGNED_IDENTITY_NV RGB
                  FCI B PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
                  FCI C FOG UNSIGNED_IDENTITY_NV RGB