Added wince startup files, fixed jbullet for cdc

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/branches/JOGL_2_SANDBOX@267 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4

26 files changed, 56 insertions, 15 deletions

diff --git a/src/jbullet/make-all.sh b/src/jbullet/make-all.sh
index 5341071..2c4ca3e 100644
--- a/src/jbullet/make-all.sh
+++ b/src/jbullet/make-all.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-sh make-cdc-es1.sh 
+sh make-cdc-es1.sh jar
 sh make-jar.sh 
-cp -v ragdoll.jar /data/Incoming/phone/ragdoll.jar 
+cp -v ragdoll.jar /jordan/data/packs/sun/mobile/apx2500.phone_image
diff --git a/src/jbullet/make-jar.sh b/src/jbullet/make-jar.sh
index 996efa7..4f98e1d 100644
--- a/src/jbullet/make-jar.sh
+++ b/src/jbullet/make-jar.sh
@@ -1,7 +1,7 @@
 rm -f ragdoll.jar 
 cd build/classes/
-jar xf ../../lib/vecmath/vecmath.jar 
-jar xf ../../lib/trove/trove.jar
+jar xf ../../lib/vecmath.jar 
+jar xf ../../lib/trove.jar
 cp -a  ../../lib/java .
 rm -rf META-INF
 find . -name \*nope -exec rm -fv \{\} \;
diff --git a/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java b/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java
index 5dfc0db..45b9b57 100644
--- a/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java
+++ b/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java
@@ -145,11 +145,14 @@ public abstract class DemoApplication
         }
 
         System.err.println("Entering initialization");
-        System.err.println("GL Profile: "+GLProfile.getProfile());
-        System.err.println("GL:" + gl);
-        System.err.println("GL_VERSION=" + gl.glGetString(gl.GL_VERSION));
-        System.err.println("GL_EXTENSIONS:");
-        System.err.println("  " + gl.glGetString(gl.GL_EXTENSIONS));
+        System.err.print("GL Profile: ");
+        System.err.println(GLProfile.getProfile());
+        System.err.print("GL:");
+        System.err.println(gl);
+        System.err.print("GL_VERSION=");
+        System.err.println(gl.glGetString(gl.GL_VERSION));
+        System.err.print("GL_EXTENSIONS: ");
+        System.err.println(gl.glGetString(gl.GL_EXTENSIONS));
 
         glsrt = new GLSRT(glu, gl);
         gl.glLightfv(gl.GL_LIGHT0, gl.GL_AMBIENT, light_ambient, 0);
diff --git a/src/jbullet/src/javabullet/demos/opengl/JOGL.java b/src/jbullet/src/javabullet/demos/opengl/JOGL.java
index b302627..3333145 100644
--- a/src/jbullet/src/javabullet/demos/opengl/JOGL.java
+++ b/src/jbullet/src/javabullet/demos/opengl/JOGL.java
@@ -63,10 +63,9 @@ public class JOGL implements MouseListener {
 		redisplay = true;
 	}
 
-    private void run(String title, DemoApplication demoApp, int type) {
-        int width = 480;
-        int height = 800;
-        System.err.println(title+"run()");
+    private void run(String title, DemoApplication demoApp, int type, int width, int height) {
+        System.err.print(title);
+        System.err.println(" run()");
         GLProfile.setProfileGLAny();
         try {
             Window nWindow = null;
@@ -126,7 +125,8 @@ public class JOGL implements MouseListener {
             // Shut things down cooperatively
             window.close();
             window.getFactory().shutdown();
-            System.out.println(title+" shut down cleanly.");
+            System.out.print(title);
+            System.out.println(" shut down cleanly.");
         } catch (Throwable t) {
             t.printStackTrace();
         }
@@ -136,13 +136,25 @@ public class JOGL implements MouseListener {
     public static int USE_AWT       = 1 << 0;
 
     public static void main(String title, DemoApplication demo, String[] args) {
+        int width = 480;
+        int height = 800;
         int type = USE_NEWT ;
         for(int i=args.length-1; i>=0; i--) {
             if(args[i].equals("-awt")) {
                 type |= USE_AWT; 
             }
+            if(args[i].equals("-width") && i+1<args.length) {
+                try {
+                    width = Integer.parseInt(args[i+1]);
+                } catch (NumberFormatException nfe) {}
+            }
+            if(args[i].equals("-height") && i+1<args.length) {
+                try {
+                    height = Integer.parseInt(args[i+1]);
+                } catch (NumberFormatException nfe) {}
+            }
         }
-        new JOGL().run(title, demo, type);
+        new JOGL().run(title, demo, type, width, height);
         System.exit(0);
     }
 
diff --git a/wince/angeles-es1-fixed-args.txt b/wince/angeles-es1-fixed-args.txt
new file mode 100755
index 0000000..719aa30
--- /dev/null
+++ b/wince/angeles-es1-fixed-args.txt
@@ -0,0 +1 @@
+"-Dsun.boot.library.path=\Storage Card\bin" "-Xbootclasspath/a:\Storage Card\gluegen-rt.jar" "-Xbootclasspath/a:\Storage Card\jogl.core.jar" "-Xbootclasspath/a:\Storage Card\jogl.egl.jar" "-Xbootclasspath/a:\Storage Card\jogl.gles1.jar" "-Xbootclasspath/a:\Storage Card\newt.jar" "-Xbootclasspath/a:\Storage Card\jogl-demos.jar" "-Xopt:stdioPrefix=\Storage Card" -Dgluegen.debug.ProcAddressHelper demos.es1.angeles.Main
diff --git a/wince/angeles-es1-fixed.lnk b/wince/angeles-es1-fixed.lnk
new file mode 100755
index 0000000..2f762f5
--- /dev/null
+++ b/wince/angeles-es1-fixed.lnk
@@ -0,0 +1 @@
+01#"\Storage Card\bin\cvm.exe" -f "\Storage Card\angeles-es1-fixed-args.txt"
diff --git a/wince/angeles-es1-float-args.txt b/wince/angeles-es1-float-args.txt
new file mode 100755
index 0000000..c8f9028
--- /dev/null
+++ b/wince/angeles-es1-float-args.txt
@@ -0,0 +1 @@
+"-Dsun.boot.library.path=\Storage Card\bin" "-Xbootclasspath/a:\Storage Card\gluegen-rt.jar" "-Xbootclasspath/a:\Storage Card\jogl.core.jar" "-Xbootclasspath/a:\Storage Card\jogl.egl.jar" "-Xbootclasspath/a:\Storage Card\jogl.gles1.jar" "-Xbootclasspath/a:\Storage Card\newt.jar" "-Xbootclasspath/a:\Storage Card\jogl-demos.jar" "-Xopt:stdioPrefix=\Storage Card" -Dgluegen.debug.ProcAddressHelper demos.es1.angeles.Main -angelesf
diff --git a/wince/angeles-es1-float.lnk b/wince/angeles-es1-float.lnk
new file mode 100755
index 0000000..259b5e3
--- /dev/null
+++ b/wince/angeles-es1-float.lnk
@@ -0,0 +1 @@
+01#"\Storage Card\bin\cvm.exe" -f "\Storage Card\angeles-es1-float-args.txt"
diff --git a/wince/bump-args.txt b/wince/bump-args.txt
new file mode 100755
index 0000000..800b9bd
--- /dev/null
+++ b/wince/bump-args.txt
@@ -0,0 +1 @@
+"-Dsun.boot.library.path=\Storage Card\bin" "-Xbootclasspath/a:\Storage Card\gluegen-rt.jar" "-Xbootclasspath/a:\Storage Card\jogl.core.jar" "-Xbootclasspath/a:\Storage Card\jogl.egl.jar" "-Xbootclasspath/a:\Storage Card\jogl.gles1.jar" "-Xbootclasspath/a:\Storage Card\newt.jar" "-Xbootclasspath/a:\Storage Card\jogl-demos.jar" "-Xopt:stdioPrefix=\Storage Card" -Dgluegen.debug.ProcAddressHelper demos.es1.bump.Bump
diff --git a/wince/bump.lnk b/wince/bump.lnk
new file mode 100755
index 0000000..d237004
--- /dev/null
+++ b/wince/bump.lnk
@@ -0,0 +1 @@
+01#"\Storage Card\bin\cvm.exe" -f "\Storage Card\bump-args.txt"
\ No newline at end of file
diff --git a/wince/cube-es1-args.txt b/wince/cube-es1-args.txt
new file mode 100755
index 0000000..c06d87a
--- /dev/null
+++ b/wince/cube-es1-args.txt
@@ -0,0 +1,2 @@
+"-Dsun.boot.library.path=\Storage Card\bin" "-Xbootclasspath/a:\Storage Card\gluegen-rt.jar" "-Xbootclasspath/a:\Storage Card\jogl.core.jar" "-Xbootclasspath/a:\Storage Card\jogl.egl.jar" "-Xbootclasspath/a:\Storage Card\jogl.gles1.jar" "-Xbootclasspath/a:\Storage Card\newt.jar" "-Xbootclasspath/a:\Storage Card\jogl-demos.jar" "-Xopt:stdioPrefix=\Storage Card" -Dgluegen.debug.ProcAddressHelper demos.es1.cube.Cube
+
diff --git a/wince/cube-es1.lnk b/wince/cube-es1.lnk
new file mode 100755
index 0000000..73e9634
--- /dev/null
+++ b/wince/cube-es1.lnk
@@ -0,0 +1 @@
+01#"\Storage Card\bin\cvm.exe" -f "\Storage Card\cube-es1-args.txt"
diff --git a/wince/cubefbo-es1-args.txt b/wince/cubefbo-es1-args.txt
new file mode 100755
index 0000000..a576d1f
--- /dev/null
+++ b/wince/cubefbo-es1-args.txt
@@ -0,0 +1 @@
+"-Dsun.boot.library.path=\Storage Card\bin" "-Xbootclasspath/a:\Storage Card\gluegen-rt.jar" "-Xbootclasspath/a:\Storage Card\jogl.core.jar" "-Xbootclasspath/a:\Storage Card\jogl.egl.jar" "-Xbootclasspath/a:\Storage Card\jogl.gles1.jar" "-Xbootclasspath/a:\Storage Card\newt.jar" "-Xbootclasspath/a:\Storage Card\jogl-demos.jar" "-Xopt:stdioPrefix=\Storage Card" -Dgluegen.debug.ProcAddressHelper demos.es1.cubefbo.Main
diff --git a/wince/cubefbo-es1.lnk b/wince/cubefbo-es1.lnk
new file mode 100755
index 0000000..b420522
--- /dev/null
+++ b/wince/cubefbo-es1.lnk
@@ -0,0 +1 @@
+01#"\Storage Card\bin\cvm.exe" -f "\Storage Card\cubefbo-es1-args.txt"
diff --git a/wince/cubefbo-es2-args.txt b/wince/cubefbo-es2-args.txt
new file mode 100755
index 0000000..6560ca5
--- /dev/null
+++ b/wince/cubefbo-es2-args.txt
@@ -0,0 +1 @@
+"-Dsun.boot.library.path=\Storage Card\bin" "-Xbootclasspath/a:\Storage Card\gluegen-rt.jar" "-Xbootclasspath/a:\Storage Card\jogl.core.jar" "-Xbootclasspath/a:\Storage Card\jogl.egl.jar" "-Xbootclasspath/a:\Storage Card\jogl.gles2.jar" "-Xbootclasspath/a:\Storage Card\newt.jar" "-Xbootclasspath/a:\Storage Card\jogl-demos.jar" "-Xopt:stdioPrefix=\Storage Card" -Dgluegen.debug.ProcAddressHelper demos.es1.cubefbo.Main
diff --git a/wince/cubefbo-es2.lnk b/wince/cubefbo-es2.lnk
new file mode 100755
index 0000000..fc71830
--- /dev/null
+++ b/wince/cubefbo-es2.lnk
@@ -0,0 +1 @@
+01#"\Storage Card\bin\cvm.exe" -f "\Storage Card\cubefbo-es2-args.txt"
diff --git a/wince/cubeimmmode-es1-args.txt b/wince/cubeimmmode-es1-args.txt
new file mode 100755
index 0000000..1a96cdc
--- /dev/null
+++ b/wince/cubeimmmode-es1-args.txt
@@ -0,0 +1,2 @@
+"-Dsun.boot.library.path=\Storage Card\bin" "-Xbootclasspath/a:\Storage Card\gluegen-rt.jar" "-Xbootclasspath/a:\Storage Card\jogl.core.jar" "-Xbootclasspath/a:\Storage Card\jogl.egl.jar" "-Xbootclasspath/a:\Storage Card\jogl.gles1.jar" "-Xbootclasspath/a:\Storage Card\newt.jar" "-Xbootclasspath/a:\Storage Card\jogl-demos.jar" "-Xopt:stdioPrefix=\Storage Card" -Dgluegen.debug.ProcAddressHelper demos.es1.cube.CubeImmModeSink
+
diff --git a/wince/cubeimmmode-es1.lnk b/wince/cubeimmmode-es1.lnk
new file mode 100755
index 0000000..99fdad5
--- /dev/null
+++ b/wince/cubeimmmode-es1.lnk
@@ -0,0 +1 @@
+01#"\Storage Card\bin\cvm.exe" -f "\Storage Card\cubeimmmode-es1-args.txt"
diff --git a/wince/ragdoll-es1-args.txt b/wince/ragdoll-es1-args.txt
new file mode 100755
index 0000000..bbcee27
--- /dev/null
+++ b/wince/ragdoll-es1-args.txt
@@ -0,0 +1 @@
+"-Dsun.boot.library.path=\Storage Card\bin" "-Xbootclasspath/a:\Storage Card\gluegen-rt.jar" "-Xbootclasspath/a:\Storage Card\jogl.core.jar" "-Xbootclasspath/a:\Storage Card\jogl.egl.jar" "-Xbootclasspath/a:\Storage Card\jogl.gles1.jar" "-Xbootclasspath/a:\Storage Card\newt.jar" "-Xbootclasspath/a:\Storage Card\ragdoll.jar" "-Xopt:stdioPrefix=\Storage Card" -Dgluegen.debug.ProcAddressHelper javabullet.demos.genericjoint.GenericJointDemo -width 800 -height 480
diff --git a/wince/ragdoll-es1.lnk b/wince/ragdoll-es1.lnk
new file mode 100755
index 0000000..e83f42f
--- /dev/null
+++ b/wince/ragdoll-es1.lnk
@@ -0,0 +1 @@
+01#"\Storage Card\bin\cvm.exe" -f "\Storage Card\ragdoll-es1-args.txt"
diff --git a/wince/ragdoll-es2-args.txt b/wince/ragdoll-es2-args.txt
new file mode 100755
index 0000000..fee58b9
--- /dev/null
+++ b/wince/ragdoll-es2-args.txt
@@ -0,0 +1 @@
+"-Dsun.boot.library.path=\Storage Card\bin" "-Xbootclasspath/a:\Storage Card\gluegen-rt.jar" "-Xbootclasspath/a:\Storage Card\jogl.core.jar" "-Xbootclasspath/a:\Storage Card\jogl.egl.jar" "-Xbootclasspath/a:\Storage Card\jogl.gles2.jar" "-Xbootclasspath/a:\Storage Card\newt.jar" "-Xbootclasspath/a:\Storage Card\ragdoll.jar" "-Xopt:stdioPrefix=\Storage Card" -Dgluegen.debug.ProcAddressHelper javabullet.demos.genericjoint.GenericJointDemo -width 800 -height 480
diff --git a/wince/ragdoll-es2.lnk b/wince/ragdoll-es2.lnk
new file mode 100755
index 0000000..c617732
--- /dev/null
+++ b/wince/ragdoll-es2.lnk
@@ -0,0 +1 @@
+01#"\Storage Card\bin\cvm.exe" -f "\Storage Card\ragdoll-es2-args.txt"
diff --git a/wince/redsquare-es1-args.txt b/wince/redsquare-es1-args.txt
new file mode 100755
index 0000000..9a2bbf5
--- /dev/null
+++ b/wince/redsquare-es1-args.txt
@@ -0,0 +1,2 @@
+"-Dsun.boot.library.path=\Storage Card\bin" "-Xbootclasspath/a:\Storage Card\gluegen-rt.jar" "-Xbootclasspath/a:\Storage Card\jogl.core.jar" "-Xbootclasspath/a:\Storage Card\jogl.egl.jar" "-Xbootclasspath/a:\Storage Card\jogl.gles1.jar" "-Xbootclasspath/a:\Storage Card\newt.jar" "-Xbootclasspath/a:\Storage Card\jogl-demos.jar" "-Xopt:stdioPrefix=\Storage Card" -Dgluegen.debug.ProcAddressHelper demos.es1.RedSquare
+
diff --git a/wince/redsquare-es1.lnk b/wince/redsquare-es1.lnk
new file mode 100755
index 0000000..6a18665
--- /dev/null
+++ b/wince/redsquare-es1.lnk
@@ -0,0 +1 @@
+01#"\Storage Card\bin\cvm.exe" -f "\Storage Card\redsquare-es1-args.txt"
diff --git a/wince/redsquare-es2-args.txt b/wince/redsquare-es2-args.txt
new file mode 100755
index 0000000..d66b6c3
--- /dev/null
+++ b/wince/redsquare-es2-args.txt
@@ -0,0 +1,2 @@
+"-Dsun.boot.library.path=\Storage Card\bin" "-Xbootclasspath/a:\Storage Card\gluegen-rt.jar" "-Xbootclasspath/a:\Storage Card\jogl.core.jar" "-Xbootclasspath/a:\Storage Card\jogl.egl.jar" "-Xbootclasspath/a:\Storage Card\jogl.gles2.jar" "-Xbootclasspath/a:\Storage Card\newt.jar" "-Xbootclasspath/a:\Storage Card\jogl-demos.jar" "-Xopt:stdioPrefix=\Storage Card" -Dgluegen.debug.ProcAddressHelper demos.es1.RedSquare
+
diff --git a/wince/redsquare-es2.lnk b/wince/redsquare-es2.lnk
new file mode 100755
index 0000000..a8a34cf
--- /dev/null
+++ b/wince/redsquare-es2.lnk
@@ -0,0 +1 @@
+01#"\Storage Card\bin\cvm.exe" -f "\Storage Card\redsquare-es2-args.txt"