[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx/libpaper texcomb_GL1_1.py
|
From: |
Matti Katila |
|
Subject: |
[Gzz-commits] gzz/gfx/libpaper texcomb_GL1_1.py |
|
Date: |
Mon, 21 Oct 2002 12:12:33 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Matti Katila <address@hidden> 02/10/21 12:12:33
Modified files:
gfx/libpaper : texcomb_GL1_1.py
Log message:
small fixes to produce texcomb OpenGL 1.1.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texcomb_GL1_1.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: gzz/gfx/libpaper/texcomb_GL1_1.py
diff -u gzz/gfx/libpaper/texcomb_GL1_1.py:1.4
gzz/gfx/libpaper/texcomb_GL1_1.py:1.5
--- gzz/gfx/libpaper/texcomb_GL1_1.py:1.4 Mon Oct 14 06:24:37 2002
+++ gzz/gfx/libpaper/texcomb_GL1_1.py Mon Oct 21 12:12:33 2002
@@ -9,9 +9,6 @@
c0, c1, c2, c3 = [ colors.getColorStr(colorbase+i)
for i in range(0,4) ]
- r0, r1, r2, r3 = [ colors.getNVDP3VecStr(colorbase+i)
- for i in range(0,4) ]
-
# map alpha dot product a \in [0,1] into clamp(1 - (1-a) * alphascale)
if trans > 0:
alphascale = 1 - 1.0/trans
@@ -38,16 +35,19 @@
# Enable REGISTER_COMBINERS_NV
# CombinerParameterNV NUM_GENERAL_COMBINERS_NV 2
+ ActiveTexture TEXTURE0
+ TexEnv TEXTURE_ENV TEXTURE_ENV_MODE BLEND
+ TexEnv TEXTURE_ENV TEXTURE_ENV_COLOR %(c1)s
+ ActiveTexture TEXTURE1
+ TexEnv TEXTURE_ENV TEXTURE_ENV_MODE BLEND
+ TexEnv TEXTURE_ENV TEXTURE_ENV_COLOR %(c2)s
- # First texenv p. 402
- TexEnv TEXTURE_ENV TEXTURE_ENV_COLOR %(c0)s
+ # back to texture0
+ ActiveTexture TEXTURE0
# Multitexturing
#Multitexture
-
- # CombinerParameterNV CONSTANT_COLOR0_NV %(r0)s
- # CombinerParameterNV CONSTANT_COLOR1_NV %(r1)s
Color %(c0)s
# SecondaryColorEXT %(c1)s
Fog FOG_COLOR %(c2)s
@@ -79,28 +79,13 @@
# 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)s 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_INVERT_NV RGB
- # FCI B PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
- # FCI C SECONDARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
- # FCI D ZERO UNSIGNED_IDENTITY_NV RGB
-
- # FCI G %(finalG)s UNSIGNED_INVERT_NV BLUE
""")
elif type == 1:
#scale = "SCALE_BY_ONE_HALF_NV"
@@ -124,33 +109,12 @@
# 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 %(scale)s 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_INVERT_NV RGB
- # CI1 RGB C SECONDARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
- # CI1 RGB D SPARE0_NV UNSIGNED_IDENTITY_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_INVERT_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
""")
else:
#scale = "SCALE_BY_ONE_HALF_NV"
@@ -178,33 +142,12 @@
# SPARE0 <- (TEX0 . TEX1)
# 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)s NONE TRUE TRUE
FALSE
# PRI_COL <- lerp(SPARE1, SEC_COL, PRI_COL)
- # CI1 RGB A PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
- # CI1 RGB B SPARE1_NV UNSIGNED_INVERT_NV RGB
- # CI1 RGB C SECONDARY_COLOR_NV UNSIGNED_IDENTITY_NV RGB
- # CI1 RGB D SPARE1_NV UNSIGNED_IDENTITY_NV RGB
- # CO1 RGB DISCARD_NV DISCARD_NV PRIMARY_COLOR_NV NONE NONE FALSE
FALSE FALSE
# lerp(SPARE0, PRI_COL, FOG)
- # FCI A SPARE0_NV UNSIGNED_INVERT_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
# 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
- # CI1 ALPHA B CONSTANT_COLOR1_NV EXPAND_NORMAL_NV BLUE
- # CO1 ALPHA DISCARD_NV DISCARD_NV SPARE1_NV NONE NONE FALSE
FALSE FALSE
-
- # FCI G %(finalG)s ALPHA
""")