From 74c254d42bb2389dc9bf257898053700c8c72568 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 16 Dec 2012 07:18:36 +0100 Subject: Fix/Complete commit b8a8fc24a3afb0cb06a31504bdea1a98b8f00ef4 - Adding missing GLU code --- make/config/jogl/glu-CustomJavaCode-base.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'make/config/jogl/glu-CustomJavaCode-base.java') diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java index 49722b469..21d6277e9 100644 --- a/make/config/jogl/glu-CustomJavaCode-base.java +++ b/make/config/jogl/glu-CustomJavaCode-base.java @@ -1250,16 +1250,24 @@ public final void gluDisk(GLUquadric quad, double inner, double outer, int slice /** Option (throws GLException if not available in profile).
Interface to C language function:
GLUquadric * gluNewQuadric(void); */ public final GLUquadric gluNewQuadric() { - return gluNewQuadric(false); + return gluNewQuadric(false, null, 0); } -public final GLUquadric gluNewQuadric(boolean useGLSL) { +public final GLUquadric gluNewQuadric(boolean useGLSL, ShaderState st) { + return gluNewQuadric(useGLSL, st, 0); +} + +public final GLUquadric gluNewQuadric(boolean useGLSL, int shaderProgram) { + return gluNewQuadric(useGLSL, null, shaderProgram); +} + +private final GLUquadric gluNewQuadric(boolean useGLSL, ShaderState st, int shaderProgram) { GL gl = getCurrentGL(); if(useGLSL && !gl.isGL2ES2()) { throw new GLException("GLUquadric GLSL implementation not supported for profile: "+gl); } validateGLUquadricImpl(); - return new GLUquadricImpl(gl, useGLSL); + return new GLUquadricImpl(gl, useGLSL, st, shaderProgram); } /** Option (throws GLException if not available in profile).
Interface to C language function:
void gluPartialDisk(GLUquadric * quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep); */ -- cgit v1.2.3