- 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, 20 insertions, 5 deletions

diff --git a/make/gl-gl2es12.cfg b/make/gl-gl2es12.cfg
index fb772b73b..7dcf9462f 100644
--- a/make/gl-gl2es12.cfg
+++ b/make/gl-gl2es12.cfg
@@ -1,10 +1,15 @@
 # This .cfg file is used to generate the GL interface and implementing class.
-JavaOutputDir ../build/gensrc/classes
-NativeOutputDir ../build/gensrc/native/jogl/gl2es12
+JavaOutputDir gensrc/classes
+NativeOutputDir gensrc/native/jogl/gl2es12
 
-ExtendedInterfaceSymbolsOnly ../build/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsOnly ../build/gensrc/classes/javax/media/opengl/GL2ES1.java
-ExtendedInterfaceSymbolsOnly ../build/gensrc/classes/javax/media/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsOnly ../build-temp/gensrc/classes/javax/media/opengl/GL.java
+ExtendedInterfaceSymbolsOnly ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java
+ExtendedInterfaceSymbolsOnly ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsOnly ../src/classes/javax/media/opengl/sub/GLObject.java
+ExtendedInterfaceSymbolsOnly ../src/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java
+ExtendedInterfaceSymbolsOnly ../src/classes/javax/media/opengl/sub/fixed/GLPointerIf.java
+ExtendedInterfaceSymbolsOnly ../src/classes/javax/media/opengl/sub/fixed/GLLightingIf.java
+ExtendedInterfaceSymbolsOnly ../src/classes/javax/media/opengl/sub/fixed/GLFixedFuncIf.java
 
 Package javax.media.opengl
 Style InterfaceAndImpl
@@ -12,11 +17,21 @@ JavaClass GL2ES12
 Extends GL2ES12 GL
 Extends GL2ES12 GL2ES1
 Extends GL2ES12 GL2ES2
+Extends GL2ES12 GLObject
+Extends GL2ES12 GLMatrixIf
+Extends GL2ES12 GLPointerIf
+Extends GL2ES12 GLLightingIf
+Extends GL2ES12 GLFixedFuncIf
 ImplPackage com.sun.opengl.impl.gl2es12
 ImplJavaClass GL2ES12Impl
 Implements GL2ES12Impl GL
 Implements GL2ES12Impl GL2ES1
 Implements GL2ES12Impl GL2ES2
+Implements GL2ES12Impl GLObject
+Implements GL2ES12Impl GLMatrixIf
+Implements GL2ES12Impl GLPointerIf
+Implements GL2ES12Impl GLLightingIf
+Implements GL2ES12Impl GLFixedFuncIf
 
 Include gl-common-gl2.cfg
 Include gl-common-extensions.cfg