[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx/demo gldemo.py papertest.py psyko2.py o...
|
From: |
Janne V. Kujala |
|
Subject: |
[Gzz-commits] gzz/gfx/demo gldemo.py papertest.py psyko2.py o... |
|
Date: |
Tue, 08 Oct 2002 08:34:13 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/10/08 08:34:13
Modified files:
gfx/demo : gldemo.py papertest.py psyko2.py
gfx/demo/opengl: glinfo.py
Log message:
Try to adapt to TextVob; scales are still wrong and changed text blinks
(probably because of bad cs matching when interpolationg)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/gldemo.py.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/papertest.py.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/psyko2.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/opengl/glinfo.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/gldemo.py
diff -c gzz/gfx/demo/gldemo.py:1.38 gzz/gfx/demo/gldemo.py:1.39
*** gzz/gfx/demo/gldemo.py:1.38 Tue Oct 8 07:04:07 2002
--- gzz/gfx/demo/gldemo.py Tue Oct 8 08:34:13 2002
***************
*** 108,114 ****
textstyle = GLTextStyle.create("sans", 0, 1)
return TextVob(textstyle, text, 0)
! def putText(vs, cs1, text, color = None, x = 0, y = 0, h = 10):
if color != None:
putnoc(vs, getDListNocoords("Color " + js(color)))
putnoc(vs, getDListNocoords("""
--- 108,114 ----
textstyle = GLTextStyle.create("sans", 0, 1)
return TextVob(textstyle, text, 0)
! def putText(vs, cs1, text, color = None, x = 0, y = 0, z = 0, h = 10):
if color != None:
putnoc(vs, getDListNocoords("Color " + js(color)))
putnoc(vs, getDListNocoords("""
***************
*** 122,128 ****
t = getText(text)
! cs = vs.coords.coordsys(cs1, 0, x, y-h, h, h)
vs.matcher.addSub(cs1, cs, str(text))
vs.map.put(t, cs)
--- 122,128 ----
t = getText(text)
! cs = vs.coords.coordsys(cs1, z, x, y-h, h, h)
vs.matcher.addSub(cs1, cs, str(text))
vs.map.put(t, cs)
Index: gzz/gfx/demo/opengl/glinfo.py
diff -c gzz/gfx/demo/opengl/glinfo.py:1.7 gzz/gfx/demo/opengl/glinfo.py:1.8
*** gzz/gfx/demo/opengl/glinfo.py:1.7 Tue Oct 8 06:49:26 2002
--- gzz/gfx/demo/opengl/glinfo.py Tue Oct 8 08:34:13 2002
***************
*** 115,123 ****
]]
! putText(vs, cs1, vendor, color=(0,0,0))
! putText(vs, cs1, renderer, color=(0,0,0))
! putText(vs, cs1, version, color=(0,0,0))
foo = params
i = 0
--- 115,123 ----
]]
! putText(vs, cs1, vendor, color=(0,0,0), h=.8, y = 1)
! putText(vs, cs1, renderer, color=(0,0,0), h=.8, y = 2)
! putText(vs, cs1, version, color=(0,0,0), h=.8, y = 3)
foo = params
i = 0
***************
*** 127,133 ****
for y in range(0, lines):
if i >= len(foo): break
! putText(vs, cs1, foo[i], color=(0,0,0))
i += 1
--- 127,134 ----
for y in range(0, lines):
if i >= len(foo): break
! putText(vs, cs1, foo[i], color=(0,0,0), h=.32,
! x=x*(1200./40/rows), y=y*.5+4)
i += 1
***************
*** 140,146 ****
for y in range(0, lines):
if i >= len(foo): break
! putText(vs, cs1, foo[i], color=(0,0,0))
i += 1
return vs
--- 141,148 ----
for y in range(0, lines):
if i >= len(foo): break
! putText(vs, cs1, foo[i], color=(0,0,0), h=.32,
! x=x*(1200./40/rows), y=y*.5+14)
i += 1
return vs
Index: gzz/gfx/demo/papertest.py
diff -c gzz/gfx/demo/papertest.py:1.36 gzz/gfx/demo/papertest.py:1.37
*** gzz/gfx/demo/papertest.py:1.36 Mon Oct 7 10:22:25 2002
--- gzz/gfx/demo/papertest.py Tue Oct 8 08:34:13 2002
***************
*** 177,183 ****
print "Seed: ",self.seed," pq ",self.pq
vs.map.put(self.pq, cs1, cs2)
! putText(vs, cs1, str(self.seed), color=(0,0,0), x=-1, y=-1, w=.085,
h=.08)
if self.renderPaper:
putnoc(vs, getDList("""
--- 177,183 ----
print "Seed: ",self.seed," pq ",self.pq
vs.map.put(self.pq, cs1, cs2)
! putText(vs, cs1, str(self.seed), color=(0,0,0), x=-1, y=-1, h=.08)
if self.renderPaper:
putnoc(vs, getDList("""
***************
*** 271,277 ****
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,w=.32, h=.32)
dobenchmark(w, vs)
--- 271,277 ----
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=.32)
dobenchmark(w, vs)
***************
*** 322,328 ****
cs1 = vs.coords.affineCoordsys(0, 10, 600, 500, 450, 0, 0, 450)
vs.matcher.add(cs1, "1")
! putText(vs, cs1, "F1, F2", color=(0,0,0), w=.16, h=.16)
--- 322,328 ----
cs1 = vs.coords.affineCoordsys(0, 10, 600, 500, 450, 0, 0, 450)
vs.matcher.add(cs1, "1")
! putText(vs, cs1, "F1, F2", color=(0,0,0), h=.16)
Index: gzz/gfx/demo/psyko2.py
diff -c gzz/gfx/demo/psyko2.py:1.12 gzz/gfx/demo/psyko2.py:1.13
*** gzz/gfx/demo/psyko2.py:1.12 Mon Oct 7 06:15:09 2002
--- gzz/gfx/demo/psyko2.py Tue Oct 8 08:34:13 2002
***************
*** 198,204 ****
if 0:
cs1 = vs.coords.affineCoordsys(0, 5, 570, 450, 1, 0, 0, 1)
vs.matcher.add(cs1, "msg")
! putText(vs, cs1, words[self.seed], color=(0,0,0),w=400,h=400)
return vs
--- 198,204 ----
if 0:
cs1 = vs.coords.affineCoordsys(0, 5, 570, 450, 1, 0, 0, 1)
vs.matcher.add(cs1, "msg")
! putText(vs, cs1, words[self.seed], color=(0,0,0),h=400)
return vs
***************
*** 322,329 ****
cs1 = vs.coords.affineCoordsys(0, 5, 350, 350, 1, 0, 0, 1)
vs.matcher.add(cs1, "msg")
! putText(vs, cs1, msg, color=(0,0,0),w=100,h=100,x=100)
! putText(vs, cs1, msg2, color=(0,0,0),w=100,h=100, y=400)
#self.prepareNextTrial()
return vs
--- 322,329 ----
cs1 = vs.coords.affineCoordsys(0, 5, 350, 350, 1, 0, 0, 1)
vs.matcher.add(cs1, "msg")
! putText(vs, cs1, msg, color=(0,0,0),h=100,x=100)
! putText(vs, cs1, msg2, color=(0,0,0),h=100, y=400)
#self.prepareNextTrial()
return vs
***************
*** 349,355 ****
if self.message != None:
cs1 = vs.coords.affineCoordsys(0, 5, 300, 450, 1, 0, 0, 1)
vs.matcher.add(cs1, "msg")
! putText(vs, cs1, self.message, color=(1,1,1), w=100, h=100)
return vs
--- 349,355 ----
if self.message != None:
cs1 = vs.coords.affineCoordsys(0, 5, 300, 450, 1, 0, 0, 1)
vs.matcher.add(cs1, "msg")
! putText(vs, cs1, self.message, color=(1,1,1), h=100)
return vs
***************
*** 379,389 ****
def scene(self, vs):
putnoc(vs, background(self.bgcolor))
- cs1 = vs.coords.affineCoordsys(0, 5, 100, 450, 1, 0, 0, 1)
- vs.matcher.add(cs1, "txt")
- putText(vs, cs1, "Press 'F1' to start", color=(0,.75,0),w=100,h=100)
- putText(vs, cs1, "seed = " + str(self.seed), color=(0,.75,0), y =
100,w=100,h=100)
-
if self.pq != None:
cs1 = vs.coords.affineCoordsys(0, 10, 800, 450, 390, 0, 0, 390)
vs.matcher.add(cs1, "1")
--- 379,384 ----
***************
*** 391,396 ****
--- 386,397 ----
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)
+
+ cs1 = vs.coords.affineCoordsys(0, 5, 100, 450, 1, 0, 0, 1)
+ vs.matcher.add(cs1, "txt")
+ putText(vs, cs1, "Press 'F1' to start", color=(0,.75,0),h=100)
+ putText(vs, cs1, "seed = " + str(self.seed), color=(0,.75,0), y =
100,h=100)
+
return vs