GLArrayData*

    - cleanup names and enable/disable code
    - bail out if components==0 in GL* impl.
    - add passing the VBO name for wrapping VBO server objects
      from the fixed function calls

ShaderState:
    - reset:
        - only pass _enabled_ vertex attribute data in case of a reset
        - enable VBO in case of a wrapped VBO server object

Fixed:
    - Added glMaterialf to GL (enables Angeles demo)
    -

Working: Angeles on ES2


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1755 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 3 insertions, 2 deletions

diff --git a/make/gl-impl-CustomJavaCode-gl2_es2.java b/make/gl-impl-CustomJavaCode-gl2_es2.java
index aef836468..ff1360aeb 100644
--- a/make/gl-impl-CustomJavaCode-gl2_es2.java
+++ b/make/gl-impl-CustomJavaCode-gl2_es2.java
@@ -261,11 +261,12 @@
   }
 
   public void glVertexAttribPointer(GLArrayData array) {
+    if(array.getComponentNumber()==0) return;
     if(array.isVBO()) {
-        glVertexAttribPointer(array.getLocation(), array.getComponents(), array.getDataType(), 
+        glVertexAttribPointer(array.getLocation(), array.getComponentNumber(), array.getComponentType(), 
                               array.getNormalized(), array.getStride(), array.getOffset());
     } else {
-        glVertexAttribPointer(array.getLocation(), array.getComponents(), array.getDataType(), 
+        glVertexAttribPointer(array.getLocation(), array.getComponentNumber(), array.getComponentType(), 
                               array.getNormalized(), array.getStride(), array.getBuffer());
     }
   }