[Gzz-commits] libvob/vob __init__.py demo/fpfont.py putil/dem...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/11 08:51:29

Modified files:
        vob            : __init__.py 
        vob/demo       : fpfont.py 
        vob/putil      : demo.py misc.py 

Log message:
        Fixing demos

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/__init__.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/fpfont.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/demo.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/misc.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: libvob/vob/__init__.py
diff -u libvob/vob/__init__.py:1.3 libvob/vob/__init__.py:1.4
--- libvob/vob/__init__.py:1.3  Fri Apr 11 08:43:37 2003
+++ libvob/vob/__init__.py      Fri Apr 11 08:51:28 2003
@@ -9,6 +9,7 @@
        setattr(_vob, i, getattr(_libvob, i))
 
 view = _libvob.view
+impl = _libvob.impl
 
 del _vob
 
Index: libvob/vob/demo/fpfont.py
diff -u libvob/vob/demo/fpfont.py:1.1 libvob/vob/demo/fpfont.py:1.2
--- libvob/vob/demo/fpfont.py:1.1       Thu Apr 10 10:00:19 2003
+++ libvob/vob/demo/fpfont.py   Fri Apr 11 08:51:28 2003
@@ -1,7 +1,9 @@
-from org.nongnu import libvob as vob
+import vob
 from org.nongnu.libvob.gl import GL
-from org.nongnu.libvob.putil.misc import *
-from org.nongnu.libvob.putil.demokeys import *
+from vob.putil.misc import *
+from vob.putil.demokeys import *
+
+from vob.paper.texcache import getCachedTexture
 
 vob.AbstractUpdateManager.defaultAnimationTime = 10000
 
@@ -75,7 +77,6 @@
        t = font.getTexture(i)
        t.setTexParameter("TEXTURE_2D", "TEXTURE_MIN_FILTER", "NEAREST");
 
-from org.nongnu.libvob.paper.texcache import getCachedTexture
 
 args = [ [256, 256, 0, 4, "RGBA", "RGBA", "noise",
           ["bias", ".5", "scale", "1.0", "type", "faBm", "freq", "10"]],
Index: libvob/vob/putil/demo.py
diff -u libvob/vob/putil/demo.py:1.2 libvob/vob/putil/demo.py:1.3
--- libvob/vob/putil/demo.py:1.2        Fri Apr 11 08:38:48 2003
+++ libvob/vob/putil/demo.py    Fri Apr 11 08:51:28 2003
@@ -48,9 +48,12 @@
 import getopt
 import traceback
 
-import org.nongnu.libvob as vob
+import vob
+
+import vob.putil.reloader
 
 from org.nongnu.libvob.gl import GL, GLRen, GLCache
+
 from vob.putil.misc import *
 from vob.putil import dbg
 
@@ -106,6 +109,7 @@
     currentScene = None
 
     if 1:
+       print "VOB: ",vob
        vob.putil.reloader.reloadModules()
     try:
        vob.putil.demowindow.w = w
@@ -176,6 +180,7 @@
 
 showHelp = 0
 
+
 class Bindings(vob.AbstractBinder):
     def keystroke(self, s):
        global showHelp, currentScene
@@ -286,8 +291,8 @@
 
 scenefile = args[0]
 
+
 gfxapi = vob.GraphicsAPI.getInstance()
 gfxapi.startUpdateManager(Main())
-
 
 
Index: libvob/vob/putil/misc.py
diff -u libvob/vob/putil/misc.py:1.1 libvob/vob/putil/misc.py:1.2
--- libvob/vob/putil/misc.py:1.1        Thu Apr 10 10:00:19 2003
+++ libvob/vob/putil/misc.py    Fri Apr 11 08:51:28 2003
@@ -22,7 +22,7 @@
 
 import java
 
-import org.nongnu.libvob as vob
+import vob
 from org.nongnu.libvob.gl import GL, GLRen, GLCache
 
 def background(rgb):