From 8beeca6fcb1b5fe98e7c04a208fc208014f35c1f Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 13 Aug 2008 13:22:21 +0000 Subject: 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 --- .../com/sun/opengl/impl/glsl/fixed/FixedFuncPipeline.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/classes/com/sun/opengl/impl/glsl/fixed/FixedFuncPipeline.java') diff --git a/src/classes/com/sun/opengl/impl/glsl/fixed/FixedFuncPipeline.java b/src/classes/com/sun/opengl/impl/glsl/fixed/FixedFuncPipeline.java index f9798f48a..27b3aeeac 100644 --- a/src/classes/com/sun/opengl/impl/glsl/fixed/FixedFuncPipeline.java +++ b/src/classes/com/sun/opengl/impl/glsl/fixed/FixedFuncPipeline.java @@ -26,14 +26,6 @@ public class FixedFuncPipeline { return shaderState; } - public void enableLighting(boolean enable) { - lightingEnabled=enable; - } - - public boolean lightingEnabled() { - return lightingEnabled; - } - public int getActiveTextureUnit() { return activeTextureUnit; } @@ -318,7 +310,7 @@ public class FixedFuncPipeline { } else { shaderState.attachShaderProgram(gl, shaderProgramColor); } - } + } if(DEBUG) { System.out.println("validate: "+this); } -- cgit v1.2.3