[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx/demo irregu4.py
|
From: |
Janne V. Kujala |
|
Subject: |
[Gzz-commits] gzz/gfx/demo irregu4.py |
|
Date: |
Tue, 03 Dec 2002 07:04:23 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/12/03 07:04:22
Modified files:
gfx/demo : irregu4.py
Log message:
cleanup
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/irregu4.py.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/irregu4.py
diff -u gzz/gfx/demo/irregu4.py:1.41 gzz/gfx/demo/irregu4.py:1.42
--- gzz/gfx/demo/irregu4.py:1.41 Tue Dec 3 06:41:03 2002
+++ gzz/gfx/demo/irregu4.py Tue Dec 3 07:04:22 2002
@@ -1,4 +1,4 @@
-from gfx.libutil.nvcode import combinercode, parseCombiner
+from gfx.libutil.nvcode import parseCombiner
from gfx.libpaper.texcache import getCachedTexture
from math import sin,cos,pi
from gfx.libutil import saveanim
@@ -81,39 +81,21 @@
shade_all_levels = 1)
global dot4_code
- dot4_code = combinercode("""
+ dot4_code = parseCombiner("""
PushAttrib ENABLE_BIT TEXTURE_BIT
CombinerParameterNV CONSTANT_COLOR0_NV %(color)s
Enable REGISTER_COMBINERS_NV
+
CombinerParameterNV NUM_GENERAL_COMBINERS_NV 2
- # SPARE0 <- TEXTURE0 . COLOR
- CI0 RGB A TEXTURE0 UNSIGNED_IDENTITY_NV RGB
- CI0 RGB B PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
- CO0 RGB SPARE0_NV DISCARD_NV DISCARD_NV NONE NONE TRUE FALSE
FALSE
-
- # SPARE0.alpha <- TEXTURE0.alpha * COLOR.alpha + SEC_COLOR.b
- CI0 ALPHA A TEXTURE0 UNSIGNED_IDENTITY_NV ALPHA
- CI0 ALPHA B PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV ALPHA
- CI0 ALPHA C SECONDARY_COLOR_NV UNSIGNED_IDENTITY_NV BLUE
- CI0 ALPHA D ZERO UNSIGNED_INVERT_NV ALPHA
- CO0 ALPHA DISCARD_NV DISCARD_NV SPARE0_NV NONE NONE FALSE
FALSE FALSE
-
- # SPARE0.alpha <- SPARE0 + SPARE0.alpha
- CI1 ALPHA A SPARE0_NV UNSIGNED_IDENTITY_NV BLUE
- CI1 ALPHA B ZERO UNSIGNED_INVERT_NV ALPHA
- CI1 ALPHA C SPARE0_NV UNSIGNED_IDENTITY_NV ALPHA
- CI1 ALPHA D ZERO UNSIGNED_INVERT_NV ALPHA
- CO1 ALPHA DISCARD_NV DISCARD_NV SPARE0_NV NONE NONE FALSE
FALSE FALSE
- # alpha <- SPARE0.alpha
- FCI G SPARE0_NV UNSIGNED_IDENTITY_NV ALPHA
-
- # color <- CONTANT_COLOR0
- FCI A ZERO UNSIGNED_IDENTITY_NV RGB
- FCI B ZERO UNSIGNED_IDENTITY_NV RGB
- FCI C ZERO UNSIGNED_IDENTITY_NV RGB
- FCI D CONSTANT_COLOR0_NV UNSIGNED_IDENTITY_NV RGB
+ SPARE0 = TEX0 . COL0
+ SPARE0.alpha = TEX0.alpha * COL0.alpha + COL1.blue
+
+ SPARE0.alpha = SPARE0.blue + SPARE0.alpha
+
+ alpha = SPARE0.alpha
+ color = CONST0
BindTexture TEXTURE_2D %(tex)s
TexParameter TEXTURE_2D TEXTURE_MIN_FILTER LINEAR_MIPMAP_LINEAR
@@ -354,7 +336,7 @@
if slice & SLICE_2D:
c1 = "1 1 1 0 0 0 0 0"
slice += Y_SECCOLOR
- code += combinercode("""
+ code += parseCombiner("""
SecondaryColorEXT .5 .5 .5
ActiveTexture TEXTURE1
@@ -365,37 +347,16 @@
ActiveTexture TEXTURE0
Enable REGISTER_COMBINERS_NV
- CombinerParameterNV NUM_GENERAL_COMBINERS_NV 2
- CI0 RGB A TEXTURE0 UNSIGNED_IDENTITY_NV RGB
- CI0 RGB B SECONDARY_COLOR_NV UNSIGNED_INVERT_NV RGB
- CI0 RGB C TEXTURE1 UNSIGNED_IDENTITY_NV RGB
- CI0 RGB D SECONDARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
- CO0 RGB DISCARD_NV DISCARD_NV SPARE0_NV NONE NONE FALSE FALSE FALSE
-
- CI0 ALPHA A TEXTURE0 UNSIGNED_IDENTITY_NV ALPHA
- CI0 ALPHA B SECONDARY_COLOR_NV UNSIGNED_INVERT_NV BLUE
- CI0 ALPHA C TEXTURE1 UNSIGNED_IDENTITY_NV ALPHA
- CI0 ALPHA D SECONDARY_COLOR_NV UNSIGNED_IDENTITY_NV BLUE
- CO0 ALPHA DISCARD_NV DISCARD_NV SPARE0_NV NONE NONE FALSE FALSE
FALSE
-
- CI1 RGB A SPARE0_NV UNSIGNED_IDENTITY_NV RGB
- CI1 RGB B ZERO UNSIGNED_INVERT_NV RGB
- CI1 RGB C PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
- CI1 RGB D ZERO UNSIGNED_INVERT_NV RGB
- CO1 RGB DISCARD_NV DISCARD_NV SPARE0_NV NONE NONE FALSE FALSE FALSE
-
- CI1 ALPHA A SPARE0_NV UNSIGNED_IDENTITY_NV ALPHA
- CI1 ALPHA B ZERO UNSIGNED_INVERT_NV ALPHA
- CI1 ALPHA C PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV ALPHA
- CI1 ALPHA D ZERO UNSIGNED_INVERT_NV ALPHA
- CO1 ALPHA DISCARD_NV DISCARD_NV SPARE0_NV NONE NONE FALSE FALSE
FALSE
- # output rgba <- SPARE0
- FCI A ZERO UNSIGNED_IDENTITY_NV RGB
- FCI B ZERO UNSIGNED_IDENTITY_NV RGB
- FCI C ZERO UNSIGNED_IDENTITY_NV RGB
- FCI D SPARE0_NV UNSIGNED_IDENTITY_NV RGB
- FCI G SPARE0_NV UNSIGNED_IDENTITY_NV ALPHA
+ SPARE0 = TEX0 * (1-COL1) + TEX1 * COL1
+ SPARE0.alpha = TEX0.alpha * (1-COL1.blue) + TEX1.alpha * COL1.blue
+
+ SPARE0 = SPARE0 + COL0
+ SPARE0.alpha = SPARE0.alpha + COL0.alpha
+
+ color = SPARE0
+ alpha = SPARE0.alpha
+
""") % texINTENSITY.getTexId()
outerflags = (self.flags >> 4 & 1) * INSIDE
@@ -443,21 +404,12 @@
"0 0 0 1 0 0 0 0", c1,
0, 0,
slice + Y_COLOR + (self.flags >> 4 & 1) * INSIDE, code +
- combinercode("""
+ parseCombiner("""
Enable REGISTER_COMBINERS_NV
- CombinerParameterNV NUM_GENERAL_COMBINERS_NV 1
- CI0 ALPHA A TEXTURE0 UNSIGNED_IDENTITY_NV ALPHA
- CI0 ALPHA B ZERO UNSIGNED_INVERT_NV ALPHA
- CI0 ALPHA C PRIMARY_COLOR_NV EXPAND_NORMAL_NV ALPHA
- CI0 ALPHA D ZERO UNSIGNED_INVERT_NV ALPHA
- CO0 ALPHA DISCARD_NV DISCARD_NV SPARE0_NV NONE NONE FALSE FALSE
FALSE
- # output rgba <- SPARE0
- FCI A ZERO UNSIGNED_IDENTITY_NV RGB
- FCI B ZERO UNSIGNED_IDENTITY_NV RGB
- FCI C ZERO UNSIGNED_IDENTITY_NV RGB
- FCI D PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
- FCI G SPARE0_NV UNSIGNED_IDENTITY_NV ALPHA
+ SPARE0.alpha = TEX0.alpha + (2 * COL0.alpha - 1)
+ color = COL0
+ alpha = SPARE0.alpha
BlendFunc SRC_ALPHA ONE_MINUS_SRC_ALPHA
Enable BLEND