diff options
| -rwxr-xr-x | java-dbg-newt.sh | 3 | ||||
| -rw-r--r-- | make/make.jogl.all.x86_64.sh | 2 | ||||
| -rwxr-xr-x | src/demos/es1/RedSquare.java | 9 | ||||
| -rwxr-xr-x | src/demos/es2/RedSquare.java | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/java-dbg-newt.sh b/java-dbg-newt.sh index 68a0685..4d208bc 100755 --- a/java-dbg-newt.sh +++ b/java-dbg-newt.sh @@ -15,7 +15,8 @@ if [ $CPOK -eq 0 ] ; then echo No JOGL in CLASSPATH else # D_ARGS="-Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" - D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.debug.GLSLState" + # D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.debug.GLSLState" + D_ARGS="-Dnativewindow.debug=all -Dnewt.debug=all" #D_ARGS="-Dnativewindow.debug.X11Util=true -Djogl.debug.GLDrawableFactory=true" #D_ARGS="-Dnativewindow.debug.X11Util=true" if [ $MOSX -eq 1 ] ; then diff --git a/make/make.jogl.all.x86_64.sh b/make/make.jogl.all.x86_64.sh index 6607848..4fc7641 100644 --- a/make/make.jogl.all.x86_64.sh +++ b/make/make.jogl.all.x86_64.sh @@ -5,8 +5,10 @@ # -Dc.compiler.debug=true # -Djogl.cg=1 \ # -Djogl.redbook=true \ +# -DskipSourceZIP=true ant \ + -DskipSourceZIP=true \ -Djogl.cg=1 \ -Duser.swt.jar=$HOME/.java/swt-3.5.2-gtk-linux-x86_64.jar \ -Drootrel.build=build-x86_64 \ diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java index 9f810d4..91534a7 100755 --- a/src/demos/es1/RedSquare.java +++ b/src/demos/es1/RedSquare.java @@ -174,7 +174,7 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo } window = null; if(null!=nWindow) { - nWindow.destroy(); + nWindow.destroy(true); nWindow=null; } System.out.println("SHUTDOWN "+Thread.currentThread()+" FIN"); @@ -349,6 +349,7 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo NewtFactory.setUseEDT(useEDT); // true is the default + System.out.println(Thread.currentThread()+" RedSquare.main: Start - oneThread: "+oneThread); if(!oneThread) { for(Iterator i = threads.iterator(); i.hasNext(); ) { ((Thread)i.next()).start(); @@ -356,6 +357,7 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo boolean done = false; + int lastAliveCount = 0; while(!done) { int aliveCount = 0; for(Iterator i = threads.iterator(); i.hasNext(); ) { @@ -366,6 +368,10 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo aliveCount++; } } + if(lastAliveCount != aliveCount) { + System.out.println(Thread.currentThread()+" RedSquare.main: alive changed: "+lastAliveCount+" -> "+aliveCount); + } + lastAliveCount = aliveCount; done = 0==aliveCount ; } } else { @@ -385,5 +391,6 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo } } } + System.out.println(Thread.currentThread()+" RedSquare.main: FIN"); } } diff --git a/src/demos/es2/RedSquare.java b/src/demos/es2/RedSquare.java index 2099fd0..975a3f9 100755 --- a/src/demos/es2/RedSquare.java +++ b/src/demos/es2/RedSquare.java @@ -149,7 +149,7 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo } window = null; if(null!=nWindow) { - nWindow.destroy(); + nWindow.destroy(true); nWindow=null; } System.out.println("SHUTDOWN "+Thread.currentThread()+" cleanly"); |