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

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/10/10 12:43:38

Modified files:
        .              : TODO 
        gfx/libpaper   : texcomb_NV1X.py 

Log message:
        Combiner scaling done

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.273&tr2=1.274&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texcomb_NV1X.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.273 gzz/TODO:1.274
*** gzz/TODO:1.273      Thu Oct 10 09:48:43 2002
--- gzz/TODO    Thu Oct 10 12:43:38 2002
***************
*** 13,19 ****
            get *THE* demo up and running
      jvk:
        - turn on anisotropic filtering for all paper textures.
-       + [GI03] libpaper combiner scaling 
        + [GI03] simplify libpaper color space
        + [GI03] think about modeling textures
        + [GI03] libpaper NV2x combined passes
--- 13,18 ----
Index: gzz/gfx/libpaper/texcomb_NV1X.py
diff -c gzz/gfx/libpaper/texcomb_NV1X.py:1.21 
gzz/gfx/libpaper/texcomb_NV1X.py:1.22
*** gzz/gfx/libpaper/texcomb_NV1X.py:1.21       Thu Oct 10 11:40:04 2002
--- gzz/gfx/libpaper/texcomb_NV1X.py    Thu Oct 10 12:43:38 2002
***************
*** 160,165 ****
--- 160,166 ----
            """)
          else:
              scale = nvcode.combinerscale(avg(*texscales) * 4.0 * rndscale)
+             alphascale = nvcode.combinerscale(avg(*texscales) * 8.0 * 
rndscale)
  
              # Interpolate on the fraction line c0,c1,c2:
              # d0 = t0 . t1
***************
*** 205,211 ****
                  CI1 ALPHA B CONSTANT_COLOR0_NV EXPAND_NORMAL_NV BLUE
                  CI1 ALPHA C TEXTURE%(t1)s EXPAND_NORMAL_NV BLUE
                  CI1 ALPHA B CONSTANT_COLOR1_NV EXPAND_NORMAL_NV BLUE
!                 CO1 ALPHA DISCARD_NV DISCARD_NV SPARE1_NV %(scale)s NONE 
FALSE FALSE FALSE
                  
                FCI G %(finalG)s ALPHA 
            """)
--- 206,212 ----
                  CI1 ALPHA B CONSTANT_COLOR0_NV EXPAND_NORMAL_NV BLUE
                  CI1 ALPHA C TEXTURE%(t1)s EXPAND_NORMAL_NV BLUE
                  CI1 ALPHA B CONSTANT_COLOR1_NV EXPAND_NORMAL_NV BLUE
!                 CO1 ALPHA DISCARD_NV DISCARD_NV SPARE1_NV %(alphascale)s NONE 
FALSE FALSE FALSE
                  
                FCI G %(finalG)s ALPHA 
            """)