[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: |
Mon, 07 Oct 2002 06:15:09 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/10/07 06:15:09
Modified files:
gfx/demo : gldemo.py papertest.py psyko2.py
gfx/demo/opengl: glinfo.py
Log message:
Adapt to the new font scaling
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/gldemo.py.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/papertest.py.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/psyko2.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/opengl/glinfo.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/gldemo.py
diff -c gzz/gfx/demo/gldemo.py:1.32 gzz/gfx/demo/gldemo.py:1.33
*** gzz/gfx/demo/gldemo.py:1.32 Sun Oct 6 13:37:46 2002
--- gzz/gfx/demo/gldemo.py Mon Oct 7 06:15:09 2002
***************
*** 99,111 ****
PopAttrib
""" % locals())
def getFont():
global font
try:
a=font
except:
! font = GL.createFont("gfx/fonts/a010013l.pfb", 32);
return font
def js(list):
--- 99,134 ----
PopAttrib
""" % locals())
+ fontsize = 32
def getFont():
global font
try:
a=font
except:
! font = GL.createFont("gfx/fonts/a010013l.pfb", fontsize);
return font
+
+ def getText(text, x = 0, y = 0, z = 0, w = 1, h = 1):
+ return GLRen.createHorizText(getFont(), text, x, y, z, w,h)
+
+ def putText(vs, cs1, text, color = None, x = 0, y = 0, z = 0, w = 1, h = 1):
+ if color != None:
+ putnoc(vs, getDListNocoords("Color " + js(color)))
+ putnoc(vs, getDListNocoords("""
+ PushAttrib ENABLE_BIT
+ Disable ALPHA_TEST
+ Disable DEPTH_TEST
+ Enable TEXTURE_2D
+ Enable BLEND
+ BlendFunc SRC_ALPHA ONE_MINUS_SRC_ALPHA
+ """))
+
+ t = getText(text, x, y, z, w, h)
+ vs.map.put(t, cs1)
+
+ putnoc(vs, getDListNocoords("""
+ PopAttrib
+ """))
def js(list):
Index: gzz/gfx/demo/opengl/glinfo.py
diff -c gzz/gfx/demo/opengl/glinfo.py:1.5 gzz/gfx/demo/opengl/glinfo.py:1.6
*** gzz/gfx/demo/opengl/glinfo.py:1.5 Mon Sep 30 10:04:25 2002
--- gzz/gfx/demo/opengl/glinfo.py Mon Oct 7 06:15:09 2002
***************
*** 1,34 ****
from __future__ import nested_scopes
- font = None
- fontsize = 40
- def getText(text, x = 0, y = 0, z = 2, w = 1, h = 1):
- global font
- if font == None:
- font = GL.createFont("gfx/fonts/a010013l.pfb", fontsize)
-
- return GLRen.createHorizText(font, text, x, y, z, w,h)
-
- def putText(vs, cs1, text, color = None, x = 0, y = 0, z = 2, w = 1, h = 1):
- if color != None:
- putnoc(vs, getDListNocoords("Color " + js(color)))
- putnoc(vs, getDListNocoords("""
- PushAttrib ENABLE_BIT
- Disable ALPHA_TEST
- Disable DEPTH_TEST
- Enable TEXTURE_2D
- Enable BLEND
- BlendFunc SRC_ALPHA ONE_MINUS_SRC_ALPHA
- """))
-
- t = getText(text, x, y, z, w, h)
- vs.map.put(t, cs1)
-
- putnoc(vs, getDListNocoords("""
- PopAttrib
- """))
-
-
def parstr(name):
return name + ": " + js(GL.getGLFloat(name))
--- 1,5 ----
***************
*** 144,152 ****
]]
! putText(vs, cs1, vendor, color=(0,0,0), w=.02, h=.02, y = 1)
! putText(vs, cs1, renderer, color=(0,0,0), w=.02, h=.02, y = 2)
! putText(vs, cs1, version, color=(0,0,0), w=.02, h=.02, y = 3)
foo = params
i = 0
--- 115,123 ----
]]
! putText(vs, cs1, vendor, color=(0,0,0), w=.8, h=.8, y = 1)
! putText(vs, cs1, renderer, color=(0,0,0), w=.8, h=.8, y = 2)
! putText(vs, cs1, version, color=(0,0,0), w=.8, h=.8, y = 3)
foo = params
i = 0
***************
*** 156,162 ****
for y in range(0, lines):
if i >= len(foo): break
! putText(vs, cs1, foo[i], color=(0,0,0), w=.008, h=.008,
x=x*(1200./40/rows), y=y*.5+4)
i += 1
--- 127,133 ----
for y in range(0, lines):
if i >= len(foo): break
! putText(vs, cs1, foo[i], color=(0,0,0), w=.32, h=.32,
x=x*(1200./40/rows), y=y*.5+4)
i += 1
***************
*** 170,176 ****
for y in range(0, lines):
if i >= len(foo): break
! putText(vs, cs1, foo[i], color=(0,0,0), w=.008, h=.008,
x=x*(1200./40/rows), y=y*.5+14)
i += 1
--- 141,147 ----
for y in range(0, lines):
if i >= len(foo): break
! putText(vs, cs1, foo[i], color=(0,0,0), w=.32, h=.32,
x=x*(1200./40/rows), y=y*.5+14)
i += 1
Index: gzz/gfx/demo/papertest.py
diff -c gzz/gfx/demo/papertest.py:1.33 gzz/gfx/demo/papertest.py:1.34
*** gzz/gfx/demo/papertest.py:1.33 Thu Oct 3 12:12:11 2002
--- gzz/gfx/demo/papertest.py Mon Oct 7 06:15:09 2002
***************
*** 172,178 ****
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=.0025,
h=.0025)
if self.renderPaper:
putnoc(vs, getDList("""
--- 172,178 ----
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("""
***************
*** 266,299 ****
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=.01, h=.01)
dobenchmark(w, vs)
-
- def getText(text, x = 0, y = 0, z = 2, w = 1, h = 1):
- return GLRen.createHorizText(getFont(), text, x, y, z, w,h)
-
- def putText(vs, cs1, text, color = None, x = 0, y = 0, z = 2, w = 1, h = 1):
- if color != None:
- putnoc(vs, getDListNocoords("Color " + js(color)))
- putnoc(vs, getDListNocoords("""
- PushAttrib ENABLE_BIT
- Disable ALPHA_TEST
- Disable DEPTH_TEST
- Enable TEXTURE_2D
- Enable BLEND
- BlendFunc SRC_ALPHA ONE_MINUS_SRC_ALPHA
- """))
-
- t = getText(text, x, y, z, w, h)
- vs.map.put(t, cs1)
-
- putnoc(vs, getDListNocoords("""
- PopAttrib
- """))
-
-
class ColorMapScene:
def __init__(self):
self.bgcolor = (0,0,0)
--- 266,275 ----
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)
class ColorMapScene:
def __init__(self):
self.bgcolor = (0,0,0)
***************
*** 341,347 ****
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=.005, h=.005)
--- 317,323 ----
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)
Index: gzz/gfx/demo/psyko2.py
diff -c gzz/gfx/demo/psyko2.py:1.11 gzz/gfx/demo/psyko2.py:1.12
*** gzz/gfx/demo/psyko2.py:1.11 Thu Oct 3 08:04:12 2002
--- gzz/gfx/demo/psyko2.py Mon Oct 7 06:15:09 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=4,h=4)
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),w=400,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=1,h=1,x=100)
! putText(vs, cs1, msg2, color=(0,0,0),w=1,h=1, 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),w=100,h=100,x=100)
! putText(vs, cs1, msg2, color=(0,0,0),w=100,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))
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
***************
*** 381,388 ****
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))
! putText(vs, cs1, "seed = " + str(self.seed), color=(0,.75,0), y = 100)
if self.pq != None:
cs1 = vs.coords.affineCoordsys(0, 10, 800, 450, 390, 0, 0, 390)
--- 381,388 ----
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)
***************
*** 414,447 ****
AbstractUpdateManager.setNoAnimation()
AbstractUpdateManager.chg()
!
! font = None
! def getText(text, x = 0, y = 0, z = 0, w = 1, h = 1):
! global font
! if font == None:
! font = GL.createFont("gfx/fonts/a010013l.pfb", 100)
!
! return GLRen.createHorizText(font, text, x, y, z, w,h)
!
! def putText(vs, cs1, text, color = None, x = 0, y = 0, z = 0, w = 1, h = 1):
! if color != None:
! putnoc(vs, getDListNocoords("Color " + js(color)))
! putnoc(vs, getDListNocoords("""
! PushAttrib ENABLE_BIT
! Enable TEXTURE_2D
! Enable ALPHA_TEST
! Enable BLEND
! BlendFunc SRC_ALPHA ONE_MINUS_SRC_ALPHA
! """))
!
! t = getText(text, x, y, z, w, h)
! vs.map.put(t, cs1)
!
! putnoc(vs, getDListNocoords("""
! PopAttrib
! """))
!
!
currentScene = MenuScene()
--- 414,420 ----
AbstractUpdateManager.setNoAnimation()
AbstractUpdateManager.chg()
! fontsize = 100
currentScene = MenuScene()
- [Gzz-commits] gzz/gfx/demo gldemo.py papertest.py psyko2.py o...,
Janne V. Kujala <=