[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz ./Makefile gfx/demo/gldemo.py gfx/demo/open...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz ./Makefile gfx/demo/gldemo.py gfx/demo/open... |
Date: |
Tue, 10 Sep 2002 14:53:19 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/09/10 14:53:19
Modified files:
. : Makefile
gfx/demo : gldemo.py
gfx/demo/opengl: stencil.py
gfx/libpaper : texcomb_NV1X.py
gzz/gfx/gl : Stencil.java
Added files:
gfx : __init__.py
gfx/demo : irregularframe.py
gfx/libutil : __init__.py
Log message:
The irregular shape: a portion of a paper tape torn
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.161&tr2=1.162&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/irregularframe.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/gldemo.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/opengl/stencil.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libpaper/texcomb_NV1X.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libutil/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/Stencil.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
Patches:
Index: gzz/Makefile
diff -c gzz/Makefile:1.161 gzz/Makefile:1.162
*** gzz/Makefile:1.161 Tue Sep 10 05:53:15 2002
--- gzz/Makefile Tue Sep 10 14:53:18 2002
***************
*** 400,405 ****
--- 400,407 ----
$(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/glinfo.py
runstencil:
$(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/opengl/stencil.py
+ runirregu:
+ $(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/irregularframe.py
runppserver:
$(JYTHON) gzz/modules/pp/ppserver.py
Index: gzz/gfx/demo/gldemo.py
diff -c gzz/gfx/demo/gldemo.py:1.9 gzz/gfx/demo/gldemo.py:1.10
*** gzz/gfx/demo/gldemo.py:1.9 Tue Sep 10 08:22:24 2002
--- gzz/gfx/demo/gldemo.py Tue Sep 10 14:53:19 2002
***************
*** 49,54 ****
--- 49,68 ----
End
"""%(rgb))
+ def quad():
+ return getDList("""
+ Begin QUADS
+ TexCoord 0 0
+ Vertex -1 -1
+ TexCoord 0 1
+ Vertex -1 1
+ TexCoord 1 1
+ Vertex 1 1
+ TexCoord 1 0
+ Vertex 1 -1
+ End
+ """)
+
def getFont():
global font
try:
Index: gzz/gfx/demo/opengl/stencil.py
diff -c gzz/gfx/demo/opengl/stencil.py:1.3 gzz/gfx/demo/opengl/stencil.py:1.4
*** gzz/gfx/demo/opengl/stencil.py:1.3 Tue Sep 10 08:22:24 2002
--- gzz/gfx/demo/opengl/stencil.py Tue Sep 10 14:53:19 2002
***************
*** 28,36 ****
# First pass: increment stencil
putnoc(vs, getDListNocoords("""
PushAttrib ENABLE_BIT STENCIL_BUFFER_BIT COLOR_BUFFER_BIT
! Enable STENCIL_TEST
StencilFunc ALWAYS 1 255
! StencilOp REPLACE REPLACE REPLACE
StencilMask 255
Enable DEPTH_TEST
"""))
--- 28,36 ----
# First pass: increment stencil
putnoc(vs, getDListNocoords("""
PushAttrib ENABLE_BIT STENCIL_BUFFER_BIT COLOR_BUFFER_BIT
! Disable STENCIL_TEST
StencilFunc ALWAYS 1 255
! StencilOp KEEP KEEP KEEP
StencilMask 255
Enable DEPTH_TEST
"""))
***************
*** 108,114 ****
def run(self):
vs.map.put(coloredQuad((0,0,1)), dcs)
! # self.drawStenciled(vs, mask, cont)
! Stencil.drawStenciled(vs, mask(), None, None, cont(), 0)
currentScene = StencilScene()
--- 108,114 ----
def run(self):
vs.map.put(coloredQuad((0,0,1)), dcs)
! self.drawStenciled(vs, mask().run, cont().run)
! # Stencil.drawStenciled(vs, mask(), None, None, cont(), 0)
currentScene = StencilScene()
Index: gzz/gfx/libpaper/texcomb_NV1X.py
diff -c gzz/gfx/libpaper/texcomb_NV1X.py:1.9
gzz/gfx/libpaper/texcomb_NV1X.py:1.10
*** gzz/gfx/libpaper/texcomb_NV1X.py:1.9 Mon Sep 9 08:00:05 2002
--- gzz/gfx/libpaper/texcomb_NV1X.py Tue Sep 10 14:53:19 2002
***************
*** 1,5 ****
--- 1,7 ----
# Register combiners for NV1x architecture, where there
# are only two of them.
+
+ from gfx.libutil import nvcode
class TransparentCombinerPass:
def setupCode(self, texinputs, colors, rnd, trans = 0):
***************
*** 172,190 ****
c = (constantcode + c) % locals()
! c = (c.replace("CI0", "CombinerInputNV COMBINER0_NV").
! replace("CI1", "CombinerInputNV COMBINER1_NV").
! replace("CO0", "CombinerOutputNV COMBINER0_NV").
! replace("CO1", "CombinerOutputNV COMBINER1_NV").
! replace("FCI", "FinalCombinerInputNV").
! replace(" A ", " VARIABLE_A_NV ").
! replace(" B ", " VARIABLE_B_NV ").
! replace(" C ", " VARIABLE_C_NV ").
! replace(" D ", " VARIABLE_D_NV ").
! replace(" E ", " VARIABLE_E_NV ").
! replace(" F ", " VARIABLE_F_NV ").
! replace(" G ", " VARIABLE_G_NV ")
! )
# print "c: ",c
return c
--- 174,180 ----
c = (constantcode + c) % locals()
! c = nvcode.combinercode(c)
# print "c: ",c
return c
Index: gzz/gzz/gfx/gl/Stencil.java
diff -c gzz/gzz/gfx/gl/Stencil.java:1.6 gzz/gzz/gfx/gl/Stencil.java:1.7
*** gzz/gzz/gfx/gl/Stencil.java:1.6 Tue Sep 10 08:44:34 2002
--- gzz/gzz/gfx/gl/Stencil.java Tue Sep 10 14:53:19 2002
***************
*** 80,85 ****
--- 80,87 ----
/** Draw something stenciled
* Assumes that stencil buffer is all zeroes when called; leaves
* it zeroed if contract of drawOverStencil is met.
+ * <b>Warning: due to a bug in NVidia driver, depth test is disabled.
+ * </b>
* @param vs The VobScene to draw into
* @param drawStencil The routine which causes exactly those
* fragments to be drawn that need to be in the
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz ./Makefile gfx/demo/gldemo.py gfx/demo/open...,
Tuomas J. Lukka <=