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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/03 17:11:17

Modified files:
        .              : Makefile Gzz.py 
        gfx/demo       : gldemo.py 
Added files:
        gzz/util       : __init__.py dbg.py 

Log message:
        Abstract away command line parsing; add it to gldemo.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.154&tr2=1.155&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Gzz.py.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/gldemo.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/util/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/util/dbg.py?rev=1.1

Patches:
Index: gzz/Gzz.py
diff -c gzz/Gzz.py:1.26 gzz/Gzz.py:1.27
*** gzz/Gzz.py:1.26     Thu Aug 22 18:52:02 2002
--- gzz/Gzz.py  Tue Sep  3 17:11:17 2002
***************
*** 10,44 ****
  # we have to call setProperty *BEFORE* that in order
  # to choose the right GraphicsAPI.instance
  
! opts, args = getopt.getopt(sys.argv[1:], "Cd:D:G:t", ["--commander","--dbg=", 
"--gldbg="])
  
- debugger = gzz.util.Dbg()
  transient = 0
  
- # GL debug switches to turn on
- gldbg = []
  
  for o,a in opts:
      if o in ("-C", "--commander"):
        from gzz.control import commander
        commander.AwtCommander(globals())
!     if o in ("-d", "--dbg"):
!         debugger.debugClass(a, 1)
!     if o in ("-G", "--gldbg"):
!         gldbg.append(a)
!     elif o in ("-D",):
!         m = re.match('^(.*)=(.*)$', a)
!       assert m
!       System.setProperty(m.group(1), m.group(2))
      if o in ("-t", "--transient"):
          transient = 1
  
  
- sys.path.insert(0, ".")
  
! for opt in gldbg:
!     GZZGL.loadLib()
!     GZZGL.setDebugVar(opt, 1)
  
  from gzz import *
  from gzz.impl import *
--- 10,33 ----
  # we have to call setProperty *BEFORE* that in order
  # to choose the right GraphicsAPI.instance
  
! opts, args = getopt.getopt(sys.argv[1:], "Ct"+gzz.util.dbg.short, 
!       ["--commander"]+gzz.util.dbg.long)
  
  transient = 0
  
  
  for o,a in opts:
      if o in ("-C", "--commander"):
        from gzz.control import commander
        commander.AwtCommander(globals())
!     if o in gzz.util.dbg.all:
!       gzz.util.dbg.option(o,a)
      if o in ("-t", "--transient"):
          transient = 1
  
  
  
! sys.path.insert(0, ".")
  
  from gzz import *
  from gzz.impl import *
Index: gzz/Makefile
diff -c gzz/Makefile:1.154 gzz/Makefile:1.155
*** gzz/Makefile:1.154  Tue Sep  3 06:13:23 2002
--- gzz/Makefile        Tue Sep  3 17:11:17 2002
***************
*** 378,387 ****
  jython:
        $(JYTHON) $(DBG)
  
! GLDEMO=gfx/demo/gldemo.py
  
  runpaper:
!       $(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/papertest.py
  runtestto:
        $(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/testtimeout.py
  runpsyko:
--- 378,387 ----
  jython:
        $(JYTHON) $(DBG)
  
! GLDEMO=gfx/demo/gldemo.py $(DBG)
  
  runpaper:
!       $(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/papertest.py 
  runtestto:
        $(GLLIB) $(JYTHON) $(GLDEMO) gfx/demo/testtimeout.py
  runpsyko:
Index: gzz/gfx/demo/gldemo.py
diff -c gzz/gfx/demo/gldemo.py:1.4 gzz/gfx/demo/gldemo.py:1.5
*** gzz/gfx/demo/gldemo.py:1.4  Fri Aug 30 04:53:18 2002
--- gzz/gfx/demo/gldemo.py      Tue Sep  3 17:11:17 2002
***************
*** 11,19 ****
--- 11,31 ----
  from gzz.client import *
  from gzz.gfx.gl import GZZGL, Paper
  import math
+ import getopt
+ import gzz.util
  
  System.setProperty("gzzclient", "gl")
  
+ print "ARGV:",sys.argv
+ print "DBG:",gzz.util.dbg.short,gzz.util.dbg.long,gzz.util.dbg.all
+ opts, args = getopt.getopt(sys.argv[1:], 
+       gzz.util.dbg.short, 
+       gzz.util.dbg.long)
+ for o,a in opts:
+     print "Opt: ",o,a
+     if o in gzz.util.dbg.all:
+       gzz.util.dbg.option(o,a)
+ 
  def background(rgb):
      return getDList("""
        ClearColor %s %s %s 0
***************
*** 170,177 ****
        AbstractUpdateManager.chg()
        
  
! import sys
! scenefile = sys.argv[1]
  
  gfxapi = GraphicsAPI.getInstance()
  gfxapi.startUpdateManager(Main())
--- 182,188 ----
        AbstractUpdateManager.chg()
        
  
! scenefile = args[0]
  
  gfxapi = GraphicsAPI.getInstance()
  gfxapi.startUpdateManager(Main())