[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx demo/irregu3.py libutil/nvcode.py
|
From: |
Janne V. Kujala |
|
Subject: |
[Gzz-commits] gzz/gfx demo/irregu3.py libutil/nvcode.py |
|
Date: |
Tue, 29 Oct 2002 11:34:04 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/10/29 11:34:04
Modified files:
gfx/demo : irregu3.py
gfx/libutil : nvcode.py
Log message:
Fix bugs
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/irregu3.py.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libutil/nvcode.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/irregu3.py
diff -u gzz/gfx/demo/irregu3.py:1.31 gzz/gfx/demo/irregu3.py:1.32
--- gzz/gfx/demo/irregu3.py:1.31 Tue Oct 29 11:11:03 2002
+++ gzz/gfx/demo/irregu3.py Tue Oct 29 11:34:04 2002
@@ -22,8 +22,8 @@
if (GL.hasExtension("GL_NV_register_combiners") and
GL.hasExtension("GL_EXT_secondary_color")):
- if (GL.getGLFloat("MAX_GENERAL_COMBINERS_NV") >= 4 and
- GL.getGLFloat("MAX_TEXTURE_UNITS") >= 3):
+ if (GL.getGLFloat("MAX_GENERAL_COMBINERS_NV")[0] >= 4 and
+ GL.getGLFloat("MAX_TEXTURE_UNITS")[0] >= 3):
profiles.append("NV_COMB_MULTITEX")
profiles.append("NV_COMB_DOT3")
@@ -114,16 +114,6 @@
tex = ( getIrreguTex(2, "HILO_NV", "HILO_NV"),
)
- elif profile == "NV_COMB_MULTITEX":
-
- alphalevel = 1
- w0,w1 = 1,1
- def colmap0(dotvec): return (1,1,1)
- def colmap1(dotvec): return (1,1,1)
-
- tex = ( getIrreguTex(1, "INTENSITY", "LUMINANCE"),
- )
-
elif profile == "NV_COMB_DOT3" or profile == "NV_COMB_DOT4" or profile ==
"NV_COMB_MULTITEX":
print "Using full displacement resolution textures with
GL_NV_register_combiners"
@@ -184,75 +174,75 @@
using_multitex = 1
texenv_inner = texenv % "0 0 0 1"
texenv_outer = combinercode("""
- # compute alpha = max( SEC_COL.b + TEX0 + COL.alpha + COL.b,
- # SEC_COL.b + TEX1 + COL.alpha,
- # SEC_COL.b + TEX2 + COL.alpha )
+ Color 0 0 0 0
- Enable REGISTER_COMBINERS_NV
- CombinerParameterNV NUM_GENERAL_COMBINERS_NV 4
+ # compute alpha = max( SEC_COL.b + TEX0 + COL.alpha + COL.b,
+ # SEC_COL.b + TEX1 + COL.alpha,
+ # SEC_COL.b + TEX2 + COL.alpha )
+
+ Enable REGISTER_COMBINERS_NV
+ CombinerParameterNV NUM_GENERAL_COMBINERS_NV 4
- # TEX2 -= TEX1
- CI0 RGB A TEXTURE2 UNSIGNED_IDENTIY_NV RGB
- CI0 RGB B ZERO_NV UNSIGNED_INVERT_NV RGB
- CI0 RGB C TEXTURE1 SIGNED_NEGATE_NV RGB
- CI0 RGB D ZERO_NV UNSIGNED_INVERT_NV RGB
- CO0 RGB DISCARD_NV DISCARD_NV TEXTURE2_NV NONE NONE FALSE FALSE FALSE
-
- # TEX0 += COL.b
- CI0 ALPHA A TEXTURE0 UNSIGNED_IDENTIY_NV ALPHA
- CI0 ALPHA B ZERO_NV UNSIGNED_INVERT_NV ALPHA
- CI0 ALPHA C PRIMARY_COLOR_NV UNSIGEND_IDENTITY_NV BLUE
- CI0 ALPHA D ZERO_NV UNSIGNED_INVERT_NV ALPHA
- CO0 ALPHA DISCARD_NV DISCARD_NV TEXTURE0_NV NONE NONE FALSE FALSE FALSE
-
-
- # TEX1 -= TEX0
- CI1 RGB A TEXTURE1 UNSIGNED_IDENTIY_NV RGB
- CI1 RGB B ZERO_NV UNSIGNED_INVERT_NV RGB
- CI1 RGB C TEXTURE0 SIGNED_NEGATE_NV ALPHA
- CI1 RGB D ZERO_NV UNSIGNED_INVERT_NV RGB
- CO1 RGB DISCARD_NV DISCARD_NV TEXTURE1_NV NONE NONE FALSE FALSE FALSE
-
- # TEX0 += COL.alpha
- CI1 ALPHA A TEXTURE0 UNSIGNED_IDENTIY_NV ALPHA
- CI1 ALPHA B ZERO_NV UNSIGNED_INVERT_NV ALPHA
- CI1 ALPHA C PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV ALPHA
- CI1 ALPHA D ZERO_NV UNSIGNED_INVERT_NV ALPHA
- CO1 ALPHA DISCARD_NV DISCARD_NV TEXTURE0_NV NONE NONE FALSE FALSE FALSE
-
-
- # TEX1 += unsigned(TEX2)
- CI2 RGB A TEXTURE1 SIGNED_IDENTIY_NV RGB
- CI2 RGB B ZERO_NV UNSIGNED_INVERT_NV RGB
- CI2 RGB C TEXTURE2 UNSIGNED_IDENTITY_NV RGB
- CI2 RGB D ZERO_NV UNSIGNED_INVERT_NV RGB
- CO2 RGB DISCARD_NV DISCARD_NV TEXTURE1_NV NONE NONE FALSE FALSE FALSE
-
- # TEX0 += SEC_COL.b
- CI2 ALPHA A TEXTURE0 UNSIGNED_IDENTIY_NV ALPHA
- CI2 ALPHA B ZERO_NV UNSIGNED_INVERT_NV ALPHA
- CI2 ALPHA C SECONDARY_COLOR_NV UNSIGNED_IDENTITY_NV BLUE
- CI2 ALPHA D ZERO_NV UNSIGNED_INVERT_NV ALPHA
- CO2 ALPHA DISCARD_NV DISCARD_NV TEXTURE0_NV NONE NONE FALSE FALSE FALSE
-
-
- # TEX0 += unsigned(TEX1)
- CI3 RGB A TEXTURE0 SIGNED_IDENTIY_NV ALPHA
- CI3 RGB B ZERO_NV UNSIGNED_INVERT_NV RGB
- CI3 RGB C TEXTURE1 UNSIGNED_IDENTITY_NV RGB
- CI3 RGB D ZERO_NV UNSIGNED_INVERT_NV RGB
- CO3 RGB DISCARD_NV DISCARD_NV TEXTURE0_NV NONE NONE FALSE FALSE FALSE
+ # TEX2 -= TEX1
+ CI0 RGB A TEXTURE2 UNSIGNED_IDENTITY_NV RGB
+ CI0 RGB B ZERO UNSIGNED_INVERT_NV RGB
+ CI0 RGB C TEXTURE1 SIGNED_NEGATE_NV RGB
+ CI0 RGB D ZERO UNSIGNED_INVERT_NV RGB
+ CO0 RGB DISCARD_NV DISCARD_NV TEXTURE2 NONE NONE FALSE FALSE FALSE
+
+ # TEX0 += COL.b
+ CI0 ALPHA A TEXTURE0 UNSIGNED_IDENTITY_NV ALPHA
+ CI0 ALPHA B ZERO UNSIGNED_INVERT_NV ALPHA
+ CI0 ALPHA C PRIMARY_COLOR_NV UNSIGNED_IDENTITY_NV BLUE
+ CI0 ALPHA D ZERO UNSIGNED_INVERT_NV ALPHA
+ CO0 ALPHA DISCARD_NV DISCARD_NV TEXTURE0 NONE NONE FALSE FALSE
FALSE
- # alpha <- TEXTURE0
- FCI G TEXTURE0_NV UNSIGNED_IDENTITY_NV BLUE
- """)
+ # TEX1 -= TEX0
+ CI1 RGB A TEXTURE1 UNSIGNED_IDENTITY_NV RGB
+ CI1 RGB B ZERO UNSIGNED_INVERT_NV RGB
+ CI1 RGB C TEXTURE0 SIGNED_NEGATE_NV ALPHA
+ CI1 RGB D ZERO UNSIGNED_INVERT_NV RGB
+ CO1 RGB DISCARD_NV DISCARD_NV TEXTURE1 NONE NONE FALSE FALSE FALSE
+
+ # TEX0 += COL.alpha
+ CI1 ALPHA A TEXTURE0 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 TEXTURE0 NONE NONE FALSE FALSE
FALSE
+
+
+ # TEX1 += unsigned(TEX2)
+ CI2 RGB A TEXTURE1 SIGNED_IDENTITY_NV RGB
+ CI2 RGB B ZERO UNSIGNED_INVERT_NV RGB
+ CI2 RGB C TEXTURE2 UNSIGNED_IDENTITY_NV RGB
+ CI2 RGB D ZERO UNSIGNED_INVERT_NV RGB
+ CO2 RGB DISCARD_NV DISCARD_NV TEXTURE1 NONE NONE FALSE FALSE FALSE
+
+ # TEX0 += SEC_COL.b
+ CI2 ALPHA A TEXTURE0 UNSIGNED_IDENTITY_NV ALPHA
+ CI2 ALPHA B ZERO UNSIGNED_INVERT_NV ALPHA
+ CI2 ALPHA C SECONDARY_COLOR_NV UNSIGNED_IDENTITY_NV BLUE
+ CI2 ALPHA D ZERO UNSIGNED_INVERT_NV ALPHA
+ CO2 ALPHA DISCARD_NV DISCARD_NV TEXTURE0 NONE NONE FALSE FALSE
FALSE
+
+
+ # TEX0 += unsigned(TEX1)
+ CI3 RGB A TEXTURE0 SIGNED_IDENTITY_NV ALPHA
+ CI3 RGB B ZERO UNSIGNED_INVERT_NV RGB
+ CI3 RGB C TEXTURE1 UNSIGNED_IDENTITY_NV RGB
+ CI3 RGB D ZERO UNSIGNED_INVERT_NV RGB
+ CO3 RGB DISCARD_NV DISCARD_NV TEXTURE0 NONE NONE FALSE FALSE FALSE
+
+
+ # alpha <- TEXTURE0
+ FCI G TEXTURE0 UNSIGNED_IDENTITY_NV BLUE
+ """)
angles = 0
tex = ( getIrreguTex(1, "INTENSITY", "LUMINANCE"),
getIrreguTex(1, "INTENSITY", "LUMINANCE", invert = 1),
)
-
-
@@ -466,7 +456,7 @@
Enable TEXTURE_2D
""" % locals()
- if using_multitex:
+ if using_multitex and outer:
code += """
ActiveTexture TEXTURE1
BindTexture TEXTURE_2D %(texid)s
@@ -479,7 +469,7 @@
TexParameter TEXTURE_2D TEXTURE_MAG_FILTER LINEAR
Enable TEXTURE_2D
ActiveTexture TEXTURE0
- """
+ """ % locals()
if GL.hasExtension("GL_EXT_texture_lod_bias"):
code += """
Index: gzz/gfx/libutil/nvcode.py
diff -u gzz/gfx/libutil/nvcode.py:1.2 gzz/gfx/libutil/nvcode.py:1.3
--- gzz/gfx/libutil/nvcode.py:1.2 Wed Oct 9 10:07:27 2002
+++ gzz/gfx/libutil/nvcode.py Tue Oct 29 11:34:04 2002
@@ -4,8 +4,20 @@
def combinercode(c):
return (c.replace("CI0", "CombinerInputNV COMBINER0_NV").
replace("CI1", "CombinerInputNV COMBINER1_NV").
+ replace("CI2", "CombinerInputNV COMBINER2_NV").
+ replace("CI3", "CombinerInputNV COMBINER3_NV").
+ replace("CI4", "CombinerInputNV COMBINER4_NV").
+ replace("CI5", "CombinerInputNV COMBINER5_NV").
+ replace("CI6", "CombinerInputNV COMBINER6_NV").
+ replace("CI7", "CombinerInputNV COMBINER7_NV").
replace("CO0", "CombinerOutputNV COMBINER0_NV").
replace("CO1", "CombinerOutputNV COMBINER1_NV").
+ replace("CO2", "CombinerOutputNV COMBINER2_NV").
+ replace("CO3", "CombinerOutputNV COMBINER3_NV").
+ replace("CO4", "CombinerOutputNV COMBINER4_NV").
+ replace("CO5", "CombinerOutputNV COMBINER5_NV").
+ replace("CO6", "CombinerOutputNV COMBINER6_NV").
+ replace("CO7", "CombinerOutputNV COMBINER7_NV").
replace("FCI", "FinalCombinerInputNV").
replace(" A ", " VARIABLE_A_NV ").
replace(" B ", " VARIABLE_B_NV ").
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gfx demo/irregu3.py libutil/nvcode.py,
Janne V. Kujala <=