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

1 files changed, 3 insertions, 2 deletions

diff --git a/src/demos/j2d/TestOverlay.java b/src/demos/j2d/TestOverlay.java
index 9d6212d..6212def 100755
--- a/src/demos/j2d/TestOverlay.java
+++ b/src/demos/j2d/TestOverlay.java
@@ -41,6 +41,7 @@ package demos.j2d;
 
 
 
+import com.sun.opengl.util.awt.gl2.GL2Overlay;
 import demos.gears.Gears;
 import demos.util.*;
 import gleem.linalg.*;
@@ -93,7 +94,7 @@ public class TestOverlay implements GLEventListener {
     animator.start();
   }
 
-  private Overlay overlay;
+  private GL2Overlay overlay;
   private Time time;
   private Font font;
   private Color TRANSPARENT_BLACK = new Color(0.0f, 0.0f, 0.0f, 0.0f);
@@ -114,7 +115,7 @@ public class TestOverlay implements GLEventListener {
     GL gl = drawable.getGL();
     gl.setSwapInterval(0);
 
-    overlay = new Overlay(drawable);
+    overlay = new GL2Overlay(drawable);
     time = new SystemTime();
     ((SystemTime) time).rebase();