Fix windows start scripts (CVM/J2SE)

6 files changed, 61 insertions, 54 deletions

diff --git a/cvm-win32-newt-dbg.bat b/cvm-win32-newt-dbg.bat
index 15fce05..fdfb963 100755
--- a/cvm-win32-newt-dbg.bat
+++ b/cvm-win32-newt-dbg.bat
@@ -1,8 +1,8 @@
-
-set CVM_HOME=c:\cvm
-
-set JAR_DIR=jogl\lib
-set LIB_DIR=jogl\lib
-
-%CVM_HOME%\bin\cvm "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dnewt.debug=all" "-Djava.awt.headless=true" "-Dsun.boot.library.path=%LIB_DIR%" "-Xbootclasspath/a:%JAR_DIR%\gluegen-rt-cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\nativewindow.all.cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\jogl.all.cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\newt.all.cdc.jar" "-Xbootclasspath/a:jogl-demos.jar" %1 %2 %3 %4 > cvm-win32-newt-dbg.log 2>&1
-
+

+set CVM_HOME=c:\cvm

+

+set JAR_DIR=jogl\lib

+set LIB_DIR=jogl\lib

+

+%CVM_HOME%\bin\cvm "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dnewt.debug=all" "-Djava.awt.headless=true" "-Dsun.boot.library.path=%LIB_DIR%" "-Xbootclasspath/a:%JAR_DIR%\gluegen-rt-cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\nativewindow.all.cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\jogl.all.cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\newt.all.cdc.jar" "-Xbootclasspath/a:jogl-demos.jar" %1 %2 %3 %4 > cvm-win32-newt-dbg.log 2>&1

+

diff --git a/cvm-win32-newt.bat b/cvm-win32-newt.bat
index 4046700..017c0f0 100755
--- a/cvm-win32-newt.bat
+++ b/cvm-win32-newt.bat
@@ -1,8 +1,8 @@
-
-set CVM_HOME=c:\cvm
-
-set JAR_DIR=jogl\lib
-set LIB_DIR=jogl\lib
-
-%CVM_HOME%\bin\cvm "-Djava.awt.headless=true" "-Dsun.boot.library.path=%LIB_DIR%" "-Xbootclasspath/a:%JAR_DIR%\gluegen-rt-cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\nativewindow.all.cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\jogl.all.cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\newt.all.cdc.jar" "-Xbootclasspath/a:jogl-demos.jar" %1 %2 %3 %4 > cvm-win32-newt.log 2>&1
-
+

+set CVM_HOME=c:\cvm

+

+set JAR_DIR=jogl\lib

+set LIB_DIR=jogl\lib

+

+%CVM_HOME%\bin\cvm "-Djava.awt.headless=true" "-Dsun.boot.library.path=%LIB_DIR%" "-Xbootclasspath/a:%JAR_DIR%\gluegen-rt-cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\nativewindow.all.cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\jogl.all.cdc.jar" "-Xbootclasspath/a:%JAR_DIR%\newt.all.cdc.jar" "-Xbootclasspath/a:jogl-demos.jar" %1 %2 %3 %4 > cvm-win32-newt.log 2>&1

+

diff --git a/java-win32-dbg.bat b/java-win32-dbg.bat
index b14a238..ed75c5f 100644
--- a/java-win32-dbg.bat
+++ b/java-win32-dbg.bat
@@ -1,17 +1,14 @@
-
-set J2RE_HOME=c:\jre6
-set JAVA_HOME=c:\jdk6
-
-set JAR_DIR=jogl\lib
-set LIB_DIR=jogl\lib
-
-set PATH=%J2RE_HOME%\bin;%LIB_DIR%;%PATH%
-set CLASSPATH=.;%JAR_DIR%\jogl.all.jar;%JAR_DIR%\nativewindow.all.jar;%JAR_DIR%\newt.all.jar;%JAR_DIR%\gluegen-rt.jar;jogl-demos.jar;jogl-demos-util.jar;jogl-demos-data.jar
-
-echo CLASSPATH %CLASSPATH%
-
-echo PATH %PATH%
-
-java "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dnewt.debug=all" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" "-Djava.library.path=%LIB_DIR%" %1 %2 %3 %4 > java-win32-dbg.log 2>&1
-
-
+

+set J2RE_HOME=c:\jre6

+set JAVA_HOME=c:\jdk6

+

+set JAR_DIR=jogl\lib

+set LIB_DIR=jogl\lib

+

+set CP_ALL=.;%JAR_DIR%\jogl.all.jar;%JAR_DIR%\nativewindow.all.jar;%JAR_DIR%\newt.all.jar;%JAR_DIR%\gluegen-rt.jar;jogl-demos.jar;jogl-demos-util.jar;jogl-demos-data.jar

+

+echo CP_ALL %CP_ALL%

+

+%J2RE_HOME%\bin\java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dnewt.debug=all" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 > java-win32-dbg.log 2>&1

+

+

diff --git a/java-win32.bat b/java-win32.bat
index af7413e..4fd603c 100644
--- a/java-win32.bat
+++ b/java-win32.bat
@@ -1,17 +1,14 @@
-
-set J2RE_HOME=c:\jre6
-set JAVA_HOME=c:\jdk6
-
-set JAR_DIR=jogl\lib
-set LIB_DIR=jogl\lib
-
-set PATH=%J2RE_HOME%\bin;%LIB_DIR%;%PATH%
-set CLASSPATH=.;%JAR_DIR%\jogl.all.jar;%JAR_DIR%\nativewindow.all.jar;%JAR_DIR%\newt.all.jar;%JAR_DIR%\gluegen-rt.jar;jogl-demos.jar;jogl-demos-util.jar;jogl-demos-data.jar
-
-echo CLASSPATH %CLASSPATH%
-
-echo PATH %PATH%
-
-java "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" "-Djava.library.path=%LIB_DIR%" %1 %2 %3 %4 > java-win32.log 2>&1
-
-
+

+set J2RE_HOME=c:\jre6

+set JAVA_HOME=c:\jdk6

+

+set JAR_DIR=jogl\lib

+set LIB_DIR=jogl\lib

+

+set CP_ALL=.;%JAR_DIR%\jogl.all.jar;%JAR_DIR%\nativewindow.all.jar;%JAR_DIR%\newt.all.jar;%JAR_DIR%\gluegen-rt.jar;jogl-demos.jar;jogl-demos-util.jar;jogl-demos-data.jar

+

+echo CP_ALL %CP_ALL%

+

+%J2RE_HOME%\bin\java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 > java-win32.log 2>&1

+

+

diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java
index 8931b6c..17dd69e 100755
--- a/src/demos/es1/RedSquare.java
+++ b/src/demos/es1/RedSquare.java
@@ -168,6 +168,8 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
             gl.setSwapInterval(swapInterval);
         }
 
+        glu = GLU.createGLU();
+
         System.err.println(glp+" Entering initialization");
         System.err.println(glp+" GL Profile: "+gl.getGLProfile());
         System.err.println(glp+" GL:" + gl);
@@ -175,8 +177,7 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
         System.err.println(glp+" GL_EXTENSIONS:");
         System.err.println(glp+"   " + gl.glGetString(gl.GL_EXTENSIONS));
         System.err.println(glp+" swapInterval: " + swapInterval + " (GL: "+gl.getSwapInterval()+")");
-
-        glu = GLU.createGLU();
+        System.err.println(glp+" GLU: " + glu);
 
         // Allocate vertex arrays
         colors   = BufferUtil.newFloatBuffer(16);
diff --git a/src/demos/es2/RedSquare.java b/src/demos/es2/RedSquare.java
index 5c74a4e..8b23ddc 100755
--- a/src/demos/es2/RedSquare.java
+++ b/src/demos/es2/RedSquare.java
@@ -183,6 +183,8 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
             gl.setSwapInterval(swapInterval);
         }
 
+        glu = GLU.createGLU();
+
         System.err.println(glp+" Entering initialization");
         System.err.println(glp+" GL Profile: "+gl.getGLProfile());
         System.err.println(glp+" GL:" + gl);
@@ -190,8 +192,18 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
         System.err.println(glp+" GL_EXTENSIONS:");
         System.err.println(glp+"   " + gl.glGetString(gl.GL_EXTENSIONS));
         System.err.println(glp+" swapInterval: " + swapInterval + " (GL: "+gl.getSwapInterval()+")");
-
-        glu = GLU.createGLU();
+        System.err.println(glp+" GLU: " + glu);
+
+        /***
+        // Debug ..
+        DebugGL2ES2 gldbg = new DebugGL2ES2(gl);
+        gl.getContext().setGL(gldbg);
+        gl = gldbg;
+
+        // Trace ..
+        TraceGL2ES2 gltrace = new TraceGL2ES2(gl, System.err);
+        gl.getContext().setGL(gltrace);
+        gl = gltrace; **/
 
         pmvMatrix = new PMVMatrix();