- Fixed rootrel.build usage, this works properly through gluegen, jogl-demos and this build.

  You can say -Drootrel.build=build-x86_64 for example.

- Fixed jogl-demos in regard to this changeset

- Gluegen
    - Fixed gluegen BuildComposablePipeline's 'getGL*' methods.
      Now they return 'this', otherwise the pipeline would be broken/removed.

    - Add BuildComposablePipeline CustomPipeline, which allows customized
      class composition with an interface (to be wrapped),
      prolog class and the downstream class.

    - Add GlueGen (incl. ant task) 'outputRootDir' to be able to set a
      top output root dir via ant / commandline.

- GL fixed function
    - Package 'javax.media.opengl.sub.fixed.*' defines some fixed function interfaces.
      This allows partitioning of custom implementation.

    - Using gluegen's new CustomPipeline to compose a GLFixedFuncIf implementation,
      using a GL downstream and a GLFixedFuncHookIf prolog.
      The latter implements the fixed functionality.
      Example is the GLFixedFuncImpl.
        gl.getContext().setGL( new GLFixedFuncImpl(gl, new FixedFuncHook(gl.getGL2ES2())) ) ;
      or
        gl.getContext().setGL( new GLFixedFuncImpl(gl, gl.getGL2ES1()) ) ;

   -  The example GLFixedFuncHookIf impl FixedFuncPipeline/
      can be instantiated with custom shader code.


- ES2 and all other interfaces only contain the original functionality,
  besides minor convenient data access methods.

- Fix: GL2ES2 createCompileShader() and createLoadShader() is moved to ShaderCode util class.

- Updated PMVMatrix

- Add: GLAutoDrawable.setContext() .. and all it's implementations
  Necessary to set a new GLContext.

- Add: GLContext getAttachedObject(int) and putAttachedObject(int, Object),
  to allow the user to attach application specific and TLS sensitive objects to the GLContext.


-


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

1 files changed, 7 insertions, 6 deletions

diff --git a/src/demos/xtrans/XTDesktopPane.java b/src/demos/xtrans/XTDesktopPane.java
index 5940172..7294376 100755
--- a/src/demos/xtrans/XTDesktopPane.java
+++ b/src/demos/xtrans/XTDesktopPane.java
@@ -49,6 +49,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import javax.media.opengl.DebugGL2;
 import javax.media.opengl.GL;
+import javax.media.opengl.GL2ES1;
 import javax.media.opengl.GL2;
 import javax.media.opengl.GLContext;
 import javax.media.opengl.GLDrawableFactory;
@@ -217,14 +218,14 @@ public class XTDesktopPane extends OffscreenDesktopPane {
             double near = d - (h / 2);
             double far  = d + (h / 2);
             gl.glViewport(oglRect.x, oglRect.y, oglRect.width, oglRect.height);
-            gl.glMatrixMode(GL.GL_PROJECTION);
+            gl.glMatrixMode(GL2ES1.GL_PROJECTION);
             gl.glPushMatrix();
             gl.glLoadIdentity();
             glu.gluPerspective(fovy, (w / h), near, far);
             gl.glMatrixMode(GL.GL_TEXTURE);
             gl.glPushMatrix();
             gl.glLoadIdentity();
-            gl.glMatrixMode(GL.GL_MODELVIEW);
+            gl.glMatrixMode(GL2ES1.GL_MODELVIEW);
             gl.glPushMatrix();
             gl.glLoadIdentity();
             double eyeX = w / 2;
@@ -250,7 +251,7 @@ public class XTDesktopPane extends OffscreenDesktopPane {
             // Orthographic projection for debugging
             gl.glViewport(oglRect.x, oglRect.y, oglRect.width, oglRect.height);
             // Set up coordinate system for easy access
-            gl.glMatrixMode(GL.GL_PROJECTION);
+            gl.glMatrixMode(GL2ES1.GL_PROJECTION);
             //          System.err.println("oglRect x = " + oglRect.getX());
             //          System.err.println("oglRect y = " + oglRect.getY());
             //          System.err.println("oglRect w = " + oglRect.getWidth());
@@ -264,7 +265,7 @@ public class XTDesktopPane extends OffscreenDesktopPane {
             gl.glMatrixMode(GL.GL_TEXTURE);
             gl.glPushMatrix();
             gl.glLoadIdentity();
-            gl.glMatrixMode(GL.GL_MODELVIEW);
+            gl.glMatrixMode(GL2ES1.GL_MODELVIEW);
             gl.glPushMatrix();
             gl.glLoadIdentity();
 
@@ -363,11 +364,11 @@ public class XTDesktopPane extends OffscreenDesktopPane {
             gl.glDisable(GL.GL_BLEND);
 
             gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL2.GL_MODULATE);
-            gl.glMatrixMode(GL.GL_PROJECTION);
+            gl.glMatrixMode(GL2ES1.GL_PROJECTION);
             gl.glPopMatrix();
             gl.glMatrixMode(GL.GL_TEXTURE);
             gl.glPopMatrix();
-            gl.glMatrixMode(GL.GL_MODELVIEW);
+            gl.glMatrixMode(GL2ES1.GL_MODELVIEW);
             gl.glPopMatrix();
             gl.glFinish();
           } finally {