[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx/demo papertest.py
From: |
Janne V. Kujala |
Subject: |
[Gzz-commits] gzz/gfx/demo papertest.py |
Date: |
Wed, 04 Dec 2002 06:49:19 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/12/04 06:49:19
Modified files:
gfx/demo : papertest.py
Log message:
cleanup
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/papertest.py.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/papertest.py
diff -u gzz/gfx/demo/papertest.py:1.57 gzz/gfx/demo/papertest.py:1.58
--- gzz/gfx/demo/papertest.py:1.57 Wed Dec 4 06:12:16 2002
+++ gzz/gfx/demo/papertest.py Wed Dec 4 06:49:19 2002
@@ -79,9 +79,6 @@
if k == "O":
gzz.gfx.gl.PaperOptions.use_opengl_1_1 = not
gzz.gfx.gl.PaperOptions.use_opengl_1_1
print 'Use of OpenGL 1.1:', gzz.gfx.gl.PaperOptions.use_opengl_1_1
- if k == "f": # as fork
- MultiPaperScene.has_dual_papers = not MultiPaperScene.has_dual_papers
- print 'Dual papers:', MultiPaperScene.has_dual_papers
if k == "p":
makeScreenshots()
@@ -111,21 +108,6 @@
def __init__(self):
self.bgcolor = (0.7, 0.8, 0.6)
- # res = textures[0].shade(
- # 512, 512, 1,
- # "RGB", "LUMINANCE", "bgnoise", [])
-
-
-
- self.vec = (1,0,0)
-
- self.renderPaper = 0
-
-
- self.t = 0
- self.aniso = 0
- self.reinit = 0
-
self.seed = 0
self.pq = None
@@ -139,12 +121,6 @@
oldseed = self.seed
if k >= "0" and k <= "9": self.seed = self.seed * 10 + int(k)
if k == "BackSpace" or k == "Backspace": self.seed = self.seed / 10
- if k == "a":
- self.aniso = 1 - self.aniso
- self.reinit = 1
- print "Aniso: ",self.aniso
- self.initpaper()
- AbstractUpdateManager.setNoAnimation()
if k == "v":
self.seed = rng.nextInt(2000000000)
if k == 'o':
@@ -162,18 +138,6 @@
if not self.pq: self.initpaper()
putnoc(vs, background(self.bgcolor))
- #putnoc(vs, getDList("""
- # Enable ALPHA_TEST
- # AlphaFunc GEQUAL 0.2
- # Disable DEPTH_TEST
- # Disable BLEND
- # Enable TEXTURE_2D
- # PushAttrib POLYGON_BIT ENABLE_BIT
- # Color 1 0.1 1
- #"""))
-
- # vs.put(rectangle((1, 0.2, 0.4)), "re", 10, 100, 100, 300, 100)
-
w = size.width
h = size.height
@@ -220,29 +184,6 @@
putText(vs, cs3, str(self.seed), color=(0,0,0), x=0, y=.12, h=.2)
- if self.renderPaper:
- putnoc(vs, getDList("""
- ActiveTexture TEXTURE0
- Enable BLEND
- BlendFunc ZERO SRC_COLOR
- Disable DEPTH_TEST
- Color 1 1 1
- Disable TEXTURE_SHADER_NV
- Disable REGISTER_COMBINERS_NV
- Enable TEXTURE_2D
- Disable ALPHA_TEST
- """))
- cs3 = vs.coords.affineCoordsys(0,
- 1, 0, 0, pscale, 0, 0, pscale)
- vs.matcher.add(cs3, "3")
-
- vs.map.put(self.qua, cs3)
- vs.map.put(rectangle((0,0,0)), cs3)
-
- #putnoc(vs, getDList("""
- # PopAttrib
- #"""))
-
dobenchmark(w, vs)
class MultiPaperScene:
@@ -265,11 +206,8 @@
self.pq[i] = getpaper(self.seed + i)
else:
for i in range(0, self.w*self.h):
- paperopt.use_opengl_1_1 = not paperopt.use_opengl_1_1
- if i & 1:
- self.pq[i] = getpaper(self.seed + i)
- else:
- self.pq[i] = getpaper(self.seed + i +1)
+ paperopt.use_opengl_1_1 = i & 1
+ self.pq[i] = getpaper(self.seed + i / 2)
paperopt.use_opengl_1_1 = tmp_paperopt
@@ -295,7 +233,10 @@
if k == "BackSpace" or k == "Backspace": self.seed = self.seed / 10
if k == "v":
self.seed = rng.nextInt(200000000)
- if k == "v" or k == "Return":
+ if k == "f": # as fork
+ self.has_dual_papers = not self.has_dual_papers
+ print 'Dual papers:', self.has_dual_papers
+ if k in ("v", "f", "Return"):
self.initpaper()
AbstractUpdateManager.setNoAnimation()
AbstractUpdateManager.chg()
@@ -334,7 +275,9 @@
vs.matcher.add(cs1[i], str(i))
vs.map.put(self.pq[i], cs1[i], cs2)
- putText(vs, cs1[i], str(self.seed + i), color=(0,0,0),
x=-1,y=1,z=-1, h=.5, key=str(i))
+ putText(vs, cs1[i],
+ str(self.seed + i / (self.has_dual_papers + 1)),
+ color=(0,0,0), x=-1,y=1,z=-1, h=.5, key=str(i))
dobenchmark(w, vs)