[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx/demo psyko2.py
|
From: |
Janne V. Kujala |
|
Subject: |
[Gzz-commits] gzz/gfx/demo psyko2.py |
|
Date: |
Tue, 01 Oct 2002 10:08:27 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/10/01 10:08:27
Modified files:
gfx/demo : psyko2.py
Log message:
Start reviving psyko2
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/psyko2.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/psyko2.py
diff -c gzz/gfx/demo/psyko2.py:1.6 gzz/gfx/demo/psyko2.py:1.7
*** gzz/gfx/demo/psyko2.py:1.6 Mon Sep 23 04:37:04 2002
--- gzz/gfx/demo/psyko2.py Tue Oct 1 10:08:27 2002
***************
*** 109,138 ****
def getpaper(seed):
! pap = Paper()
! GL.startContext()
!
! passes = [ { "trans" : 0, "emboss" : 0 },
! { "trans" : .5, "emboss" : 0 },
! { "trans" : .9375, "emboss" : 0 },
! #{ "trans" : 0, "emboss" : 1 },
! ]
!
!
! rng = java.util.Random(seed)
! seeds = [rng.nextInt(2000000000) for foo in passes]
!
! pap.setNPasses(len(passes))
! #setSolidPass(pap.getPass(0), (0.1,0.1,0.2))
!
! for i in range(0, len(passes)):
! PaperMill().makePaperPass(seeds[i], pap.getPass(i),
passes[i]["trans"],
! emboss = passes[i]["emboss"])
!
! GL.endContext()
!
! #print "Pq: ",seed
! return GLRen.createPaperQuad(pap, -1, -1, 1, 1)
execfile("gfx/libpaper/papermill.py")
--- 109,116 ----
def getpaper(seed):
! pap = ThePaperMill().getPaper(seed)
! return GLRen.createPaperQuad(pap, -1, -1, 1, 1, 0)
execfile("gfx/libpaper/papermill.py")
***************
*** 205,213 ****
def scene(self, vs):
putnoc(vs, background(self.bgcolor))
! cs1 = vs.coords.affineCoordsys("1", 10, 800, 600, 800, 0, 0, 600)
scale = zoom[0] / paperzoom[0]
! cs2 = vs.coords.affineCoordsys("tex", 1, 400, 400, scale, 0, 0, scale)
pscale = zoom[0]
--- 183,193 ----
def scene(self, vs):
putnoc(vs, background(self.bgcolor))
! cs1 = vs.coords.affineCoordsys(0, 10, 800, 600, 800, 0, 0, 600)
! vs.matcher.add(cs1, "1")
scale = zoom[0] / paperzoom[0]
! cs2 = vs.coords.affineCoordsys(0, 1, 0, 0, 800/scale, 0, 0, 600/scale)
! vs.matcher.add(cs2, "tex")
pscale = zoom[0]
***************
*** 215,221 ****
vs.map.put(self.pq, cs1, cs2)
if 0:
! cs1 = vs.coords.affineCoordsys("msg", 10, 570, 450, 1, 0, 0, 1)
putText(vs, cs1, words[self.seed], color=(0,0,0),w=4,h=4)
return vs
--- 195,202 ----
vs.map.put(self.pq, cs1, cs2)
if 0:
! cs1 = vs.coords.affineCoordsys(0, 10, 570, 450, 1, 0, 0, 1)
! vs.matcher.add(cs1, "msg")
putText(vs, cs1, words[self.seed], color=(0,0,0),w=4,h=4)
return vs
***************
*** 316,325 ****
def scene(self, vs):
putnoc(vs, background(self.bgcolor))
! cs1 = vs.coords.affineCoordsys("1", 10, 800, 600, 800, 0, 0, 600)
scale = zoom[0] / paperzoom[0]
! cs2 = vs.coords.affineCoordsys("tex", 1, 400, 400, scale, 0, 0, scale)
!
pscale = zoom[0]
print "Seed: ",self.seed," pq ",self.pq
--- 297,307 ----
def scene(self, vs):
putnoc(vs, background(self.bgcolor))
! cs1 = vs.coords.affineCoordsys(0, 10, 800, 600, 800, 0, 0, 600)
! vs.matcher.add(cs1, "1")
scale = zoom[0] / paperzoom[0]
! cs2 = vs.coords.affineCoordsys(0, 1, 0, 0, scale/800, 0, 0, scale/600)
! vs.matcher.add(cs2, "tex")
pscale = zoom[0]
print "Seed: ",self.seed," pq ",self.pq
***************
*** 337,343 ****
else:
msg2 = "Ei ollut nähty"
! cs1 = vs.coords.affineCoordsys("msg", 10, 350, 350, 1, 0, 0, 1)
putText(vs, cs1, msg, color=(0,0,0),w=1,h=1,x=100)
putText(vs, cs1, msg2, color=(0,0,0),w=1,h=1, y=400)
#self.prepareNextTrial()
--- 319,326 ----
else:
msg2 = "Ei ollut nähty"
! cs1 = vs.coords.affineCoordsys(0, 10, 350, 350, 1, 0, 0, 1)
! vs.matcher.add(cs1, "msg")
putText(vs, cs1, msg, color=(0,0,0),w=1,h=1,x=100)
putText(vs, cs1, msg2, color=(0,0,0),w=1,h=1, y=400)
#self.prepareNextTrial()
***************
*** 363,369 ****
putnoc(vs, background(self.bgcolor))
if self.message != None:
! cs1 = vs.coords.affineCoordsys("msg", 10, 300, 450, 1, 0, 0, 1)
putText(vs, cs1, self.message, color=(1,1,1))
return vs
--- 346,353 ----
putnoc(vs, background(self.bgcolor))
if self.message != None:
! cs1 = vs.coords.affineCoordsys(0, 10, 300, 450, 1, 0, 0, 1)
! vs.matcher.add(cs1, "msg")
putText(vs, cs1, self.message, color=(1,1,1))
return vs
***************
*** 394,407 ****
def scene(self, vs):
putnoc(vs, background(self.bgcolor))
! cs1 = vs.coords.affineCoordsys("txt", 10, 100, 450, 1, 0, 0, 1)
putText(vs, cs1, "Press 'F1' to start", color=(0,1,0))
putText(vs, cs1, "seed = " + str(self.seed), color=(0,1,0), y = 100)
if self.pq != None:
! cs1 = vs.coords.affineCoordsys("1", 10, 800, 450, 390, 0, 0, 390)
scale = zoom[0] / paperzoom[0]
! cs2 = vs.coords.affineCoordsys("tex", 1, 400, 400, scale, 0, 0,
scale)
vs.map.put(self.pq, cs1, cs2)
return vs
--- 378,394 ----
def scene(self, vs):
putnoc(vs, background(self.bgcolor))
! cs1 = vs.coords.affineCoordsys(0, 10, 100, 450, 1, 0, 0, 1)
! vs.matcher.add(cs1, "txt")
putText(vs, cs1, "Press 'F1' to start", color=(0,1,0))
putText(vs, cs1, "seed = " + str(self.seed), color=(0,1,0), y = 100)
if self.pq != None:
! cs1 = vs.coords.affineCoordsys(0, 10, 800, 450, 390, 0, 0, 390)
! vs.matcher.add(cs1, "1")
scale = zoom[0] / paperzoom[0]
! cs2 = vs.coords.affineCoordsys(0, 1, 0, 0, scale/390, 0, 0,
scale/390)
! vs.matcher.add(cs2, "tex")
vs.map.put(self.pq, cs1, cs2)
return vs
- [Gzz-commits] gzz/gfx/demo psyko2.py,
Janne V. Kujala <=