[Gzz-commits] libvob bench/mark.py vob/__init__.py vob/util/_...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/14 00:46:28

Modified files:
        bench          : mark.py 
        vob            : __init__.py 
        vob/util       : __init__.py 

Log message:
        inittwids

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/bench/mark.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/__init__.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/util/__init__.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: libvob/bench/mark.py
diff -u libvob/bench/mark.py:1.4 libvob/bench/mark.py:1.5
--- libvob/bench/mark.py:1.4    Fri Apr  4 07:34:59 2003
+++ libvob/bench/mark.py        Mon Apr 14 00:46:28 2003
@@ -4,12 +4,15 @@
 
 """
 
+
+import sys
+sys.path.insert(0, ".")
+import vob
+
 import sys, types, traceback
 
 import java
 
-from org.nongnu import libvob as vob
-
 def dict(d):
     n = {}
     for k in d.keys():
@@ -47,10 +50,15 @@
     win = vob.GraphicsAPI.getInstance().createWindow()
     win.setLocation(0, 0, 1024, 768)
 
+    sx = 0
+    while sx < 1024:
+       vs = win.createVobScene()
+       sx = vs.size.width
+
 
     for ar in _argLists(args):
        vs = win.createVobScene()
-       sceneFunc(vs, **ar)
+       ou = sceneFunc(vs, **ar)
        print ar
        total = 0
        iters = 1
@@ -59,10 +67,10 @@
            total = win.timeRender(vs, 1, iters) 
            ms = total / iters * 1000
            # print "Now: ",iters,total,ms
+       print ou
        print ms, "ms   with ",iters," in ",total,"\n"
 
 if __name__ == "__main__":
-    sys.path.insert(0, ".")
     import getopt
     opts, args = getopt.getopt(sys.argv[1:], 
             vob.util.dbg.short, 
@@ -74,14 +82,14 @@
     # testmod = "bench.vob.text.overhead"
     # testmod = "bench.vob.paper.dice"
     # testmod = "bench.vob.trans.trivial"
-    testmod = "bench.vob."+args[0]
-    exec "import "+testmod+"\ntestmod = "+testmod+"\n"
-
+    testmod = args[0]
     print "TESTMOD: ",testmod
 
 
+
     class Starter(java.lang.Runnable):
         def run(self):
+           exec "import "+testmod+"\ntestmod = "+testmod+"\n"
             try:
                 run(testmod.benchScene, testmod.args)
             except:
Index: libvob/vob/__init__.py
diff -u libvob/vob/__init__.py:1.4 libvob/vob/__init__.py:1.5
--- libvob/vob/__init__.py:1.4  Fri Apr 11 08:51:28 2003
+++ libvob/vob/__init__.py      Mon Apr 14 00:46:28 2003
@@ -1,7 +1,11 @@
 #foo
 
+import vob.gl
+import vob.util
+
 import org.nongnu.libvob as _libvob
 import java as _java
+
 import vob as _vob
 
 for i in dir(_libvob):
@@ -13,5 +17,3 @@
 
 del _vob
 
-import vob.gl
-import vob.util
Index: libvob/vob/util/__init__.py
diff -u libvob/vob/util/__init__.py:1.2 libvob/vob/util/__init__.py:1.3
--- libvob/vob/util/__init__.py:1.2     Thu Apr 10 14:01:15 2003
+++ libvob/vob/util/__init__.py Mon Apr 14 00:46:28 2003
@@ -7,3 +7,6 @@
        setattr(_this, i, getattr(_util, i))
 
 del _this
+
+import vob.util.dbg
+