Applied second jogl-demos patch from Michael Bien. Adjusted build.xml

to not try to compile jbullet sources, and to merge the ES1 and ES2
targets. To build the full set of demos (including the OpenGL ES
demos), run "ant". To build just the OpenGL ES demos, run
"ant -Djogl.es=1".


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

12 files changed, 11 insertions, 15 deletions

diff --git a/src/gleem/HandleBoxManip.java b/src/gleem/HandleBoxManip.java
index e35ad40..a0e55d7 100644
--- a/src/gleem/HandleBoxManip.java
+++ b/src/gleem/HandleBoxManip.java
@@ -262,7 +262,7 @@ public class HandleBoxManip extends Manip {
     dest.mul(tmp1, tmp2);
   }
 
-  public void render(GL gl) {
+  public void render(GL2 gl) {
     int i;
     for (i = 0; i < 12; i++)
       lineSegs[i].render(gl);
diff --git a/src/gleem/Manip.java b/src/gleem/Manip.java
index 9891501..d498534 100644
--- a/src/gleem/Manip.java
+++ b/src/gleem/Manip.java
@@ -116,5 +116,5 @@ public abstract class Manip {
 
   /** Render this Manipulator now using the given OpenGL routines and
       assuming an OpenGL context is current. */
-  public abstract void render(GL gl);
+  public abstract void render(GL2 gl);
 }
diff --git a/src/gleem/ManipManager.java b/src/gleem/ManipManager.java
index 4929bae..e793348 100644
--- a/src/gleem/ManipManager.java
+++ b/src/gleem/ManipManager.java
@@ -201,7 +201,7 @@ public class ManipManager {
       drawing occurs immediately; this routine must be called when an
       OpenGL context is valid, i.e., from within the display() method
       of a GLEventListener. */
-  public synchronized void render(GLAutoDrawable window, GL gl) {
+  public synchronized void render(GLAutoDrawable window, GL2 gl) {
     WindowInfo info = (WindowInfo) windowToInfoMap.get(window);
     if (info == null) {
       throw new RuntimeException("Window not registered");
diff --git a/src/gleem/ManipPart.java b/src/gleem/ManipPart.java
index e0416a0..936f755 100644
--- a/src/gleem/ManipPart.java
+++ b/src/gleem/ManipPart.java
@@ -90,5 +90,5 @@ public abstract class ManipPart {
 
   /** Render this ManipPart now using the given OpenGL routines and
       assuming an OpenGL context is current. */
-  public abstract void render(GL gl);
+  public abstract void render(GL2 gl);
 }
diff --git a/src/gleem/ManipPartGroup.java b/src/gleem/ManipPartGroup.java
index 14a73ef..5cf8f71 100644
--- a/src/gleem/ManipPartGroup.java
+++ b/src/gleem/ManipPartGroup.java
@@ -125,7 +125,7 @@ public class ManipPartGroup extends ManipPart {
     return visible;
   }
 
-  public void render(GL gl) {
+  public void render(GL2 gl) {
     for (Iterator iter = children.iterator(); iter.hasNext(); ) {
       ((ManipPart) iter.next()).render(gl);
     }
diff --git a/src/gleem/ManipPartLineSeg.java b/src/gleem/ManipPartLineSeg.java
index ce560c9..682c5c0 100644
--- a/src/gleem/ManipPartLineSeg.java
+++ b/src/gleem/ManipPartLineSeg.java
@@ -123,7 +123,7 @@ public class ManipPartLineSeg extends ManipPart {
     return visible;
   }
 
-  public void render(GL gl) {
+  public void render(GL2 gl) {
     if (!visible)
       return;
     // FIXME: probably too slow
diff --git a/src/gleem/ManipPartTriBased.java b/src/gleem/ManipPartTriBased.java
index 759c491..ea75079 100644
--- a/src/gleem/ManipPartTriBased.java
+++ b/src/gleem/ManipPartTriBased.java
@@ -165,7 +165,7 @@ public class ManipPartTriBased extends ManipPart {
     return visible;
   }
 
-  public void render(GL gl) {
+  public void render(GL2 gl) {
     if (!visible)
       return;
     boolean lightingOn = true;
diff --git a/src/gleem/ManipPartTwoWayArrow.java b/src/gleem/ManipPartTwoWayArrow.java
index 77ba507..179bbc7 100644
--- a/src/gleem/ManipPartTwoWayArrow.java
+++ b/src/gleem/ManipPartTwoWayArrow.java
@@ -39,8 +39,6 @@
 
 package gleem;
 
-import java.util.*;
-
 import gleem.linalg.*;
 
 /** Piece of geometry defining a two-way arrow, used in Translate1 and
diff --git a/src/gleem/NormalCalc.java b/src/gleem/NormalCalc.java
index 635bd78..004eb76 100644
--- a/src/gleem/NormalCalc.java
+++ b/src/gleem/NormalCalc.java
@@ -39,8 +39,6 @@
 
 package gleem;
 
-import java.util.*;
-
 import gleem.linalg.*;
 
 /** Calculates normals for a set of polygons. */
diff --git a/src/gleem/Translate1Manip.java b/src/gleem/Translate1Manip.java
index 0cde2d0..15af612 100644
--- a/src/gleem/Translate1Manip.java
+++ b/src/gleem/Translate1Manip.java
@@ -163,7 +163,7 @@ public class Translate1Manip extends Manip {
     parts.clearHighlight();
   }
   
-  public void render(GL gl) {
+  public void render(GL2 gl) {
     parts.render(gl);
   }
 
diff --git a/src/gleem/Translate2Manip.java b/src/gleem/Translate2Manip.java
index 7fe8416..fc2011c 100644
--- a/src/gleem/Translate2Manip.java
+++ b/src/gleem/Translate2Manip.java
@@ -165,7 +165,7 @@ public class Translate2Manip extends Manip {
     parts.clearHighlight();
   }
   
-  public void render(GL gl) {
+  public void render(GL2 gl) {
     parts.render(gl);
   }
 
diff --git a/src/gleem/WindowUpdateListener.java b/src/gleem/WindowUpdateListener.java
index efc139f..193d801 100644
--- a/src/gleem/WindowUpdateListener.java
+++ b/src/gleem/WindowUpdateListener.java
@@ -39,8 +39,8 @@
 
 package gleem;
 
-import javax.media.opengl.*;
-import com.sun.opengl.util.*;
+import javax.media.opengl.GLAutoDrawable;
+
 
 /** A WindowUpdateListener is used by the ManipManager to transmit
     repaint() notifications to windows containing Manips. When a Manip