Partial fix for Issue 42: Problems invoking GLU functions

Incorporated the LWJGL team's port of the GLU quadric and projection
routines to be able to eliminate calls to the native GLU library for
these cases, which was problematic on certain Linux distributions.
Still need to port at least some of the mipmap routines and the NURBS
tesselator.


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

1 files changed, 126 insertions, 0 deletions

diff --git a/make/glu-impl-common-CustomJavaCode.java b/make/glu-impl-common-CustomJavaCode.java
index 3332bd375..854030351 100644
--- a/make/glu-impl-common-CustomJavaCode.java
+++ b/make/glu-impl-common-CustomJavaCode.java
@@ -5,12 +5,23 @@ public boolean isFunctionAvailable(String gluFunctionName)
 }
 
 private GLUProcAddressTable gluProcAddressTable;
+private GL gl;
 
 public GLUImpl(GLUProcAddressTable gluProcAddressTable)
 {
   this.gluProcAddressTable = gluProcAddressTable;
+  this.project = new Project();
 }
 
+// Used for pure-Java port of GLU
+public void setGL(GL gl) {
+  this.gl = gl;
+}
+
+//----------------------------------------------------------------------
+// Tesselator functionality
+//
+
 public GLUtesselator gluNewTess() {
     return GLUtesselatorImpl.gluNewTess();
 }
@@ -79,3 +90,118 @@ public void gluEndPolygon(GLUtesselator tesselator) {
     GLUtesselatorImpl tess = (GLUtesselatorImpl) tesselator;
     tess.gluEndPolygon();
 }
+
+//----------------------------------------------------------------------
+// Quadric functionality
+//
+
+/** Interface to C language function: <br> <code> void gluCylinder(GLUquadric *  quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks); </code>    */
+public void gluCylinder(GLUquadric quad, double base, double top, double height, int slices, int stacks) {
+  ((GLUquadricImpl) quad).drawCylinder(gl, (float) base, (float) top, (float) height, slices, stacks);
+}
+
+/** Interface to C language function: <br> <code> void gluDeleteQuadric(GLUquadric *  quad); </code>    */
+public void gluDeleteQuadric(GLUquadric quad) {
+}
+
+/** Interface to C language function: <br> <code> void gluDisk(GLUquadric *  quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops); </code>    */
+public void gluDisk(GLUquadric quad, double inner, double outer, int slices, int loops) {
+  ((GLUquadricImpl) quad).drawDisk(gl, (float) inner, (float) outer, slices, loops);
+}
+
+/** Interface to C language function: <br> <code> GLUquadric *  gluNewQuadric(void); </code>    */
+public GLUquadric gluNewQuadric() {
+  return new GLUquadricImpl();
+}
+
+/** Interface to C language function: <br> <code> void gluPartialDisk(GLUquadric *  quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep); </code>    */
+public void gluPartialDisk(GLUquadric quad, double inner, double outer, int slices, int loops, double start, double sweep) {
+  ((GLUquadricImpl) quad).drawPartialDisk(gl, (float) inner, (float) outer, slices, loops, (float) start, (float) sweep);
+}
+
+/** Interface to C language function: <br> <code> void gluQuadricDrawStyle(GLUquadric *  quad, GLenum draw); </code>    */
+public void gluQuadricDrawStyle(GLUquadric quad, int draw) {
+  ((GLUquadricImpl) quad).setDrawStyle(draw);
+}
+
+/** Interface to C language function: <br> <code> void gluQuadricNormals(GLUquadric *  quad, GLenum normal); </code>    */
+public void gluQuadricNormals(GLUquadric quad, int normal) {
+  ((GLUquadricImpl) quad).setNormals(normal);
+}
+
+/** Interface to C language function: <br> <code> void gluQuadricOrientation(GLUquadric *  quad, GLenum orientation); </code>    */
+public void gluQuadricOrientation(GLUquadric quad, int orientation) {
+  ((GLUquadricImpl) quad).setOrientation(orientation);
+}
+
+/** Interface to C language function: <br> <code> void gluQuadricTexture(GLUquadric *  quad, GLboolean texture); </code>    */
+public void gluQuadricTexture(GLUquadric quad, boolean texture) {
+  ((GLUquadricImpl) quad).setTextureFlag(texture);
+}
+
+/** Interface to C language function: <br> <code> void gluSphere(GLUquadric *  quad, GLdouble radius, GLint slices, GLint stacks); </code>    */
+public void gluSphere(GLUquadric quad, double radius, int slices, int stacks) {
+  ((GLUquadricImpl) quad).drawSphere(gl, (float) radius, slices, stacks);
+}
+
+//----------------------------------------------------------------------
+// Projection functionality
+//
+
+private Project project;
+
+public void gluOrtho2D(double left, double right, double bottom, double top) {
+  project.gluOrtho2D(gl, left, right, bottom, top);
+}
+
+public void gluPerspective(double fovy, double aspect, double zNear, double zFar) {
+  project.gluPerspective(gl, fovy, aspect, zNear, zFar);
+}
+
+public void gluLookAt(double eyeX, double eyeY, double eyeZ, double centerX, double centerY, double centerZ, double upX, double upY, double upZ) {
+  project.gluLookAt(gl, eyeX, eyeY, eyeZ, centerX, centerY, centerZ, upX, upY, upZ);
+}
+
+public boolean gluProject(double objX, double objY, double objZ, double[] model, double[] proj, int[] view, double[] winX, double[] winY, double[] winZ) {
+  double[] tmp = new double[3];
+  boolean res = project.gluProject(objX, objY, objZ, model, proj, view, tmp);
+  winX[0] = tmp[0];
+  winY[0] = tmp[1];
+  winZ[0] = tmp[2];
+  return res;
+}
+
+public boolean gluProject(double objX, double objY, double objZ, double[] model, double[] proj, int[] view, double[] winPos) {
+  return project.gluProject(objX, objY, objZ, model, proj, view, winPos);
+}
+
+public boolean gluUnProject(double winX, double winY, double winZ, double[] model, double[] proj, int[] view, double[] objX, double[] objY, double[] objZ) {
+  double[] tmp = new double[3];
+  boolean res = project.gluUnProject(winX, winY, winZ, model, proj, view, tmp);
+  objX[0] = tmp[0];
+  objY[0] = tmp[1];
+  objZ[0] = tmp[2];
+  return res;
+}
+
+public boolean gluUnProject(double winX, double winY, double winZ, double[] model, double[] proj, int[] view, double[] objPos) {
+  return project.gluUnProject(winX, winY, winZ, model, proj, view, objPos);
+}
+
+public boolean gluUnProject4(double winX, double winY, double winZ, double clipW, double[] model, double[] proj, int[] view, double nearVal, double farVal, double[] objX, double[] objY, double[] objZ, double[] objW) {
+  double[] tmp = new double[4];
+  boolean res = project.gluUnProject4(winX, winY, winZ, clipW, model, proj, view, nearVal, farVal, tmp);
+  objX[0] = tmp[0];
+  objY[0] = tmp[1];
+  objZ[0] = tmp[2];
+  objW[0] = tmp[3];
+  return res;
+}
+
+public boolean gluUnProject4(double winX, double winY, double winZ, double clipW, double[] model, double[] proj, int[] view, double nearVal, double farVal, double[] objPos) {
+  return project.gluUnProject4(winX, winY, winZ, clipW, model, proj, view, nearVal, farVal, objPos);
+}
+
+public void gluPickMatrix(double x, double y, double delX, double delY, int[] viewport) {
+  project.gluPickMatrix(gl, x, y, delX, delY, viewport);
+}