[Gzz-commits] gzz gfx/demo/gldemo.py gfx/demo/color/colors.py...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/23 05:09:29

Modified files:
        gfx/demo       : gldemo.py 
        gfx/demo/color : colors.py 
        gfx/demo/opengl: glinfo.py readpixels.py stencil.py texform.py 
                         texperf.py 
        gzz/gfx/gl     : debugswitches.py 
        lava/gfx/blob  : Obj.py 

Log message:
        More fixing

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/gldemo.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/color/colors.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/opengl/glinfo.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/opengl/readpixels.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/opengl/stencil.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/opengl/texform.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/opengl/texperf.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/debugswitches.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gfx/blob/Obj.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/color/colors.py
diff -c gzz/gfx/demo/color/colors.py:1.3 gzz/gfx/demo/color/colors.py:1.4
*** gzz/gfx/demo/color/colors.py:1.3    Thu Sep 19 05:41:47 2002
--- gzz/gfx/demo/color/colors.py        Mon Sep 23 05:09:29 2002
***************
*** 228,234 ****
            l = 100 * (b+.5) / 16.0
            #vs.put(self.labhex(fr), "lab"+str(b), 10, 600 + dsiz*(b/4) , 
dsiz*(b%4), dsiz, dsiz)
  
!             vs.put(GZZGL.createLABSlice(0, l),
                     "labslice"+str(b),
                     10, 400 + dsiz*(b/4+.5) , dsiz*(b%4+.5), dsiz*.01, 
dsiz*.01)
  
--- 228,234 ----
            l = 100 * (b+.5) / 16.0
            #vs.put(self.labhex(fr), "lab"+str(b), 10, 600 + dsiz*(b/4) , 
dsiz*(b%4), dsiz, dsiz)
  
!             vs.put(GLRen.createLABSlice(0, l),
                     "labslice"+str(b),
                     10, 400 + dsiz*(b/4+.5) , dsiz*(b%4+.5), dsiz*.01, 
dsiz*.01)
  
Index: gzz/gfx/demo/gldemo.py
diff -c gzz/gfx/demo/gldemo.py:1.21 gzz/gfx/demo/gldemo.py:1.22
*** gzz/gfx/demo/gldemo.py:1.21 Mon Sep 23 04:37:04 2002
--- gzz/gfx/demo/gldemo.py      Mon Sep 23 05:09:29 2002
***************
*** 9,15 ****
  from java.lang import System,Runnable
  import java
  from gzz.client import *
! from gzz.gfx.gl import GL, GLRen
  import math
  import getopt
  import gzz.util
--- 9,15 ----
  from java.lang import System,Runnable
  import java
  from gzz.client import *
! from gzz.gfx.gl import GL, GLRen, Paper
  import math
  import getopt
  import gzz.util
Index: gzz/gfx/demo/opengl/glinfo.py
diff -c gzz/gfx/demo/opengl/glinfo.py:1.3 gzz/gfx/demo/opengl/glinfo.py:1.4
*** gzz/gfx/demo/opengl/glinfo.py:1.3   Sat Sep 21 03:35:17 2002
--- gzz/gfx/demo/opengl/glinfo.py       Mon Sep 23 05:09:29 2002
***************
*** 5,13 ****
  def getText(text, x = 0, y = 0, z = 2, w = 1, h = 1):
      global font
      if font == None:
!       font = GZZGL.createFont("gfx/fonts/a010013l.pfb", fontsize)
  
!     return GZZGL.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:    
--- 5,13 ----
  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:    
***************
*** 30,36 ****
  
  
  def parstr(name):
!     return name + ": " + js(GZZGL.getGLFloat(name))
  
  class InfoScene:
      def __init__(self):
--- 30,36 ----
  
  
  def parstr(name):
!     return name + ": " + js(GL.getGLFloat(name))
  
  class InfoScene:
      def __init__(self):
***************
*** 42,51 ****
  
        cs1 = vs.coords.affineCoordsys(0, "1", 10, 0, 0, 40, 0, 0, 40)
  
!         vendor = GZZGL.getGLString("VENDOR")
!         renderer = GZZGL.getGLString("RENDERER")
!         version = GZZGL.getGLString("VERSION")
!         extensions = GZZGL.getGLString("EXTENSIONS")
  
          params = [ parstr(name) for name in [
              "MAX_LIGHTS",
--- 42,51 ----
  
        cs1 = vs.coords.affineCoordsys(0, "1", 10, 0, 0, 40, 0, 0, 40)
  
!         vendor = GL.getGLString("VENDOR")
!         renderer = GL.getGLString("RENDERER")
!         version = GL.getGLString("VERSION")
!         extensions = GL.getGLString("EXTENSIONS")
  
          params = [ parstr(name) for name in [
              "MAX_LIGHTS",
Index: gzz/gfx/demo/opengl/readpixels.py
diff -c gzz/gfx/demo/opengl/readpixels.py:1.1 
gzz/gfx/demo/opengl/readpixels.py:1.2
*** gzz/gfx/demo/opengl/readpixels.py:1.1       Fri Sep 20 10:41:36 2002
--- gzz/gfx/demo/opengl/readpixels.py   Mon Sep 23 05:09:29 2002
***************
*** 1,7 ****
  
  class ReadScene:
      def read(self):
!       bv = GZZGL.createByteVector(2000)
        for i in range(0, 50):
            print bv.get(i)
        bv.readFromBuffer_ubytes(w.window, "BACK", 10, 10, 10, 10, "RGB")
--- 1,7 ----
  
  class ReadScene:
      def read(self):
!       bv = GL.createByteVector(2000)
        for i in range(0, 50):
            print bv.get(i)
        bv.readFromBuffer_ubytes(w.window, "BACK", 10, 10, 10, 10, "RGB")
Index: gzz/gfx/demo/opengl/stencil.py
diff -c gzz/gfx/demo/opengl/stencil.py:1.4 gzz/gfx/demo/opengl/stencil.py:1.5
*** gzz/gfx/demo/opengl/stencil.py:1.4  Tue Sep 10 14:53:19 2002
--- gzz/gfx/demo/opengl/stencil.py      Mon Sep 23 05:09:29 2002
***************
*** 4,18 ****
  from java.util import Random
  from gzz.gfx.gl import Stencil
  
! stb = GZZGL.getGLFloat("STENCIL_BITS")[0]
  print "Stencil: ",stb
  if stb < 3:
      print "No stencil bits available"
      System.exit(2)
- 
- # t = GZZGL.createTexture()
- # t.shade(128, 128, 0, 4, "RGBA", "RGBA",
- #     "fnoise", ["scale", "2", "freq", "1", "df", "2", "bias", "0.5"])
  
  rng = Random()
  def ds():
--- 4,14 ----
  from java.util import Random
  from gzz.gfx.gl import Stencil
  
! stb = GL.getGLFloat("STENCIL_BITS")[0]
  print "Stencil: ",stb
  if stb < 3:
      print "No stencil bits available"
      System.exit(2)
  
  rng = Random()
  def ds():
Index: gzz/gfx/demo/opengl/texform.py
diff -c gzz/gfx/demo/opengl/texform.py:1.1 gzz/gfx/demo/opengl/texform.py:1.2
*** gzz/gfx/demo/opengl/texform.py:1.1  Fri Sep 20 06:27:02 2002
--- gzz/gfx/demo/opengl/texform.py      Mon Sep 23 05:09:29 2002
***************
*** 2,9 ****
  # We're using VERY large textures for the PDF stuff and it's
  # vital that we understand what they get stored as.
  
- from gzz.gfx.gl import GZZGL,GLSpans,Paper
- 
  scroll = gzz.media.impl.PageImageScroll(None, gzz.mediaserver.Mediaserver.Id(
  
"0000000008000000E9573F43E00004CB42D4BEFEBAA27C20403F7D57693141B9E4D9A46329AC9C"))
  
--- 2,7 ----
***************
*** 21,29 ****
            "TEXTURE_LUMINANCE_SIZE",
            "TEXTURE_INTENSITY_SIZE",
                        ):
!           print "p:\t",p,"\t", 
GZZGL.getGLTexLevelParameterFloat("TEXTURE_2D", id, i, p)
!       print "if:\t",GZZGL.getGLTokenString(
!           int(GZZGL.getGLTexLevelParameterFloat("TEXTURE_2D", id, i, 
                            "TEXTURE_INTERNAL_FORMAT")[0]))
  
  print "PageImageScroll\n"
--- 19,27 ----
            "TEXTURE_LUMINANCE_SIZE",
            "TEXTURE_INTENSITY_SIZE",
                        ):
!           print "p:\t",p,"\t", GL.getGLTexLevelParameterFloat("TEXTURE_2D", 
id, i, p)
!       print "if:\t",GL.getGLTokenString(
!           int(GL.getGLTexLevelParameterFloat("TEXTURE_2D", id, i, 
                            "TEXTURE_INTERNAL_FORMAT")[0]))
  
  print "PageImageScroll\n"
***************
*** 74,80 ****
        ("COMPRESSED_RGBA_S3TC_DXT3_EXT", "RGBA", "4"),
        ("COMPRESSED_RGBA_S3TC_DXT5_EXT", "RGBA", "4"),
            ):
!     tex = GZZGL.createTexture()
      print "Now: ",inter
      tex.shade(64, 64, 0, int(ncomps), inter, exter, "noise", ())
      printTex(tex.getTexId())
--- 72,78 ----
        ("COMPRESSED_RGBA_S3TC_DXT3_EXT", "RGBA", "4"),
        ("COMPRESSED_RGBA_S3TC_DXT5_EXT", "RGBA", "4"),
            ):
!     tex = GL.createTexture()
      print "Now: ",inter
      tex.shade(64, 64, 0, int(ncomps), inter, exter, "noise", ())
      printTex(tex.getTexId())
Index: gzz/gfx/demo/opengl/texperf.py
diff -c gzz/gfx/demo/opengl/texperf.py:1.2 gzz/gfx/demo/opengl/texperf.py:1.3
*** gzz/gfx/demo/opengl/texperf.py:1.2  Mon Sep 23 03:43:42 2002
--- gzz/gfx/demo/opengl/texperf.py      Mon Sep 23 05:09:29 2002
***************
*** 17,37 ****
  size = 1024
  baselevel=0
  
! img = GZZGL.createImage("doc/gl/irreg0.png")
  
! tex0 = GZZGL.createTexture()
  tex0.loadNull2D(0, "R3_G3_B2", 64, 64, 0, "RGB", "UNSIGNED_BYTE")
  
  
  def maketex():
      global tex, texes
!     tex = GZZGL.createTexture()
      tex.loadNull2D(0, form, size, size, 0, "RGB", "UNSIGNED_BYTE")
      tex.loadSubImage(0, img, 50, 50)
      # tex.shade(size, size, 0, 4, form, "RGBA", "waves", [])
      # tex.shade(size, size, 0, 4, form, "RGBA", "waves", [])
  
!     texes = [ GZZGL.createTexture() for i in range(0, 50) ]
      for t in texes:
        tex.downsampleInto(t, "TEXTURE_2D", 0, form, "RGB")
  
--- 17,37 ----
  size = 1024
  baselevel=0
  
! img = GL.createImage("doc/gl/irreg0.png")
  
! tex0 = GL.createTexture()
  tex0.loadNull2D(0, "R3_G3_B2", 64, 64, 0, "RGB", "UNSIGNED_BYTE")
  
  
  def maketex():
      global tex, texes
!     tex = GL.createTexture()
      tex.loadNull2D(0, form, size, size, 0, "RGB", "UNSIGNED_BYTE")
      tex.loadSubImage(0, img, 50, 50)
      # tex.shade(size, size, 0, 4, form, "RGBA", "waves", [])
      # tex.shade(size, size, 0, 4, form, "RGBA", "waves", [])
  
!     texes = [ GL.createTexture() for i in range(0, 50) ]
      for t in texes:
        tex.downsampleInto(t, "TEXTURE_2D", 0, form, "RGB")
  
***************
*** 48,56 ****
            "TEXTURE_LUMINANCE_SIZE",
            "TEXTURE_INTENSITY_SIZE",
                        ):
!           print "p:\t",p,"\t", 
GZZGL.getGLTexLevelParameterFloat("TEXTURE_2D", id, i, p)
!       print "if:\t",GZZGL.getGLTokenString(
!           int(GZZGL.getGLTexLevelParameterFloat("TEXTURE_2D", id, i, 
                            "TEXTURE_INTERNAL_FORMAT")[0]))
  
  
--- 48,56 ----
            "TEXTURE_LUMINANCE_SIZE",
            "TEXTURE_INTENSITY_SIZE",
                        ):
!           print "p:\t",p,"\t", GL.getGLTexLevelParameterFloat("TEXTURE_2D", 
id, i, p)
!       print "if:\t",GL.getGLTokenString(
!           int(GL.getGLTexLevelParameterFloat("TEXTURE_2D", id, i, 
                            "TEXTURE_INTERNAL_FORMAT")[0]))
  
  
***************
*** 71,78 ****
                texid = texes[i].getTexId()
                if 0:
                    print "Id ",texid
!                   print "Resid", GZZGL.getGLTexParameterFloat("TEXTURE_2D", 
texes[i].getTexId(), "TEXTURE_RESIDENT")
!                   print "Prio", GZZGL.getGLTexParameterFloat("TEXTURE_2D", 
texes[i].getTexId(), "TEXTURE_PRIORITY")
                    printTex(texid)
                putnoc(vs, getDListNocoords("""
                    BindTexture TEXTURE_2D %s
--- 71,78 ----
                texid = texes[i].getTexId()
                if 0:
                    print "Id ",texid
!                   print "Resid", GL.getGLTexParameterFloat("TEXTURE_2D", 
texes[i].getTexId(), "TEXTURE_RESIDENT")
!                   print "Prio", GL.getGLTexParameterFloat("TEXTURE_2D", 
texes[i].getTexId(), "TEXTURE_PRIORITY")
                    printTex(texid)
                putnoc(vs, getDListNocoords("""
                    BindTexture TEXTURE_2D %s
Index: gzz/gzz/gfx/gl/debugswitches.py
diff -c gzz/gzz/gfx/gl/debugswitches.py:1.3 gzz/gzz/gfx/gl/debugswitches.py:1.4
*** gzz/gzz/gfx/gl/debugswitches.py:1.3 Wed Aug 21 03:12:43 2002
--- gzz/gzz/gfx/gl/debugswitches.py     Mon Sep 23 05:09:29 2002
***************
*** 5,18 ****
  
  from java.awt import *
  from pawt import GridBag
! from gzz.gfx.gl import GZZGL
  
  class DebugSwitches:
      def __init__(self, on_initially = []):
        self.toggles = {}
        def toggler(str):
            return lambda ev: self.toggle(str)
!       self.names = GZZGL.getDebugVarNames()
          self.frame = Frame("Gzz commander",
              windowClosing=lambda ev: self.frame.dispose())
          g = GridBag(self.frame)
--- 5,18 ----
  
  from java.awt import *
  from pawt import GridBag
! from gzz.gfx.gl import GL
  
  class DebugSwitches:
      def __init__(self, on_initially = []):
        self.toggles = {}
        def toggler(str):
            return lambda ev: self.toggle(str)
!       self.names = GL.getDebugVarNames()
          self.frame = Frame("Gzz commander",
              windowClosing=lambda ev: self.frame.dispose())
          g = GridBag(self.frame)
***************
*** 32,35 ****
        print "Toggle",str
        val = self.toggles[str].getState()
        print "new value:",val
!       GZZGL.setDebugVar(str, val)
--- 32,35 ----
        print "Toggle",str
        val = self.toggles[str].getState()
        print "new value:",val
!       GL.setDebugVar(str, val)
Index: gzz/lava/gfx/blob/Obj.py
diff -c gzz/lava/gfx/blob/Obj.py:1.12 gzz/lava/gfx/blob/Obj.py:1.13
*** gzz/lava/gfx/blob/Obj.py:1.12       Thu Aug  1 04:18:55 2002
--- gzz/lava/gfx/blob/Obj.py    Mon Sep 23 05:09:29 2002
***************
*** 390,396 ****
          END
        """)
        print "CODE: ",code
!       self.prog = GZZGL.createVertexProgramNV(code)
  
        l = vector((-1,-1,-1)).normalized()
        h = (l + vector((0, 0, -1))).normalized()
--- 390,396 ----
          END
        """)
        print "CODE: ",code
!       self.prog = GL.createVertexProgramNV(code)
  
        l = vector((-1,-1,-1)).normalized()
        h = (l + vector((0, 0, -1))).normalized()
***************
*** 449,455 ****
        # self.blobCode = connectors(conns)
  
        (code, params) = blendedConnectorProgram(conns)
!       self.blendProg = GZZGL.createVertexProgramNV(code)
        print "Params: ", params
        self.blendPar = getDListNocoords(params)
  
--- 449,455 ----
        # self.blobCode = connectors(conns)
  
        (code, params) = blendedConnectorProgram(conns)
!       self.blendProg = GL.createVertexProgramNV(code)
        print "Params: ", params
        self.blendPar = getDListNocoords(params)