[Gzz-commits] gzz/gfx/demo gldemo.py opengl/glinfo.py

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/10/08 06:49:26

Modified files:
        gfx/demo       : gldemo.py 
        gfx/demo/opengl: glinfo.py 

Log message:
        Make use TextVob

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/gldemo.py.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/opengl/glinfo.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/gldemo.py
diff -c gzz/gfx/demo/gldemo.py:1.36 gzz/gfx/demo/gldemo.py:1.37
*** gzz/gfx/demo/gldemo.py:1.36 Tue Oct  8 03:30:12 2002
--- gzz/gfx/demo/gldemo.py      Tue Oct  8 06:49:25 2002
***************
*** 18,23 ****
--- 18,24 ----
  import java
  from gzz.client import *
  from gzz.gfx.gl import GL, GLRen, GLSpans, Paper, GLCache
+ from gzz.vob import GLTextStyle, TextVob
  import math
  import getopt
  import gzz.util
***************
*** 99,117 ****
        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("""
--- 100,114 ----
        PopAttrib
      """ % locals())
  
! textstyle = None
  
! def getText(text):
!     global textstyle
!     if not textstyle:
!       textstyle = GLTextStyle.create("sans", 0, 1)
!     return TextVob(textstyle, text, 0)
  
! def putText(vs, cs1, text, color = None):
      if color != None:    
          putnoc(vs, getDListNocoords("Color " + js(color)))
      putnoc(vs, getDListNocoords("""
***************
*** 123,129 ****
        BlendFunc SRC_ALPHA ONE_MINUS_SRC_ALPHA
      """))
  
!     t = getText(text, x, y, z, w, h)
      vs.map.put(t, cs1)
      
      putnoc(vs, getDListNocoords("""
--- 120,126 ----
        BlendFunc SRC_ALPHA ONE_MINUS_SRC_ALPHA
      """))
  
!     t = getText(text)
      vs.map.put(t, cs1)
      
      putnoc(vs, getDListNocoords("""
Index: gzz/gfx/demo/opengl/glinfo.py
diff -c gzz/gfx/demo/opengl/glinfo.py:1.6 gzz/gfx/demo/opengl/glinfo.py:1.7
*** gzz/gfx/demo/opengl/glinfo.py:1.6   Mon Oct  7 06:15:09 2002
--- gzz/gfx/demo/opengl/glinfo.py       Tue Oct  8 06:49:26 2002
***************
*** 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
--- 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
***************
*** 127,134 ****
              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
  
  
--- 127,133 ----
              for y in range(0, lines):
                  if i >= len(foo): break
                  
!                 putText(vs, cs1, foo[i], color=(0,0,0))
                  i += 1
  
  
***************
*** 141,148 ****
              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
  
        return vs
--- 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