- 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, 4 insertions, 4 deletions

diff --git a/src/gleem/ManipPartTriBased.java b/src/gleem/ManipPartTriBased.java
index ea75079..195f613 100644
--- a/src/gleem/ManipPartTriBased.java
+++ b/src/gleem/ManipPartTriBased.java
@@ -170,12 +170,12 @@ public class ManipPartTriBased extends ManipPart {
       return;
     boolean lightingOn = true;
     // FIXME: this is too expensive; figure out another way
-    //  if (glIsEnabled(GL.GL_LIGHTING))
+    //  if (glIsEnabled(GL2ES1.GL_LIGHTING))
     //    lightingOn = true;
 
     if (lightingOn) {
-      gl.glEnable(GL.GL_COLOR_MATERIAL);
-      gl.glColorMaterial(GL.GL_FRONT_AND_BACK, GL.GL_AMBIENT_AND_DIFFUSE);
+      gl.glEnable(GL2ES1.GL_COLOR_MATERIAL);
+      gl.glColorMaterial(GL.GL_FRONT_AND_BACK, GL2ES1.GL_AMBIENT_AND_DIFFUSE);
     }
     gl.glBegin(GL.GL_TRIANGLES);
     if (highlighted)
@@ -204,7 +204,7 @@ public class ManipPartTriBased extends ManipPart {
     }
     gl.glEnd();
     if (lightingOn)
-      gl.glDisable(GL.GL_COLOR_MATERIAL);
+      gl.glDisable(GL2ES1.GL_COLOR_MATERIAL);
   }
 
   //----------------------------------------------------------------------