[Gzz-commits] fenfire ./build.xml org/fenfire/loom/Loom.java

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/26 06:49:49

Modified files:
        .              : build.xml 
        org/fenfire/loom: Loom.java 

Log message:
        Make almost run with GL

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/build.xml.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/Loom.java.diff?tr1=1.44&tr2=1.45&r1=text&r2=text

Patches:
Index: fenfire/build.xml
diff -u fenfire/build.xml:1.18 fenfire/build.xml:1.19
--- fenfire/build.xml:1.18      Tue Mar 25 13:33:38 2003
+++ fenfire/build.xml   Wed Mar 26 06:49:49 2003
@@ -58,6 +58,7 @@
     <target name="rungl">
         <java classname="org.fenfire.loom.Loom" fork="true">
            <sysproperty key="vob.api" value="gl"/> 
+           <env key="LD_LIBRARY_PATH" value="../libvob/src/jni"/>
            <arg value="${file}"/>
            <classpath refid="theClassPath"/>
        </java>
@@ -124,6 +125,10 @@
        </delete>
     </target>
 
+    <target name="tags">
+       <exec command="ctags -R"/>
+    </target>
+
     <path id="theClassPath">
        <path refid="develPath"/>
     </path>
@@ -143,6 +148,7 @@
        <pathelement location="../libvob/CLASSES"/>
        <path refid="depends.path"/>
     </path>
+
 
     <!-- The path of the .jars in depends. Used as a "subroutine"
        by the real paths.
Index: fenfire/org/fenfire/loom/Loom.java
diff -u fenfire/org/fenfire/loom/Loom.java:1.44 
fenfire/org/fenfire/loom/Loom.java:1.45
--- fenfire/org/fenfire/loom/Loom.java:1.44     Sat Mar 22 16:04:43 2003
+++ fenfire/org/fenfire/loom/Loom.java  Wed Mar 26 06:49:49 2003
@@ -157,8 +157,6 @@
 
        final GraphicsAPI api = GraphicsAPI.getInstance();
 
-       nodeView = new DefaultNodeView(this);
-       view = new ViewSettings(nodeView);
        final Shower s = new Shower() {
                Screen screen;
                public void setScreen(Screen s) {
@@ -167,7 +165,7 @@
                public VobScene generate() {
                    VobScene old = this.screen.getVobSceneForEvents();
                    VobScene sc = this.screen.window.createVobScene();
-                   sc.map.put(new SolidBackdropVob(colors.getBg()), 0);
+                   sc.map.put(new SolidBackdropVob(colors.getBg()));
 
                    if(model == null) return sc;
 
@@ -201,9 +199,16 @@
 
        api.startUpdateManager(new Runnable() {
                public void run() {
+                   nodeView = new DefaultNodeView(Loom.this);
+                   view = new ViewSettings(nodeView);
                    Screen scr = new Screen(api.createWindow(), b, s);
-                   frame = ((org.nongnu.libvob.impl.awt.FrameScreen)scr.window)
-                       .getFrame();
+                   if(scr.window instanceof 
org.nongnu.libvob.impl.awt.FrameScreen) {
+                       frame = 
((org.nongnu.libvob.impl.awt.FrameScreen)scr.window)
+                           .getFrame();
+                   } else {
+                       frame = new Frame("FF");
+                       frame.show();
+                   }
                    frame.setTitle("Fenfire Loom");
                    msgBox = new org.fenfire.util.MsgBox(frame);