diff options
30 files changed, 44 insertions, 61 deletions
diff --git a/cvm-dbg-newt.sh b/cvm-dbg-newt.sh index f6f2c31..6345002 100755 --- a/cvm-dbg-newt.sh +++ b/cvm-dbg-newt.sh @@ -22,5 +22,5 @@ fi # D_ARGS="-Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" D_ARGS="-Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" -$CVM $X_FLAGS -Djava.awt.headless=true $D_ARGS -Dsun.boot.library.path=../jogl/$BUILD_SUBDIR/lib -Xbootclasspath/a:../gluegen/$BUILD_SUBDIR/gluegen-rt-cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/nativewindow/nativewindow.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/jogl/jogl.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/newt/newt.all.cdc.jar -Xbootclasspath/a:$BUILD_SUBDIR/jogl-demos.jar com.jogamp.javafx.newt.util.MainThread $* 2>&1 | tee cvm-dbg-newt.log +$CVM $X_FLAGS -Djava.awt.headless=true $D_ARGS -Dsun.boot.library.path=../jogl/$BUILD_SUBDIR/lib -Xbootclasspath/a:../gluegen/$BUILD_SUBDIR/gluegen-rt-cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/nativewindow/nativewindow.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/jogl/jogl.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/newt/newt.all.cdc.jar -Xbootclasspath/a:$BUILD_SUBDIR/jogl-demos.jar com.jogamp.newt.util.MainThread $* 2>&1 | tee cvm-dbg-newt.log diff --git a/cvm-run-newt.sh b/cvm-run-newt.sh index da26de1..5461573 100755 --- a/cvm-run-newt.sh +++ b/cvm-run-newt.sh @@ -19,4 +19,4 @@ if [ "$1" = "-cpu" ] ; then shift fi -$CVM $X_FLAGS -Djava.awt.headless=true -Dsun.boot.library.path=../jogl/$BUILD_SUBDIR/lib -Xbootclasspath/a:../gluegen/$BUILD_SUBDIR/gluegen-rt-cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/nativewindow/nativewindow.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/jogl/jogl.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/newt/newt.all.cdc.jar -Xbootclasspath/a:$BUILD_SUBDIR/jogl-demos.jar com.jogamp.javafx.newt.util.MainThread $* 2>&1 | tee cvm-run-newt.log +$CVM $X_FLAGS -Djava.awt.headless=true -Dsun.boot.library.path=../jogl/$BUILD_SUBDIR/lib -Xbootclasspath/a:../gluegen/$BUILD_SUBDIR/gluegen-rt-cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/nativewindow/nativewindow.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/jogl/jogl.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/newt/newt.all.cdc.jar -Xbootclasspath/a:$BUILD_SUBDIR/jogl-demos.jar com.jogamp.newt.util.MainThread $* 2>&1 | tee cvm-run-newt.log diff --git a/java-dbg-newt.sh b/java-dbg-newt.sh index 7421d7d..c24987e 100755 --- a/java-dbg-newt.sh +++ b/java-dbg-newt.sh @@ -20,5 +20,5 @@ else X_ARGS="-XstartOnFirstThread" fi - java $X_ARGS -Djava.awt.headless=true $D_ARGS com.jogamp.javafx.newt.util.MainThread $* 2>&1 | tee java-dbg-newt.log + java $X_ARGS -Djava.awt.headless=true $D_ARGS com.jogamp.newt.util.MainThread $* 2>&1 | tee java-dbg-newt.log fi diff --git a/java-run-newt.sh b/java-run-newt.sh index 0739d85..14069af 100755 --- a/java-run-newt.sh +++ b/java-run-newt.sh @@ -18,5 +18,5 @@ else X_ARGS="-XstartOnFirstThread" fi - java $X_ARGS -Djava.awt.headless=true com.jogamp.javafx.newt.util.MainThread $* 2>&1 | tee java-run-newt.log + java $X_ARGS -Djava.awt.headless=true com.jogamp.newt.util.MainThread $* 2>&1 | tee java-run-newt.log fi diff --git a/setenv-jogl.sh b/setenv-jogl.sh index 8c7e8d4..27a76cf 100644 --- a/setenv-jogl.sh +++ b/setenv-jogl.sh @@ -93,7 +93,7 @@ export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR echo CLASSPATH: $CLASSPATH echo echo MacOSX REMEMBER to add the JVM arguments "-XstartOnFirstThread -Djava.awt.headless=true" for running demos without AWT, e.g. NEWT -echo MacOSX REMEMBER to add the JVM arguments "-XstartOnFirstThread -Djava.awt.headless=true com.jogamp.javafx.newt.util.MainThread" for running demos with NEWT +echo MacOSX REMEMBER to add the JVM arguments "-XstartOnFirstThread -Djava.awt.headless=true com.jogamp.newt.util.MainThread" for running demos with NEWT PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH export PATH diff --git a/src/demos/GLInfo.java b/src/demos/GLInfo.java index e4c0892..c873a54 100755 --- a/src/demos/GLInfo.java +++ b/src/demos/GLInfo.java @@ -1,12 +1,10 @@ package demos; -import java.nio.*; import javax.media.opengl.*; -import javax.media.opengl.glu.*; import javax.media.nativewindow.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; +import com.jogamp.newt.*; +import com.jogamp.newt.opengl.*; public class GLInfo extends Thread implements GLEventListener { diff --git a/src/demos/GLNewtRun.java b/src/demos/GLNewtRun.java index d8d2f73..b774983 100755 --- a/src/demos/GLNewtRun.java +++ b/src/demos/GLNewtRun.java @@ -1,13 +1,12 @@ package demos; -import java.util.*; import java.lang.reflect.*; import javax.media.opengl.*; import javax.media.nativewindow.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; +import com.jogamp.newt.*; +import com.jogamp.newt.opengl.*; public class GLNewtRun implements WindowListener, KeyListener, MouseListener { diff --git a/src/demos/applets/JOGLNewtApplet1Run.java b/src/demos/applets/JOGLNewtApplet1Run.java index c53f5d4..9496155 100755 --- a/src/demos/applets/JOGLNewtApplet1Run.java +++ b/src/demos/applets/JOGLNewtApplet1Run.java @@ -8,8 +8,7 @@ import java.awt.event.KeyListener; import javax.media.opengl.*; import javax.media.nativewindow.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; +import com.jogamp.newt.*; /** Shows how to deploy an applet using JOGL. This demo must be referenced from a web page via an <applet> tag. */ diff --git a/src/demos/applets/JOGLNewtAppletBase.java b/src/demos/applets/JOGLNewtAppletBase.java index 6cd9ec9..961ccfd 100755 --- a/src/demos/applets/JOGLNewtAppletBase.java +++ b/src/demos/applets/JOGLNewtAppletBase.java @@ -1,10 +1,9 @@ package demos.applets; -import java.util.*; import java.lang.reflect.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.GLWindow; +import com.jogamp.newt.*; +import com.jogamp.newt.opengl.GLWindow; import javax.media.opengl.*; import com.jogamp.opengl.util.*; diff --git a/src/demos/es1/Info.java b/src/demos/es1/Info.java index a1023a1..9322862 100755 --- a/src/demos/es1/Info.java +++ b/src/demos/es1/Info.java @@ -1,12 +1,10 @@ package demos.es1; -import java.nio.*; import javax.media.opengl.*; -import javax.media.opengl.glu.*; import javax.media.nativewindow.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; +import com.jogamp.newt.*; +import com.jogamp.newt.opengl.*; public class Info implements GLEventListener { diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java index d712147..d391442 100755 --- a/src/demos/es1/RedSquare.java +++ b/src/demos/es1/RedSquare.java @@ -9,8 +9,8 @@ import javax.media.nativewindow.*; import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.glsl.fixedfunc.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; +import com.jogamp.newt.*; +import com.jogamp.newt.opengl.*; public class RedSquare extends Thread implements WindowListener, KeyListener, MouseListener, GLEventListener { diff --git a/src/demos/es1/angeles/Main.java b/src/demos/es1/angeles/Main.java index 01c78ba..35da6e1 100755 --- a/src/demos/es1/angeles/Main.java +++ b/src/demos/es1/angeles/Main.java @@ -1,10 +1,9 @@ package demos.es1.angeles; -import java.nio.*; import javax.media.opengl.*; import javax.media.nativewindow.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; +import com.jogamp.newt.*; +import com.jogamp.newt.opengl.*; public class Main implements WindowListener, MouseListener { diff --git a/src/demos/es1/cube/Cube.java b/src/demos/es1/cube/Cube.java index 7aadecb..198bba8 100644 --- a/src/demos/es1/cube/Cube.java +++ b/src/demos/es1/cube/Cube.java @@ -39,8 +39,8 @@ import javax.media.nativewindow.*; import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.glsl.fixedfunc.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; +import com.jogamp.newt.*; +import com.jogamp.newt.opengl.*; public class Cube implements GLEventListener { public boolean glDebug = false ; diff --git a/src/demos/es1/cube/CubeImmModeSink.java b/src/demos/es1/cube/CubeImmModeSink.java index 79c1fd6..fccbb5a 100644 --- a/src/demos/es1/cube/CubeImmModeSink.java +++ b/src/demos/es1/cube/CubeImmModeSink.java @@ -38,8 +38,8 @@ import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.glsl.fixedfunc.*; import java.nio.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; +import com.jogamp.newt.*; +import com.jogamp.newt.opengl.*; public class CubeImmModeSink implements GLEventListener { boolean quit = false; diff --git a/src/demos/es1/cubefbo/Main.java b/src/demos/es1/cubefbo/Main.java index e95be25..4b23513 100755 --- a/src/demos/es1/cubefbo/Main.java +++ b/src/demos/es1/cubefbo/Main.java @@ -1,10 +1,9 @@ package demos.es1.cubefbo; -import java.nio.*; import javax.media.opengl.*; import javax.media.nativewindow.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; +import com.jogamp.newt.*; +import com.jogamp.newt.opengl.*; public class Main implements WindowListener, MouseListener { diff --git a/src/demos/es2/RedSquare.java b/src/demos/es2/RedSquare.java index 0e7a27c..59dec30 100755 --- a/src/demos/es2/RedSquare.java +++ b/src/demos/es2/RedSquare.java @@ -8,8 +8,8 @@ import javax.media.nativewindow.*; import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.glsl.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; +import com.jogamp.newt.*; +import com.jogamp.newt.opengl.*; public class RedSquare extends Thread implements WindowListener, KeyListener, MouseListener, GLEventListener { diff --git a/src/demos/es2/openmax/Cube.java b/src/demos/es2/openmax/Cube.java index 2337d16..49c8a31 100644 --- a/src/demos/es2/openmax/Cube.java +++ b/src/demos/es2/openmax/Cube.java @@ -39,8 +39,8 @@ import javax.media.nativewindow.*; import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.glsl.fixedfunc.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; +import com.jogamp.newt.*; +import com.jogamp.newt.opengl.*; public class Cube implements GLEventListener { boolean quit = false; diff --git a/src/demos/es2/openmax/MovieCube.java b/src/demos/es2/openmax/MovieCube.java index c8ac4cc..f59bea2 100755 --- a/src/demos/es2/openmax/MovieCube.java +++ b/src/demos/es2/openmax/MovieCube.java @@ -40,11 +40,10 @@ import com.jogamp.opengl.util.glsl.fixedfunc.*; import com.jogamp.openmax.*; -import java.nio.*; import java.net.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; +import com.jogamp.newt.*; +import com.jogamp.newt.opengl.*; public class MovieCube implements MouseListener, GLEventListener, OMXEventListener { GLWindow window; diff --git a/src/demos/es2/openmax/MovieSimple.java b/src/demos/es2/openmax/MovieSimple.java index 13d09fe..b702699 100755 --- a/src/demos/es2/openmax/MovieSimple.java +++ b/src/demos/es2/openmax/MovieSimple.java @@ -44,8 +44,8 @@ import com.jogamp.openmax.*; import java.nio.*; import java.net.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; +import com.jogamp.newt.*; +import com.jogamp.newt.opengl.*; public class MovieSimple implements MouseListener, GLEventListener, OMXEventListener { private GLWindow window; diff --git a/src/demos/es2/perftst/PerfTextLoad.java b/src/demos/es2/perftst/PerfTextLoad.java index a08f4d9..30f0ad7 100755 --- a/src/demos/es2/perftst/PerfTextLoad.java +++ b/src/demos/es2/perftst/PerfTextLoad.java @@ -7,8 +7,8 @@ import javax.media.opengl.*; import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.texture.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; +import com.jogamp.newt.*; +import com.jogamp.newt.opengl.*; public class PerfTextLoad extends PerfModule { static final int MAX_TEXTURE_ENGINES = 8; diff --git a/src/demos/es2/perftst/PerfUniLoad.java b/src/demos/es2/perftst/PerfUniLoad.java index b2af9cb..7cf32a2 100755 --- a/src/demos/es2/perftst/PerfUniLoad.java +++ b/src/demos/es2/perftst/PerfUniLoad.java @@ -4,8 +4,6 @@ import java.nio.*; import javax.media.opengl.*; import com.jogamp.opengl.util.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; public class PerfUniLoad extends PerfModule { static final int MAX_ARRAYS = 12; diff --git a/src/demos/es2/perftst/PerfVBOLoad.java b/src/demos/es2/perftst/PerfVBOLoad.java index 5563ea8..d0b4a1d 100755 --- a/src/demos/es2/perftst/PerfVBOLoad.java +++ b/src/demos/es2/perftst/PerfVBOLoad.java @@ -4,8 +4,6 @@ import java.nio.*; import javax.media.opengl.*; import com.jogamp.opengl.util.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; public class PerfVBOLoad extends PerfModule { diff --git a/src/demos/es2/perftst/Perftst.java b/src/demos/es2/perftst/Perftst.java index b0b8cdc..5b090cd 100755 --- a/src/demos/es2/perftst/Perftst.java +++ b/src/demos/es2/perftst/Perftst.java @@ -1,14 +1,13 @@ package demos.es2.perftst; -import java.nio.*; import javax.media.opengl.*; import javax.media.nativewindow.*; import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.glsl.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; +import com.jogamp.newt.*; +import com.jogamp.newt.opengl.*; public class Perftst implements MouseListener, GLEventListener { diff --git a/src/demos/newt/NEWTTest1.java b/src/demos/newt/NEWTTest1.java index 37ed038..59f6051 100644 --- a/src/demos/newt/NEWTTest1.java +++ b/src/demos/newt/NEWTTest1.java @@ -1,7 +1,7 @@ package demos.newt; import javax.media.nativewindow.*; -import com.jogamp.javafx.newt.*; +import com.jogamp.newt.*; public class NEWTTest1 implements WindowListener, KeyListener, MouseListener { diff --git a/src/demos/newt/TaskManagerTest1.java b/src/demos/newt/TaskManagerTest1.java index 3dd7ffd..5743537 100644 --- a/src/demos/newt/TaskManagerTest1.java +++ b/src/demos/newt/TaskManagerTest1.java @@ -1,7 +1,7 @@ package demos.newt; import javax.media.nativewindow.*; -import com.jogamp.javafx.newt.*; +import com.jogamp.newt.*; import demos.newt.util.TaskManager; public class TaskManagerTest1 implements WindowListener, KeyListener, MouseListener diff --git a/src/demos/newt/TaskManagerTest2.java b/src/demos/newt/TaskManagerTest2.java index 160651c..62a9cee 100644 --- a/src/demos/newt/TaskManagerTest2.java +++ b/src/demos/newt/TaskManagerTest2.java @@ -1,7 +1,7 @@ package demos.newt; import javax.media.nativewindow.*; -import com.jogamp.javafx.newt.*; +import com.jogamp.newt.*; import demos.newt.util.TaskToolWM; public class TaskManagerTest2 implements WindowListener, KeyListener, MouseListener diff --git a/src/demos/newt/util/TaskToolWM.java b/src/demos/newt/util/TaskToolWM.java index 2f312f6..6ecdaff 100644 --- a/src/demos/newt/util/TaskToolWM.java +++ b/src/demos/newt/util/TaskToolWM.java @@ -38,8 +38,7 @@ package demos.newt.util; import java.util.*; -import javax.media.nativewindow.*; -import com.jogamp.javafx.newt.*; +import com.jogamp.newt.*; public class TaskToolWM { final static boolean externalStimuli; diff --git a/src/demos/readbuffer/Main.java b/src/demos/readbuffer/Main.java index 0757230..c6ecefa 100755 --- a/src/demos/readbuffer/Main.java +++ b/src/demos/readbuffer/Main.java @@ -1,11 +1,10 @@ package demos.readbuffer; import java.lang.reflect.*; -import java.nio.*; import javax.media.opengl.*; import javax.media.nativewindow.*; -import com.jogamp.javafx.newt.*; -import com.jogamp.javafx.newt.opengl.*; +import com.jogamp.newt.*; +import com.jogamp.newt.opengl.*; public class Main implements WindowListener, MouseListener, SurfaceUpdatedListener { diff --git a/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java b/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java index 8ce5777..ec58929 100644 --- a/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java +++ b/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java @@ -48,7 +48,7 @@ import javax.media.opengl.*; import javax.media.opengl.glu.*; import java.nio.*; -import com.jogamp.javafx.newt.*; +import com.jogamp.newt.*; /** * diff --git a/src/jbullet/src/javabullet/demos/opengl/JOGL.java b/src/jbullet/src/javabullet/demos/opengl/JOGL.java index 723cf16..aeececb 100644 --- a/src/jbullet/src/javabullet/demos/opengl/JOGL.java +++ b/src/jbullet/src/javabullet/demos/opengl/JOGL.java @@ -23,7 +23,7 @@ package javabullet.demos.opengl; -import com.jogamp.javafx.newt.*; +import com.jogamp.newt.*; import javax.media.nativewindow.*; import javax.media.opengl.*; import javax.media.opengl.glu.*; |