[ff-cvs] libvob ./rundemo.py org/nongnu/libvob/gl/GL.jav...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/09/21 09:35:06

Modified files:
        .              : rundemo.py 
        org/nongnu/libvob/gl: GL.java 
        src/jni        : Main.cxx 
        vob/putil      : demo.py 

Log message:
        Arch sync

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/rundemo.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/gl/GL.java.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Main.cxx.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/demo.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/gl/GL.java
diff -u libvob/org/nongnu/libvob/gl/GL.java:1.22 
libvob/org/nongnu/libvob/gl/GL.java:1.23
--- libvob/org/nongnu/libvob/gl/GL.java:1.22    Sat Aug  2 05:07:11 2003
+++ libvob/org/nongnu/libvob/gl/GL.java Sun Sep 21 09:35:06 2003
@@ -876,17 +876,14 @@
     /** CallGL the given string.
      * Useful for throwaway things such as setting texture parameters.
      */
-    public static void call(String s) {
-       DisplayList dl = createDisplayList(s);
-       dl.call();
-    }
+    public static native void call(String s) ;
 
     /** CallGL the given string in the given window.
      */
     public static void call(String s, Window w) {
-       DisplayList dl = createDisplayList(s);
-       dl.call(w);
+       call(s, w.getId());
     }
+    private static native void call(String s, int id) ;
 
     public static void render(
                RenderingSurface win, 
Index: libvob/rundemo.py
diff -u libvob/rundemo.py:1.5 libvob/rundemo.py:1.6
--- libvob/rundemo.py:1.5       Wed Jun 11 13:49:03 2003
+++ libvob/rundemo.py   Sun Sep 21 09:35:06 2003
@@ -22,5 +22,8 @@
 # Script to get the demo module correctly into a module.
 
 import vob.putil.demo
+
+vob.putil.demo.run()
+
 import vob.putil.demowindow
 import vob.putil.demokeys
Index: libvob/src/jni/Main.cxx
diff -u libvob/src/jni/Main.cxx:1.23 libvob/src/jni/Main.cxx:1.24
--- libvob/src/jni/Main.cxx:1.23        Thu Sep 11 13:24:44 2003
+++ libvob/src/jni/Main.cxx     Sun Sep 21 09:35:06 2003
@@ -696,6 +696,26 @@
       return 1;
   }
 
+// Real program immediate execution
+
+jf(void, call)
+  (JNIEnv *env, jclass, jstring code, jint window) {
+      std::string utf = jstr2stdstr(env, code);
+      DBG(dbg) << "got str\n";
+      setWindow(window);
+      CallGL::callGL(utf.c_str());
+      releaseWindow();
+      DBG(dbg) << "called\n";
+  }
+
+jf(void, call0)
+  (JNIEnv *env, jclass, jstring code) {
+      std::string utf = jstr2stdstr(env, code);
+      DBG(dbg) << "got str\n";
+      CallGL::callGL(utf.c_str());
+      DBG(dbg) << "called\n";
+  }
+
 
 // DisplayList
 
@@ -734,7 +754,7 @@
   (JNIEnv *env, jclass, jint l, jstring s) {
       std::string utf = jstr2stdstr(env, s);
       DBG(dbg) << "got str\n";
-      CallGL::callGL(utf.c_str(), l);
+      CallGL::compileGL(utf.c_str(), l);
       DBG(dbg) << "called\n";
   }
 
Index: libvob/vob/putil/demo.py
diff -u libvob/vob/putil/demo.py:1.24 libvob/vob/putil/demo.py:1.25
--- libvob/vob/putil/demo.py:1.24       Sun Sep 14 04:57:20 2003
+++ libvob/vob/putil/demo.py    Sun Sep 21 09:35:06 2003
@@ -292,7 +292,6 @@
 #    global replacingScene
 #    vob.AbstractUpdateManager.setNoAnimation()
 #    replacingScene = vs
-    
 
 class Main(Runnable):
     def run(self):
@@ -308,12 +307,13 @@
        loadScenes()
        vob.AbstractUpdateManager.addWindow(scr)
        vob.AbstractUpdateManager.chg()
-       
-
-scenefile = args[0]
 
+def run():
+    global gfxapi
+    gfxapi = vob.GraphicsAPI.getInstance()
+    gfxapi.startUpdateManager(Main())
 
-gfxapi = vob.GraphicsAPI.getInstance()
-gfxapi.startUpdateManager(Main())
-
+scenefile = args[0]
 
+if __name__ == "__main__":
+    run()