- 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/branches/JOGL_2_SANDBOX@1856 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 77 insertions, 0 deletions

diff --git a/src/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java b/src/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java
new file mode 100644
index 000000000..834731b98
--- /dev/null
+++ b/src/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ */
+
+package javax.media.opengl.sub.fixed;
+
+import java.nio.*;
+
+import javax.media.opengl.*;
+import javax.media.opengl.sub.*;
+
+public interface GLMatrixIf {
+
+  public static final int GL_MATRIX_MODE = 0x0BA0;
+  public static final int GL_MODELVIEW = 0x1700;
+  public static final int GL_PROJECTION = 0x1701;
+  // public static final int GL_TEXTURE = 0x1702; // Use GL.GL_TEXTURE due to ambiguous GL usage
+  public static final int GL_MODELVIEW_MATRIX = 0x0BA6;
+  public static final int GL_PROJECTION_MATRIX = 0x0BA7;
+  public static final int GL_TEXTURE_MATRIX = 0x0BA8;
+
+  /**
+   * glGetFloatv
+   * @param pname GL_MODELVIEW_MATRIX, GL_PROJECTION_MATRIX or GL_TEXTURE_MATRIX
+   * @param params the FloatBuffer's position remains unchanged,
+   *        which is the same behavior than the native JOGL GL impl
+   */
+  public void glGetFloatv(int pname, java.nio.FloatBuffer params);
+  public void glGetFloatv(int pname, float[] params, int params_offset);
+  /**
+   * glGetIntegerv
+   * @param pname GL_MATRIX_MODE
+   * @param params the FloatBuffer's position remains unchanged
+   *        which is the same behavior than the native JOGL GL impl
+   */
+  public void glGetIntegerv(int pname, IntBuffer params);
+  public void glGetIntegerv(int pname, int[] params, int params_offset);
+
+  /**
+   * sets the current matrix
+   * @param pname GL_MODELVIEW, GL_PROJECTION or GL.GL_TEXTURE
+   */
+  public void glMatrixMode(int mode) ;
+
+  public void glPushMatrix();
+  public void glPopMatrix();
+
+  public void glLoadIdentity() ;
+
+  /**
+   * glLoadMatrixf
+   * @param params the FloatBuffer's position remains unchanged,
+   *        which is the same behavior than the native JOGL GL impl
+   */
+  public void glLoadMatrixf(java.nio.FloatBuffer m) ;
+  public void glLoadMatrixf(float[] m, int m_offset);
+
+  /**
+   * glMultMatrixf
+   * @param params the FloatBuffer's position remains unchanged,
+   *        which is the same behavior than the native JOGL GL impl
+   */
+  public void glMultMatrixf(java.nio.FloatBuffer m) ;
+  public void glMultMatrixf(float[] m, int m_offset);
+
+  public void glTranslatef(float x, float y, float z) ;
+
+  public void glRotatef(float angle, float x, float y, float z);
+
+  public void glScalef(float x, float y, float z) ;
+
+  public void glOrthof(float left, float right, float bottom, float top, float zNear, float zFar) ;
+
+  public void glFrustumf(float left, float right, float bottom, float top, float zNear, float zFar);
+
+}
+