[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: |
Sat, 30 Nov 2002 13:07:38 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/11/30 13:07:38
Modified files:
gfx/demo : irregu4.py
Log message:
trying pre-computed angles
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/irregu4.py.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/irregu4.py
diff -u gzz/gfx/demo/irregu4.py:1.31 gzz/gfx/demo/irregu4.py:1.32
--- gzz/gfx/demo/irregu4.py:1.31 Sat Nov 30 11:26:45 2002
+++ gzz/gfx/demo/irregu4.py Sat Nov 30 13:07:38 2002
@@ -42,17 +42,6 @@
def inittex():
global texRGBA, texINTENSITY, texHILO, texBOX, offsetprog
- texRGBA = getCachedTexture(
- [128, 128, 0, 4, "RGBA", "RGBA", "irregu",
- [ "texture", textures[0][0],
- "params", textures[0][1],
- "ripple_scale", str(ripple_scale),
- "radius", "2",
- "angle", "0",
- "angles", "3",
- "eps", ".125",
- "scaling", "const"]],
- shade_all_levels = 1)
texINTENSITY = getCachedTexture(
[128, 128, 0, 1, "INTENSITY", "LUMINANCE", "irregu",
@@ -62,6 +51,67 @@
]],
shade_all_levels = 1)
+ if GL.hasExtension("GL_NV_register_combiners"):
+ texRGBA = getCachedTexture(
+ [128, 128, 0, 4, "RGBA", "RGBA", "irregu",
+ [ "texture", textures[0][0],
+ "params", textures[0][1],
+ "ripple_scale", str(ripple_scale),
+ "radius", "2",
+ "angle", "0",
+ "angles", "3",
+ "eps", ".125",
+ "scaling", "const"]],
+ shade_all_levels = 1)
+
+ global dot4_code
+ dot4_code = combinercode("""
+ 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
+
+ BindTexture TEXTURE_2D %(tex)s
+ TexParameter TEXTURE_2D TEXTURE_MIN_FILTER LINEAR_MIPMAP_LINEAR
+ TexParameter TEXTURE_2D TEXTURE_MAG_FILTER LINEAR
+ Enable TEXTURE_2D
+
+ Enable ALPHA_TEST
+ AlphaFunc GEQUAL 1.0
+ Disable BLEND
+
+ Color 0 0 0 1
+ """)
+
+
if GL.hasExtension("GL_NV_texture_shader"):
if GL.hasExtension("GL_NV_texture_shader3"):
internal = "SIGNED_HILO_NV"
@@ -218,53 +268,6 @@
def initcode(self):
- code = combinercode("""
- 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
-
- BindTexture TEXTURE_2D %(tex)s
- TexParameter TEXTURE_2D TEXTURE_MIN_FILTER LINEAR_MIPMAP_LINEAR
- TexParameter TEXTURE_2D TEXTURE_MAG_FILTER LINEAR
- Enable TEXTURE_2D
-
- Enable ALPHA_TEST
- AlphaFunc GEQUAL 1.0
- Disable BLEND
-
- Color 0 0 0 1
- """)
-
code2 = parseCombiner("""
PushAttrib ENABLE_BIT TEXTURE_BIT
@@ -311,10 +314,10 @@
Color 0 0 0 0
""")
- inner_code = code % {"tex" : texRGBA.getTexId(),
- "color" : "1 1 1 1" }
- outer_code = code % {"tex" : texRGBA.getTexId(),
- "color" : "0 0 0 0" }
+ inner_code = dot4_code % {"tex" : texRGBA.getTexId(),
+ "color" : "1 1 1 1" }
+ outer_code = dot4_code % {"tex" : texRGBA.getTexId(),
+ "color" : "0 0 0 0" }
shape = self.shape
texscale = 1.0
@@ -479,7 +482,7 @@
0, 0,
slice + Y_COLOR + (self.flags >> 4 & 1) * INSIDE, stdcode, 1.0)
- if GL.hasExtension("GL_NV_register_combiners") and 0:
+ if GL.hasExtension("GL_NV_register_combiners") and 1:
self.outer = GLRen.createIrregularEdge(shape,
texscale, linewidth, refsize, scale_pow,
border0, border1, texslicing,
@@ -674,7 +677,7 @@
TexParameter TEXTURE_2D TEXTURE_MAG_FILTER LINEAR
Enable TEXTURE_2D
TexEnv TEXTURE_ENV TEXTURE_ENV_MODE ADD
- TexEnv TEXTURE_FILTER_CONTROL_EXT TEXTURE_LOD_BIAS_EXT 3
+ TexEnv TEXTURE_FILTER_CONTROL_EXT TEXTURE_LOD_BIAS_EXT 0
Enable ALPHA_TEST
AlphaFunc GEQUAL 1.0
""" % texINTENSITY.getTexId()
@@ -692,7 +695,13 @@
if type == 1:
texslicing = 1
-
+
+ if type == "0b":
+ self.scale /= 4
+ self.xs *= 4; self.ys *= 4;
+ self.x0 *= 4; self.y0 *= 4;
+ self.x1 *= 4; self.y1 *= 4;
+
self.inner = GLRen.createIrregularEdge(
shape, texscale, linewidth, refsize, scale_pow,
border0, border1, texslicing,
@@ -713,6 +722,16 @@
Disable ALPHA_TEST
""", 1.0)
+ if type == "0b":
+ code = dot4_code % {"tex" : texRGBA.getTexId(),
+ "color" : "0 0 0 0" }
+ self.outer = GLRen.createIrregularEdge(
+ shape, texscale, linewidth, refsize, scale_pow,
+ border0, border1, texslicing,
+ "1 1 1 1 0 0 0 0", "", 3, 0,
+ SLICE_1D + Y_SECCOLOR + INSIDE + DOTVEC_COLOR + INTERP_DOTVEC,
+ code, 1.0)
+
if type == 2:
self.inner = GLRen.createIrregularEdge(shape,
texscale, linewidth, refsize, scale_pow,
@@ -856,7 +875,11 @@
# other parameters are hardcoded
# with if's in StillMotionScene class
-
+
+ ## pre-computed angles
+ #ps = StillMotionScene(type = "0b", flag = 1)
+ #r(ps, "shots/motion0b.png")
+
ps = StillMotionScene(type = 0)
r(ps, "shots/motion.png")
- [Gzz-commits] gzz/gfx/demo irregu4.py, (continued)
- [Gzz-commits] gzz/gfx/demo irregu4.py, Janne V. Kujala, 2002/11/15
- [Gzz-commits] gzz/gfx/demo irregu4.py, Janne V. Kujala, 2002/11/20
- [Gzz-commits] gzz/gfx/demo irregu4.py, Janne V. Kujala, 2002/11/20
- [Gzz-commits] gzz/gfx/demo irregu4.py, Janne V. Kujala, 2002/11/21
- [Gzz-commits] gzz/gfx/demo irregu4.py, Janne V. Kujala, 2002/11/25
- [Gzz-commits] gzz/gfx/demo irregu4.py, Janne V. Kujala, 2002/11/30
- [Gzz-commits] gzz/gfx/demo irregu4.py, Janne V. Kujala, 2002/11/30
- [Gzz-commits] gzz/gfx/demo irregu4.py, Janne V. Kujala, 2002/11/30
- [Gzz-commits] gzz/gfx/demo irregu4.py, Janne V. Kujala, 2002/11/30
- [Gzz-commits] gzz/gfx/demo irregu4.py,
Janne V. Kujala <=
- [Gzz-commits] gzz/gfx/demo irregu4.py, Janne V. Kujala, 2002/11/30