Merged the Tesselation patch by

Pepijn Van Eeckhoudt <[email protected]>.
I have added minor cleanups .. to it.

1 files changed, 577 insertions, 1 deletions

diff --git a/C2J/manual/glu-manualCodedImplJNI14.c b/C2J/manual/glu-manualCodedImplJNI14.c
index 5688184..f5ec125 100644
--- a/C2J/manual/glu-manualCodedImplJNI14.c
+++ b/C2J/manual/glu-manualCodedImplJNI14.c
@@ -5,7 +5,7 @@
 static const char _glu_n_a_string[] = "GLU-String not avaiable !";

 

 static const char * _glu_lib_vendor_="Jausoft - Sven Goethel Software Development";

-static const char * _glu_lib_version_="2.8.1.0";

+static const char * _glu_lib_version_="2.8.3.0";

 

 /* ---------------------------------------------------------------------- */

 

@@ -274,3 +274,579 @@ Java_gl4java_GLUFunc14JauJNI_gluNewTess( JNIEnv *env, jobject obj)
 	return (jlong)((PointerHolder)disp__gluNewTess());

 }

 

+#include "MemoryManager.h"

+

+/**

+ * Original Function-Prototype :

+ * <pre> 

+   extern void gluTessBeginContour ( GLUtesselator * tess ) ;

+ * </pre> 

+ */

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessBeginContour (

+		JNIEnv *env, jobject obj,

+		jlong tess)

+	{

+

+		if ( disp__gluTessBeginContour == NULL ) return;

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessBeginContour (

+			(GLUtesselator *) (PointerHolder) tess

+		);

+

+	}

+

+/**

+ * Original Function-Prototype :

+ * <pre> 

+   extern void gluTessBeginPolygon ( GLUtesselator * tess , GLvoid * data ) ;

+ * </pre> 

+ */

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessBeginPolygon__J_3B (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jbyteArray data)

+	{

+		jboolean isCopiedArray1 = JNI_FALSE;

+		jbyte *ptr1 = NULL;

+

+		if ( disp__gluTessBeginPolygon == NULL ) return;

+

+		if(data!=NULL)

+		{

+			ptr1 = (jbyte *) (*env)->GetPrimitiveArrayCritical(env, data, &isCopiedArray1);

+		}

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessBeginPolygon (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLvoid *) ptr1

+		);

+

+		if(data!=NULL)

+		{

+			(*env)->ReleasePrimitiveArrayCritical(env,  data, ptr1, (isCopiedArray1 == JNI_TRUE)?0:JNI_ABORT);

+		}

+	}

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessBeginPolygon__J_3S (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jshortArray data)

+	{

+		jboolean isCopiedArray1 = JNI_FALSE;

+		jshort *ptr1 = NULL;

+

+		if ( disp__gluTessBeginPolygon == NULL ) return;

+

+		if(data!=NULL)

+		{

+			ptr1 = (jshort *) (*env)->GetPrimitiveArrayCritical(env, data, &isCopiedArray1);

+		}

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessBeginPolygon (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLvoid *) ptr1

+		);

+

+		if(data!=NULL)

+		{

+			(*env)->ReleasePrimitiveArrayCritical(env,  data, ptr1, (isCopiedArray1 == JNI_TRUE)?0:JNI_ABORT);

+		}

+	}

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessBeginPolygon__J_3I (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jintArray data)

+	{

+		jboolean isCopiedArray1 = JNI_FALSE;

+		jint *ptr1 = NULL;

+

+		if ( disp__gluTessBeginPolygon == NULL ) return;

+

+		if(data!=NULL)

+		{

+			ptr1 = (jint *) (*env)->GetPrimitiveArrayCritical(env, data, &isCopiedArray1);

+		}

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessBeginPolygon (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLvoid *) ptr1

+		);

+

+		if(data!=NULL)

+		{

+			(*env)->ReleasePrimitiveArrayCritical(env,  data, ptr1, (isCopiedArray1 == JNI_TRUE)?0:JNI_ABORT);

+		}

+	}

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessBeginPolygon__J_3F (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jfloatArray data)

+	{

+		jboolean isCopiedArray1 = JNI_FALSE;

+		jfloat *ptr1 = NULL;

+

+		if ( disp__gluTessBeginPolygon == NULL ) return;

+

+		if(data!=NULL)

+		{

+			ptr1 = (jfloat *) (*env)->GetPrimitiveArrayCritical(env, data, &isCopiedArray1);

+		}

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessBeginPolygon (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLvoid *) ptr1

+		);

+

+		if(data!=NULL)

+		{

+			(*env)->ReleasePrimitiveArrayCritical(env,  data, ptr1, (isCopiedArray1 == JNI_TRUE)?0:JNI_ABORT);

+		}

+	}

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessBeginPolygon__J_3D (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jdoubleArray data)

+	{

+		jboolean isCopiedArray1 = JNI_FALSE;

+		jdouble *ptr1 = NULL;

+

+		if ( disp__gluTessBeginPolygon == NULL ) return;

+

+		if(data!=NULL)

+		{

+			ptr1 = (jdouble *) (*env)->GetPrimitiveArrayCritical(env, data, &isCopiedArray1);

+		}

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessBeginPolygon (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLvoid *) ptr1

+		);

+

+		if(data!=NULL)

+		{

+			(*env)->ReleasePrimitiveArrayCritical(env,  data, ptr1, (isCopiedArray1 == JNI_TRUE)?0:JNI_ABORT);

+		}

+	}

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessBeginPolygon__J_3Z (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jbooleanArray data)

+	{

+		jboolean isCopiedArray1 = JNI_FALSE;

+		jboolean *ptr1 = NULL;

+

+		if ( disp__gluTessBeginPolygon == NULL ) return;

+

+		if(data!=NULL)

+		{

+			ptr1 = (jboolean *) (*env)->GetPrimitiveArrayCritical(env, data, &isCopiedArray1);

+		}

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessBeginPolygon (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLvoid *) ptr1

+		);

+

+		if(data!=NULL)

+		{

+			(*env)->ReleasePrimitiveArrayCritical(env,  data, ptr1, (isCopiedArray1 == JNI_TRUE)?0:JNI_ABORT);

+		}

+	}

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessBeginPolygon__J_3J (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jlongArray data)

+	{

+		jboolean isCopiedArray1 = JNI_FALSE;

+		jlong *ptr1 = NULL;

+

+		if ( disp__gluTessBeginPolygon == NULL ) return;

+

+		if(data!=NULL)

+		{

+			ptr1 = (jlong *) (*env)->GetPrimitiveArrayCritical(env, data, &isCopiedArray1);

+		}

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessBeginPolygon (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLvoid *) ptr1

+		);

+

+		if(data!=NULL)

+		{

+			(*env)->ReleasePrimitiveArrayCritical(env,  data, ptr1, (isCopiedArray1 == JNI_TRUE)?0:JNI_ABORT);

+		}

+	}

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessBeginPolygon__JLjava_nio_Buffer_2 (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jobject data)

+	{

+		void *ptr1 = NULL;

+

+		if ( disp__gluTessBeginPolygon == NULL ) return;

+

+		if(data!=NULL)

+		{

+			ptr1 = (*env)->GetDirectBufferAddress(env, data);

+			if (ptr1 == NULL) {

+				(*env)->ThrowNew(env, (*env)->FindClass(env, "java/lang/IllegalArgumentException"),

+					"Argument 1 was not a direct buffer");

+				return ;

+			}

+		}

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessBeginPolygon (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLvoid *) ptr1

+		);

+

+	}

+

+/**

+ * Original Function-Prototype :

+ * <pre> 

+   extern void gluTessEndContour ( GLUtesselator * tess ) ;

+ * </pre> 

+ */

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessEndContour (

+		JNIEnv *env, jobject obj,

+		jlong tess)

+	{

+

+		if ( disp__gluTessEndContour == NULL ) return;

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessEndContour (

+			(GLUtesselator *) (PointerHolder) tess

+		);

+

+	}

+

+/**

+ * Original Function-Prototype :

+ * <pre> 

+   extern void gluTessEndPolygon ( GLUtesselator * tess ) ;

+ * </pre> 

+ */

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessEndPolygon (

+		JNIEnv *env, jobject obj,

+		jlong tess)

+	{

+

+		if ( disp__gluTessEndPolygon == NULL ) return;

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessEndPolygon (

+			(GLUtesselator *) (PointerHolder) tess

+		);

+		FreeArrays(env, MEMM_TESSELATOR);

+

+	}

+

+/**

+ * Original Function-Prototype :

+ * <pre> 

+   extern void gluTessNormal ( GLUtesselator * tess , GLdouble valueX , GLdouble valueY , GLdouble valueZ ) ;

+ * </pre> 

+ */

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessNormal (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jdouble valueX,

+		jdouble valueY,

+		jdouble valueZ)

+	{

+

+		if ( disp__gluTessNormal == NULL ) return;

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessNormal (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLdouble) valueX,

+			(GLdouble) valueY,

+			(GLdouble) valueZ

+		);

+

+	}

+

+/**

+ * Original Function-Prototype :

+ * <pre> 

+   extern void gluTessProperty ( GLUtesselator * tess , GLenum which , GLdouble data ) ;

+ * </pre> 

+ */

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessProperty (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jint which,

+		jdouble data)

+	{

+

+		if ( disp__gluTessProperty == NULL ) return;

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessProperty (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLenum) which,

+			(GLdouble) data

+		);

+

+	}

+

+/**

+ * Original Function-Prototype :

+ * <pre> 

+   extern void gluTessVertex ( GLUtesselator * tess , GLdouble * location , GLvoid * data ) ;

+ * </pre> 

+ */

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessVertex__J_3D_3B (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jdoubleArray location,

+		jbyteArray data)

+	{

+		jdouble *ptr1 = NULL;

+		jbyte *ptr2 = NULL;

+

+		if ( disp__gluTessVertex == NULL ) return;

+

+		if(location!=NULL)

+		{

+			ptr1 = (jdouble *) (*env)->GetDoubleArrayElements(env, location, 0);

+			RegisterArray(env, location, ptr1, MEMM_DOUBLE, MEMM_TESSELATOR);

+		}

+		if(data!=NULL)

+		{

+			ptr2 = (jbyte *) (*env)->GetByteArrayElements(env, data, 0);

+			RegisterArray(env, data, ptr2, MEMM_BYTE, MEMM_TESSELATOR);

+		}

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessVertex (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLdouble *) ptr1,

+			(GLvoid *) ptr2

+		);

+	}

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessVertex__J_3D_3S (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jdoubleArray location,

+		jshortArray data)

+	{

+		jdouble *ptr1 = NULL;

+		jshort *ptr2 = NULL;

+

+		if ( disp__gluTessVertex == NULL ) return;

+

+		if(location!=NULL)

+		{

+			ptr1 = (jdouble *) (*env)->GetDoubleArrayElements(env, location, 0);

+			RegisterArray(env, location, ptr1, MEMM_DOUBLE, MEMM_TESSELATOR);

+		}

+		if(data!=NULL)

+		{

+			ptr2 = (jshort *) (*env)->GetShortArrayElements(env, data, 0);

+			RegisterArray(env, data, ptr2, MEMM_SHORT, MEMM_TESSELATOR);

+		}

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessVertex (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLdouble *) ptr1,

+			(GLvoid *) ptr2

+		);

+	}

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessVertex__J_3D_3I (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jdoubleArray location,

+		jintArray data)

+	{

+		jdouble *ptr1 = NULL;

+		jint *ptr2 = NULL;

+

+		if ( disp__gluTessVertex == NULL ) return;

+

+		if(location!=NULL)

+		{

+			ptr1 = (jdouble *) (*env)->GetDoubleArrayElements(env, location, 0);

+			RegisterArray(env, location, ptr1, MEMM_DOUBLE, MEMM_TESSELATOR);

+		}

+		if(data!=NULL)

+		{

+			ptr2 = (jint *) (*env)->GetIntArrayElements(env, data, 0);

+			RegisterArray(env, data, ptr2, MEMM_INT, MEMM_TESSELATOR);

+		}

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessVertex (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLdouble *) ptr1,

+			(GLvoid *) ptr2

+		);

+	}

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessVertex__J_3D_3F (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jdoubleArray location,

+		jfloatArray data)

+	{

+		jdouble *ptr1 = NULL;

+		jfloat *ptr2 = NULL;

+

+		if ( disp__gluTessVertex == NULL ) return;

+

+		if(location!=NULL)

+		{

+			ptr1 = (jdouble *) (*env)->GetDoubleArrayElements(env, location, 0);

+			RegisterArray(env, location, ptr1, MEMM_DOUBLE, MEMM_TESSELATOR);

+		}

+		if(data!=NULL)

+		{

+			ptr2 = (jfloat *) (*env)->GetFloatArrayElements(env, data, 0);

+			RegisterArray(env, data, ptr2, MEMM_FLOAT, MEMM_TESSELATOR);

+		}

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessVertex (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLdouble *) ptr1,

+			(GLvoid *) ptr2

+		);

+	}

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessVertex__J_3D_3D (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jdoubleArray location,

+		jdoubleArray data)

+	{

+		jdouble *ptr1 = NULL;

+		jdouble *ptr2 = NULL;

+

+		if ( disp__gluTessVertex == NULL ) return;

+

+		if(location!=NULL)

+		{

+			ptr1 = (jdouble *) (*env)->GetDoubleArrayElements(env, location, 0);

+			RegisterArray(env, location, ptr1, MEMM_DOUBLE, MEMM_TESSELATOR);

+		}

+		if(data!=NULL)

+		{

+			ptr2 = (jdouble *) (*env)->GetDoubleArrayElements(env, data, 0);

+			RegisterArray(env, data, ptr2, MEMM_DOUBLE, MEMM_TESSELATOR);

+		}

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessVertex (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLdouble *) ptr1,

+			(GLvoid *) ptr2

+		);

+	}

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessVertex__J_3D_3Z (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jdoubleArray location,

+		jbooleanArray data)

+	{

+		jdouble *ptr1 = NULL;

+		jboolean *ptr2 = NULL;

+

+		if ( disp__gluTessVertex == NULL ) return;

+

+		if(location!=NULL)

+		{

+			ptr1 = (jdouble *) (*env)->GetDoubleArrayElements(env, location, 0);

+			RegisterArray(env, location, ptr1, MEMM_DOUBLE, MEMM_TESSELATOR);

+		}

+		if(data!=NULL)

+		{

+			ptr2 = (jboolean *) (*env)->GetBooleanArrayElements(env, data, 0);

+			RegisterArray(env, data, ptr2, MEMM_BOOLEAN, MEMM_TESSELATOR);

+		}

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessVertex (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLdouble *) ptr1,

+			(GLvoid *) ptr2

+		);

+	}

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessVertex__J_3D_3J (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jdoubleArray location,

+		jlongArray data)

+	{

+		jdouble *ptr1 = NULL;

+		jlong *ptr2 = NULL;

+

+		if ( disp__gluTessVertex == NULL ) return;

+

+		if(location!=NULL)

+		{

+			ptr1 = (jdouble *) (*env)->GetDoubleArrayElements(env, location, 0);

+			RegisterArray(env, location, ptr1, MEMM_DOUBLE, MEMM_TESSELATOR);

+		}

+		if(data!=NULL)

+		{

+			ptr2 = (jlong *) (*env)->GetLongArrayElements(env, data, 0);

+			RegisterArray(env, data, ptr2, MEMM_LONG, MEMM_TESSELATOR);

+		}

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessVertex (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLdouble *) ptr1,

+			(GLvoid *) ptr2

+		);

+	}

+	JNIEXPORT void JNICALL

+	Java_gl4java_GLUFunc14JauJNI_gluTessVertex__J_3DLjava_nio_Buffer_2 (

+		JNIEnv *env, jobject obj,

+		jlong tess,

+		jdoubleArray location,

+		jobject data)

+	{

+		jboolean isCopiedArray1 = JNI_FALSE;

+		jdouble *ptr1 = NULL;

+		void *ptr2 = NULL;

+

+		if ( disp__gluTessVertex == NULL ) return;

+

+		if(data!=NULL)

+		{

+			ptr2 = (*env)->GetDirectBufferAddress(env, data);

+			if (ptr2 == NULL) {

+				(*env)->ThrowNew(env, (*env)->FindClass(env, "java/lang/IllegalArgumentException"),

+					"Argument 2 was not a direct buffer");

+				return ;

+			}

+		}

+		if(location!=NULL)

+		{

+			ptr1 = (jdouble *) (*env)->GetPrimitiveArrayCritical(env, location, &isCopiedArray1);

+		}

+		SetCurrentCallbackObject((void *) (PointerHolder) tess);

+		disp__gluTessVertex (

+			(GLUtesselator *) (PointerHolder) tess,

+			(GLdouble *) ptr1,

+			(GLvoid *) ptr2

+		);

+

+		if(location!=NULL)

+		{

+			(*env)->ReleasePrimitiveArrayCritical(env,  location, ptr1, (isCopiedArray1 == JNI_TRUE)?0:JNI_ABORT);

+		}

+	}

+