aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2004-11-21 17:20:00 +0000
committerKenneth Russel <[email protected]>2004-11-21 17:20:00 +0000
commit603a9a7730d788f9a361d2b488c953c064d21a6b (patch)
treef8ac2a09c61c2f0e2e72050fe2d0e2bbb79ba1ef
parent26d58c85de0d33f360c72be3af3af3122f40ed78 (diff)
Fixed bug pointed out by fazekaim on the JOGL forums where the
prototypes for the manually-implemented GLU projection routines were not in the GLU interface. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@177 232f8b59-042b-4e1e-8c03-345bb8c30851
-rw-r--r--make/glu-interface-common-CustomJavaCode.java43
1 files changed, 43 insertions, 0 deletions
diff --git a/make/glu-interface-common-CustomJavaCode.java b/make/glu-interface-common-CustomJavaCode.java
index 0d9f550ef..0019046c5 100644
--- a/make/glu-interface-common-CustomJavaCode.java
+++ b/make/glu-interface-common-CustomJavaCode.java
@@ -1,3 +1,46 @@
+//----------------------------------------------------------------------
+// Projection routines
+//
+
+/** Interface to C language function: <br> <code> GLint gluProject(GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble * model, const GLdouble * proj, const GLint * view, GLdouble * winX, GLdouble * winY, GLdouble * winZ); </code> */
+public boolean gluProject(double objX, double objY, double objZ, double[] model, double[] proj, int[] view, double[] winX, double[] winY, double[] winZ);
+
+/**
+ * Convenience routine for gluProject that accepts the outgoing window
+ * coordinates as a single array.
+ */
+public boolean gluProject(double objx,
+ double objy,
+ double objz,
+ double[] modelMatrix,
+ double[] projMatrix,
+ int[] viewport,
+ double[] winPos);
+
+/** Interface to C language function: <br> <code> GLint gluUnProject(GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble * model, const GLdouble * proj, const GLint * view, GLdouble * objX, GLdouble * objY, GLdouble * objZ); </code> */
+public boolean gluUnProject(double winX, double winY, double winZ, double[] model, double[] proj, int[] view, double[] objX, double[] objY, double[] objZ);
+
+/**
+ * Convenience routine for gluUnProject that accepts the outgoing
+ * object coordinates (a 3-vector) as a single array.
+ */
+public boolean gluUnProject(double winX, double winY, double winZ, double[] model, double[] proj, int[] view, double[] objPos);
+
+/** Interface to C language function: <br> <code> GLint gluUnProject4(GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble * model, const GLdouble * proj, const GLint * view, GLdouble nearVal, GLdouble farVal, GLdouble * objX, GLdouble * objY, GLdouble * objZ, GLdouble * objW); </code> */
+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);
+
+/**
+ * Convenience routine for gluUnProject4 that accepts the outgoing
+ * object coordinates (a 4-vector) as a single array.
+ */
+public boolean gluUnProject4(double winX, double winY, double winZ, double clipW, double[] model, double[] proj, int[] view, double nearVal, double farVal, double[] objPos);
+
+
+
+//----------------------------------------------------------------------
+// Tesselation routines
+//
+
/*****************************************************************************
* <b>gluBeginPolygon</b> and {@link net.java.games.jogl.GLU#gluEndPolygon
* gluEndPolygon} delimit the definition of a nonconvex polygon. To define