[Gzz-commits] libvob ./Makefile vob/__init__.py vob/demo/fpfo...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/23 10:30:00

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

Log message:
        Strange problems in running demos

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/Makefile.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/__init__.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/fpfont.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/demo.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: libvob/Makefile
diff -u libvob/Makefile:1.30 libvob/Makefile:1.31
--- libvob/Makefile:1.30        Mon Apr 14 08:12:19 2003
+++ libvob/Makefile     Wed Apr 23 10:30:00 2003
@@ -114,7 +114,7 @@
        $(GLLIB) $(JYTHON) bench/mark.py -Dvob.api=gl $(DBG) $(BENCH)
 
 rundemo::
-       $(GLLIB) $(JYTHON) vob/putil/demo.py $(DBG) $(DEMO)
+       $(GLLIB) $(JYTHON) rundemo.py $(DBG) $(DEMO)
 
 ########################
 # Navidoc targets begin
Index: libvob/vob/__init__.py
diff -u libvob/vob/__init__.py:1.5 libvob/vob/__init__.py:1.6
--- libvob/vob/__init__.py:1.5  Mon Apr 14 00:46:28 2003
+++ libvob/vob/__init__.py      Wed Apr 23 10:30:00 2003
@@ -2,6 +2,7 @@
 
 import vob.gl
 import vob.util
+import vob.putil
 
 import org.nongnu.libvob as _libvob
 import java as _java
Index: libvob/vob/demo/fpfont.py
diff -u libvob/vob/demo/fpfont.py:1.6 libvob/vob/demo/fpfont.py:1.7
--- libvob/vob/demo/fpfont.py:1.6       Thu Apr 17 01:21:40 2003
+++ libvob/vob/demo/fpfont.py   Wed Apr 23 10:30:00 2003
@@ -11,8 +11,8 @@
 import math
 import jarray
 
-if not hasattr(vob.putil.demowindow, "font"):
 
+def init():
     font = GL.createFont(None, 64)
     font2 = GL.createFont(None, 64)
     vob.putil.demowindow.font = font
@@ -84,12 +84,14 @@
 
        fonttexs.append(t)
 
-else:
-    font = vob.putil.demowindow.font
-    font2 = vob.putil.demowindow.font2
-    for i in range(0, font.getNTextures()):
-       t = font.getTexture(i)
-       t.setTexParameter("TEXTURE_2D", "TEXTURE_MIN_FILTER", "NEAREST");
+if not hasattr(vob.putil.demowindow, "font"):
+    init()
+
+font = vob.putil.demowindow.font
+font2 = vob.putil.demowindow.font2
+for i in range(0, font.getNTextures()):
+    t = font.getTexture(i)
+    t.setTexParameter("TEXTURE_2D", "TEXTURE_MIN_FILTER", "NEAREST");
 
 
 args = [ [256, 256, 0, 4, "RGBA", "RGBA", "noise",
Index: libvob/vob/putil/demo.py
diff -u libvob/vob/putil/demo.py:1.3 libvob/vob/putil/demo.py:1.4
--- libvob/vob/putil/demo.py:1.3        Fri Apr 11 08:51:28 2003
+++ libvob/vob/putil/demo.py    Wed Apr 23 10:30:00 2003
@@ -38,10 +38,11 @@
 
 import sys
 import os
+from java.lang import System,Runnable,Throwable
+System.setProperty("vob.api", "gl")
 
 sys.path.insert(0, ".")
 
-from java.lang import System,Runnable,Throwable
 import java
 
 import math
@@ -59,7 +60,6 @@
 
 
 
-System.setProperty("vob.api", "gl")
 
 print "ARGV:",sys.argv
 print "DBG:",dbg.short,dbg.long,dbg.all
@@ -283,8 +283,8 @@
        global w
        w = gfxapi.createWindow()
        w.setLocation(0,0,1024,768)
-       loadScenes()
        scr = vob.Screen(w, b, s)
+       loadScenes()
        vob.AbstractUpdateManager.addWindow(scr)
        vob.AbstractUpdateManager.chg()