diff options
| author | Sven Gothel <[email protected]> | 2001-02-13 05:32:07 +0000 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2001-02-13 05:32:07 +0000 |
| commit | 3e2b16a820bfe03f8f3837c3aaa615c8c4b7f18c (patch) | |
| tree | d834a05eb37751b4c95045c3021589f2e22fcd9f /C2J | |
| parent | 91bc9d109b2d16e6d42f1fbcc9d3dbca51c40b69 (diff) | |
JAWT Support JDK >=1.3
Diffstat (limited to 'C2J')
| -rw-r--r-- | C2J/C2J.java | 10 | ||||
| -rw-r--r-- | C2J/C2J.jj | 10 | ||||
| -rw-r--r-- | C2J/CFuncVariable.java | 4 | ||||
| -rw-r--r-- | C2J/gl-enum-auto.java | 4 | ||||
| -rw-r--r-- | C2J/gl-funcnames.skel | 4 | ||||
| -rw-r--r-- | C2J/gl-proto-auto.java | 4 | ||||
| -rw-r--r-- | C2J/gl-proto-dynauto-jni12.c | 4 | ||||
| -rw-r--r-- | C2J/gl-proto-dynauto-tst-jni12.c | 4 | ||||
| -rw-r--r-- | C2J/gl-proto-dynauto-tst.c | 4 | ||||
| -rw-r--r-- | C2J/gl-proto-dynauto.c | 4 | ||||
| -rw-r--r-- | C2J/gl-protoVirt-auto.java | 4 | ||||
| -rw-r--r-- | C2J/glu-enum-auto.java | 4 | ||||
| -rw-r--r-- | C2J/glu-proto-auto-jni12.c | 261 | ||||
| -rw-r--r-- | C2J/glu-proto-auto-tst-jni12.c | 261 | ||||
| -rw-r--r-- | C2J/glu-proto-auto-tst.c | 261 | ||||
| -rw-r--r-- | C2J/glu-proto-auto.c | 261 | ||||
| -rw-r--r-- | C2J/glu-proto-auto.java | 117 | ||||
| -rw-r--r-- | C2J/glu-proto-auto.orig.h | 3 | ||||
| -rw-r--r-- | C2J/glu-protoVirt-auto.java | 117 | ||||
| -rw-r--r-- | C2J/manual/glu-manualCodedImplJNI.c | 88 | ||||
| -rw-r--r-- | C2J/manual/glu-manualCodedImplJNI2.java | 16 | ||||
| -rw-r--r-- | C2J/manual/glu-manualCodedVirt.java | 16 |
22 files changed, 607 insertions, 854 deletions
diff --git a/C2J/C2J.java b/C2J/C2J.java index c6105c6..1ae52cf 100644 --- a/C2J/C2J.java +++ b/C2J/C2J.java @@ -3,7 +3,7 @@ import java.util.*; public class C2J implements C2JConstants { - public static final String version = "C2J Parser Version 1.4 Beta" ; + public static final String version = "C2J Parser Version 1.5 Beta" ; public static final String vendor = "Jausoft - Sven Goethel Software Development"; public static final int EXPORT_JNI_JAVA = 1; @@ -673,22 +673,22 @@ import java.util.*; break; case GLUquadricObj: t = jj_consume_token(GLUquadricObj); - typeJava="int"; + typeJava="long"; cSrc += t.image+" "; break; case GLUnurbsObj: t = jj_consume_token(GLUnurbsObj); - typeJava="int"; + typeJava="long"; cSrc += t.image+" "; break; case GLUtesselator: t = jj_consume_token(GLUtesselator); - typeJava="int"; + typeJava="long"; cSrc += t.image+" "; break; case GLUtriangulatorObj: t = jj_consume_token(GLUtriangulatorObj); - typeJava="int"; + typeJava="long"; cSrc += t.image+" "; break; default: @@ -57,7 +57,7 @@ import java.util.*; public class C2J{ - public static final String version = "C2J Parser Version 1.4 Beta" ; + public static final String version = "C2J Parser Version 1.5 Beta" ; public static final String vendor = "Jausoft - Sven Goethel Software Development"; public static final int EXPORT_JNI_JAVA = 1; @@ -636,19 +636,19 @@ CFuncVariable TypeSpecifierGL(CFuncVariable cfvar) : cSrc += t.image+" "; } | t=<GLUquadricObj> - { typeJava="int"; + { typeJava="long"; cSrc += t.image+" "; } | t=<GLUnurbsObj> - { typeJava="int"; + { typeJava="long"; cSrc += t.image+" "; } | t=<GLUtesselator> - { typeJava="int"; + { typeJava="long"; cSrc += t.image+" "; } | t=<GLUtriangulatorObj> - { typeJava="int"; + { typeJava="long"; cSrc += t.image+" "; } ) diff --git a/C2J/CFuncVariable.java b/C2J/CFuncVariable.java index a2e08f0..267420f 100644 --- a/C2J/CFuncVariable.java +++ b/C2J/CFuncVariable.java @@ -174,12 +174,12 @@ public class CFuncVariable res+=typeC; - if(arrayNumber>0||isGLUPtrObject) + if(arrayNumber>0 || isGLUPtrObject) res+=" "; for(j=0; j<arrayNumber; j++) res+="*"; if(isGLUPtrObject) - res+="*"; + res+="*) (PointerHolder"; return res; } } diff --git a/C2J/gl-enum-auto.java b/C2J/gl-enum-auto.java index b5007bb..d26beaf 100644 --- a/C2J/gl-enum-auto.java +++ b/C2J/gl-enum-auto.java @@ -1,5 +1,5 @@ /** - * C2J Parser Version 1.4 Beta + * C2J Parser Version 1.5 Beta * Jausoft - Sven Goethel Software Development * Reading from file: gl-enum-auto.orig.h . . . * Destination-Class: gl4java_GLEnum ! @@ -1314,4 +1314,4 @@ public static final int GL_ZERO = 0x0; public static final int GL_ZOOM_X = 0x0D16; public static final int GL_ZOOM_Y = 0x0D17; -/* C2J Parser Version 1.4 Beta: Java program parsed successfully. */ +/* C2J Parser Version 1.5 Beta: Java program parsed successfully. */ diff --git a/C2J/gl-funcnames.skel b/C2J/gl-funcnames.skel index 22415de..e8073c8 100644 --- a/C2J/gl-funcnames.skel +++ b/C2J/gl-funcnames.skel @@ -1,5 +1,5 @@ /** - * C2J Parser Version 1.4 Beta + * C2J Parser Version 1.5 Beta * Jausoft - Sven Goethel Software Development * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! @@ -442,4 +442,4 @@ "glMultiTexCoord4ivARB", "glMultiTexCoord4sARB", "glMultiTexCoord4svARB", -/* C2J Parser Version 1.4 Beta: Java program parsed successfully. */ +/* C2J Parser Version 1.5 Beta: Java program parsed successfully. */ diff --git a/C2J/gl-proto-auto.java b/C2J/gl-proto-auto.java index c910ac8..a39ef5b 100644 --- a/C2J/gl-proto-auto.java +++ b/C2J/gl-proto-auto.java @@ -1,5 +1,5 @@ /** - * C2J Parser Version 1.4 Beta + * C2J Parser Version 1.5 Beta * Jausoft - Sven Goethel Software Development * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! @@ -6952,4 +6952,4 @@ short[] v ) ; -/* C2J Parser Version 1.4 Beta: Java program parsed successfully. */ +/* C2J Parser Version 1.5 Beta: Java program parsed successfully. */ diff --git a/C2J/gl-proto-dynauto-jni12.c b/C2J/gl-proto-dynauto-jni12.c index ae738d5..97180c6 100644 --- a/C2J/gl-proto-dynauto-jni12.c +++ b/C2J/gl-proto-dynauto-jni12.c @@ -1,5 +1,5 @@ /** - * C2J Parser Version 1.4 Beta + * C2J Parser Version 1.5 Beta * Jausoft - Sven Goethel Software Development * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! @@ -23571,4 +23571,4 @@ } } -/* C2J Parser Version 1.4 Beta: Java program parsed successfully. */ +/* C2J Parser Version 1.5 Beta: Java program parsed successfully. */ diff --git a/C2J/gl-proto-dynauto-tst-jni12.c b/C2J/gl-proto-dynauto-tst-jni12.c index f55d893..7c8cde8 100644 --- a/C2J/gl-proto-dynauto-tst-jni12.c +++ b/C2J/gl-proto-dynauto-tst-jni12.c @@ -1,5 +1,5 @@ /** - * C2J Parser Version 1.4 Beta + * C2J Parser Version 1.5 Beta * Jausoft - Sven Goethel Software Development * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! @@ -26368,4 +26368,4 @@ } } -/* C2J Parser Version 1.4 Beta: Java program parsed successfully. */ +/* C2J Parser Version 1.5 Beta: Java program parsed successfully. */ diff --git a/C2J/gl-proto-dynauto-tst.c b/C2J/gl-proto-dynauto-tst.c index 071b35e..29485e7 100644 --- a/C2J/gl-proto-dynauto-tst.c +++ b/C2J/gl-proto-dynauto-tst.c @@ -1,5 +1,5 @@ /** - * C2J Parser Version 1.4 Beta + * C2J Parser Version 1.5 Beta * Jausoft - Sven Goethel Software Development * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! @@ -26368,4 +26368,4 @@ } } -/* C2J Parser Version 1.4 Beta: Java program parsed successfully. */ +/* C2J Parser Version 1.5 Beta: Java program parsed successfully. */ diff --git a/C2J/gl-proto-dynauto.c b/C2J/gl-proto-dynauto.c index 5c61d43..48a517f 100644 --- a/C2J/gl-proto-dynauto.c +++ b/C2J/gl-proto-dynauto.c @@ -1,5 +1,5 @@ /** - * C2J Parser Version 1.4 Beta + * C2J Parser Version 1.5 Beta * Jausoft - Sven Goethel Software Development * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! @@ -23571,4 +23571,4 @@ } } -/* C2J Parser Version 1.4 Beta: Java program parsed successfully. */ +/* C2J Parser Version 1.5 Beta: Java program parsed successfully. */ diff --git a/C2J/gl-protoVirt-auto.java b/C2J/gl-protoVirt-auto.java index 43f33f9..f0f1686 100644 --- a/C2J/gl-protoVirt-auto.java +++ b/C2J/gl-protoVirt-auto.java @@ -1,5 +1,5 @@ /** - * C2J Parser Version 1.4 Beta + * C2J Parser Version 1.5 Beta * Jausoft - Sven Goethel Software Development * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! @@ -6952,4 +6952,4 @@ short[] v ) ; -/* C2J Parser Version 1.4 Beta: Java program parsed successfully. */ +/* C2J Parser Version 1.5 Beta: Java program parsed successfully. */ diff --git a/C2J/glu-enum-auto.java b/C2J/glu-enum-auto.java index 3f46261..2fe24d2 100644 --- a/C2J/glu-enum-auto.java +++ b/C2J/glu-enum-auto.java @@ -1,5 +1,5 @@ /** - * C2J Parser Version 1.4 Beta + * C2J Parser Version 1.5 Beta * Jausoft - Sven Goethel Software Development * Reading from file: glu-enum-auto.orig.h . . . * Destination-Class: gl4java_GLUEnum ! @@ -111,4 +111,4 @@ public static final int GLU_EDGE_FLAG = GLU_TESS_EDGE_FLAG; public static final int GLU_END = GLU_TESS_END; public static final int GLU_ERROR = GLU_TESS_ERROR; -/* C2J Parser Version 1.4 Beta: Java program parsed successfully. */ +/* C2J Parser Version 1.5 Beta: Java program parsed successfully. */ diff --git a/C2J/glu-proto-auto-jni12.c b/C2J/glu-proto-auto-jni12.c index da4dcd0..6fe27d2 100644 --- a/C2J/glu-proto-auto-jni12.c +++ b/C2J/glu-proto-auto-jni12.c @@ -1,5 +1,5 @@ /** - * C2J Parser Version 1.4 Beta + * C2J Parser Version 1.5 Beta * Jausoft - Sven Goethel Software Development * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! @@ -860,37 +860,18 @@ /** * Original Function-Prototype : * <pre> - extern GLUquadricObj * gluNewQuadric ( void ) ; - * </pre> - */ - JNIEXPORT jint JNICALL - Java_gl4java_GLUFuncJauJNI_gluNewQuadric ( - JNIEnv *env, jobject obj) - { - jint ret; - - - ret = (jint) gluNewQuadric ( - ); - - return ret; - } - -/** - * Original Function-Prototype : - * <pre> extern void gluQuadricDrawStyle ( GLUquadricObj * quadObject , GLenum drawStyle ) ; * </pre> */ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricDrawStyle ( JNIEnv *env, jobject obj, - jint quadObject, + jlong quadObject, jint drawStyle) { gluQuadricDrawStyle ( - (GLUquadricObj *) quadObject, + (GLUquadricObj *) (PointerHolder) quadObject, (GLenum) drawStyle ); @@ -905,12 +886,12 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricOrientation ( JNIEnv *env, jobject obj, - jint quadObject, + jlong quadObject, jint orientation) { gluQuadricOrientation ( - (GLUquadricObj *) quadObject, + (GLUquadricObj *) (PointerHolder) quadObject, (GLenum) orientation ); @@ -925,12 +906,12 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricNormals ( JNIEnv *env, jobject obj, - jint quadObject, + jlong quadObject, jint normals) { gluQuadricNormals ( - (GLUquadricObj *) quadObject, + (GLUquadricObj *) (PointerHolder) quadObject, (GLenum) normals ); @@ -945,12 +926,12 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricTexture ( JNIEnv *env, jobject obj, - jint quadObject, + jlong quadObject, jboolean textureCoords) { gluQuadricTexture ( - (GLUquadricObj *) quadObject, + (GLUquadricObj *) (PointerHolder) quadObject, (GLboolean) textureCoords ); @@ -965,7 +946,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluCylinder ( JNIEnv *env, jobject obj, - jint qobj, + jlong qobj, jdouble baseRadius, jdouble topRadius, jdouble height, @@ -974,7 +955,7 @@ { gluCylinder ( - (GLUquadricObj *) qobj, + (GLUquadricObj *) (PointerHolder) qobj, (GLdouble) baseRadius, (GLdouble) topRadius, (GLdouble) height, @@ -993,14 +974,14 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluSphere ( JNIEnv *env, jobject obj, - jint qobj, + jlong qobj, jdouble radius, jint slices, jint stacks) { gluSphere ( - (GLUquadricObj *) qobj, + (GLUquadricObj *) (PointerHolder) qobj, (GLdouble) radius, (GLint) slices, (GLint) stacks @@ -1017,7 +998,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluDisk ( JNIEnv *env, jobject obj, - jint qobj, + jlong qobj, jdouble innerRadius, jdouble outerRadius, jint slices, @@ -1025,7 +1006,7 @@ { gluDisk ( - (GLUquadricObj *) qobj, + (GLUquadricObj *) (PointerHolder) qobj, (GLdouble) innerRadius, (GLdouble) outerRadius, (GLint) slices, @@ -1043,7 +1024,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluPartialDisk ( JNIEnv *env, jobject obj, - jint qobj, + jlong qobj, jdouble innerRadius, jdouble outerRadius, jint slices, @@ -1053,7 +1034,7 @@ { gluPartialDisk ( - (GLUquadricObj *) qobj, + (GLUquadricObj *) (PointerHolder) qobj, (GLdouble) innerRadius, (GLdouble) outerRadius, (GLint) slices, @@ -1067,32 +1048,13 @@ /** * Original Function-Prototype : * <pre> - extern GLUnurbsObj * gluNewNurbsRenderer ( void ) ; - * </pre> - */ - JNIEXPORT jint JNICALL - Java_gl4java_GLUFuncJauJNI_gluNewNurbsRenderer ( - JNIEnv *env, jobject obj) - { - jint ret; - - - ret = (jint) gluNewNurbsRenderer ( - ); - - return ret; - } - -/** - * Original Function-Prototype : - * <pre> extern void gluLoadSamplingMatrices ( GLUnurbsObj * nobj , const GLfloat modelMatrix [ 16 ] , const GLfloat projMatrix [ 16 ] , const GLint viewport [ 4 ] ) ; * </pre> */ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluLoadSamplingMatrices ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jfloatArray modelMatrix, jfloatArray projMatrix, jintArray viewport) @@ -1114,7 +1076,7 @@ ptr3 = (jint *) (*env)->GetPrimitiveArrayCritical(env, viewport, 0); } gluLoadSamplingMatrices ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (const GLfloat *) ptr1, (const GLfloat *) ptr2, (const GLint *) ptr3 @@ -1143,13 +1105,13 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNurbsProperty ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint property, jfloat value) { gluNurbsProperty ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLenum) property, (GLfloat) value ); @@ -1165,7 +1127,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluGetNurbsProperty ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint property, jfloatArray value) { @@ -1177,7 +1139,7 @@ ptr2 = (jfloat *) (*env)->GetPrimitiveArrayCritical(env, value, &isCopiedArray2); } gluGetNurbsProperty ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLenum) property, (GLfloat *) ptr2 ); @@ -1197,11 +1159,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluBeginCurve ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluBeginCurve ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1215,11 +1177,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluEndCurve ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluEndCurve ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1233,7 +1195,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNurbsCurve ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint nknots, jfloatArray knot, jint stride, @@ -1255,7 +1217,7 @@ ptr4 = (jfloat *) (*env)->GetPrimitiveArrayCritical(env, ctlarray, &isCopiedArray4); } gluNurbsCurve ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLint) nknots, (GLfloat *) ptr2, (GLint) stride, @@ -1283,11 +1245,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluBeginSurface ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluBeginSurface ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1301,11 +1263,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluEndSurface ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluEndSurface ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1319,7 +1281,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNurbsSurface ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint sknot_count, jfloatArray sknot, jint tknot_count, @@ -1351,7 +1313,7 @@ ptr7 = (jfloat *) (*env)->GetPrimitiveArrayCritical(env, ctlarray, &isCopiedArray7); } gluNurbsSurface ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLint) sknot_count, (GLfloat *) ptr2, (GLint) tknot_count, @@ -1387,11 +1349,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluBeginTrim ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluBeginTrim ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1405,11 +1367,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluEndTrim ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluEndTrim ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1423,7 +1385,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluPwlCurve ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint count, jfloatArray array, jint stride, @@ -1437,7 +1399,7 @@ ptr2 = (jfloat *) (*env)->GetPrimitiveArrayCritical(env, array, &isCopiedArray2); } gluPwlCurve ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLint) count, (GLfloat *) ptr2, (GLint) stride, @@ -1453,32 +1415,13 @@ /** * Original Function-Prototype : * <pre> - extern GLUtesselator * gluNewTess ( void ) ; - * </pre> - */ - JNIEXPORT jint JNICALL - Java_gl4java_GLUFuncJauJNI_gluNewTess ( - JNIEnv *env, jobject obj) - { - jint ret; - - - ret = (jint) gluNewTess ( - ); - - return ret; - } - -/** - * Original Function-Prototype : - * <pre> extern void gluTessBeginPolygon ( GLUtesselator * tobj , void * polygon_data ) ; * </pre> */ JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3B ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3B ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jbyteArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1489,7 +1432,7 @@ ptr1 = (jbyte *) (*env)->GetPrimitiveArrayCritical(env, polygon_data, &isCopiedArray1); } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1499,9 +1442,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3S ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3S ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jshortArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1512,7 +1455,7 @@ ptr1 = (jshort *) (*env)->GetPrimitiveArrayCritical(env, polygon_data, &isCopiedArray1); } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1522,9 +1465,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3I ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3I ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jintArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1535,7 +1478,7 @@ ptr1 = (jint *) (*env)->GetPrimitiveArrayCritical(env, polygon_data, &isCopiedArray1); } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1545,9 +1488,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3F ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3F ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jfloatArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1558,7 +1501,7 @@ ptr1 = (jfloat *) (*env)->GetPrimitiveArrayCritical(env, polygon_data, &isCopiedArray1); } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1568,9 +1511,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3D ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3D ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1581,7 +1524,7 @@ ptr1 = (jdouble *) (*env)->GetPrimitiveArrayCritical(env, polygon_data, &isCopiedArray1); } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1591,9 +1534,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3Z ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3Z ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jbooleanArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1604,7 +1547,7 @@ ptr1 = (jboolean *) (*env)->GetPrimitiveArrayCritical(env, polygon_data, &isCopiedArray1); } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1614,9 +1557,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3J ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3J ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jlongArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1627,7 +1570,7 @@ ptr1 = (jlong *) (*env)->GetPrimitiveArrayCritical(env, polygon_data, &isCopiedArray1); } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1646,11 +1589,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessBeginContour ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluTessBeginContour ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } @@ -1662,9 +1605,9 @@ * </pre> */ JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3B ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3B ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jbyteArray vertex_data) { @@ -1682,7 +1625,7 @@ ptr2 = (jbyte *) (*env)->GetPrimitiveArrayCritical(env, vertex_data, &isCopiedArray2); } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -1697,9 +1640,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3S ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3S ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jshortArray vertex_data) { @@ -1717,7 +1660,7 @@ ptr2 = (jshort *) (*env)->GetPrimitiveArrayCritical(env, vertex_data, &isCopiedArray2); } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -1732,9 +1675,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3I ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3I ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jintArray vertex_data) { @@ -1752,7 +1695,7 @@ ptr2 = (jint *) (*env)->GetPrimitiveArrayCritical(env, vertex_data, &isCopiedArray2); } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -1767,9 +1710,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3F ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3F ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jfloatArray vertex_data) { @@ -1787,7 +1730,7 @@ ptr2 = (jfloat *) (*env)->GetPrimitiveArrayCritical(env, vertex_data, &isCopiedArray2); } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -1802,9 +1745,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3D ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3D ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jdoubleArray vertex_data) { @@ -1822,7 +1765,7 @@ ptr2 = (jdouble *) (*env)->GetPrimitiveArrayCritical(env, vertex_data, &isCopiedArray2); } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -1837,9 +1780,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3Z ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3Z ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jbooleanArray vertex_data) { @@ -1857,7 +1800,7 @@ ptr2 = (jboolean *) (*env)->GetPrimitiveArrayCritical(env, vertex_data, &isCopiedArray2); } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -1872,9 +1815,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3J ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3J ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jlongArray vertex_data) { @@ -1892,7 +1835,7 @@ ptr2 = (jlong *) (*env)->GetPrimitiveArrayCritical(env, vertex_data, &isCopiedArray2); } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -1916,11 +1859,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessEndContour ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluTessEndContour ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } @@ -1934,11 +1877,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessEndPolygon ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluTessEndPolygon ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } @@ -1952,13 +1895,13 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessProperty ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jint which, jdouble value) { gluTessProperty ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLenum) which, (GLdouble) value ); @@ -1974,14 +1917,14 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessNormal ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdouble x, jdouble y, jdouble z) { gluTessNormal ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble) x, (GLdouble) y, (GLdouble) z @@ -1998,7 +1941,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluGetTessProperty ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jint which, jdoubleArray value) { @@ -2010,7 +1953,7 @@ ptr2 = (jdouble *) (*env)->GetPrimitiveArrayCritical(env, value, &isCopiedArray2); } gluGetTessProperty ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLenum) which, (GLdouble *) ptr2 ); @@ -2030,11 +1973,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluBeginPolygon ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluBeginPolygon ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } @@ -2048,12 +1991,12 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNextContour ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jint type) { gluNextContour ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLenum) type ); @@ -2068,13 +2011,13 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluEndPolygon ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluEndPolygon ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } -/* C2J Parser Version 1.4 Beta: Java program parsed successfully. */ +/* C2J Parser Version 1.5 Beta: Java program parsed successfully. */ diff --git a/C2J/glu-proto-auto-tst-jni12.c b/C2J/glu-proto-auto-tst-jni12.c index c56efed..1c371f0 100644 --- a/C2J/glu-proto-auto-tst-jni12.c +++ b/C2J/glu-proto-auto-tst-jni12.c @@ -1,5 +1,5 @@ /** - * C2J Parser Version 1.4 Beta + * C2J Parser Version 1.5 Beta * Jausoft - Sven Goethel Software Development * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! @@ -1026,37 +1026,18 @@ /** * Original Function-Prototype : * <pre> - extern GLUquadricObj * gluNewQuadric ( void ) ; - * </pre> - */ - JNIEXPORT jint JNICALL - Java_gl4java_GLUFuncJauJNI_gluNewQuadric ( - JNIEnv *env, jobject obj) - { - jint ret; - - - ret = (jint) gluNewQuadric ( - ); - - return ret; - } - -/** - * Original Function-Prototype : - * <pre> extern void gluQuadricDrawStyle ( GLUquadricObj * quadObject , GLenum drawStyle ) ; * </pre> */ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricDrawStyle ( JNIEnv *env, jobject obj, - jint quadObject, + jlong quadObject, jint drawStyle) { gluQuadricDrawStyle ( - (GLUquadricObj *) quadObject, + (GLUquadricObj *) (PointerHolder) quadObject, (GLenum) drawStyle ); @@ -1071,12 +1052,12 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricOrientation ( JNIEnv *env, jobject obj, - jint quadObject, + jlong quadObject, jint orientation) { gluQuadricOrientation ( - (GLUquadricObj *) quadObject, + (GLUquadricObj *) (PointerHolder) quadObject, (GLenum) orientation ); @@ -1091,12 +1072,12 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricNormals ( JNIEnv *env, jobject obj, - jint quadObject, + jlong quadObject, jint normals) { gluQuadricNormals ( - (GLUquadricObj *) quadObject, + (GLUquadricObj *) (PointerHolder) quadObject, (GLenum) normals ); @@ -1111,12 +1092,12 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricTexture ( JNIEnv *env, jobject obj, - jint quadObject, + jlong quadObject, jboolean textureCoords) { gluQuadricTexture ( - (GLUquadricObj *) quadObject, + (GLUquadricObj *) (PointerHolder) quadObject, (GLboolean) textureCoords ); @@ -1131,7 +1112,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluCylinder ( JNIEnv *env, jobject obj, - jint qobj, + jlong qobj, jdouble baseRadius, jdouble topRadius, jdouble height, @@ -1140,7 +1121,7 @@ { gluCylinder ( - (GLUquadricObj *) qobj, + (GLUquadricObj *) (PointerHolder) qobj, (GLdouble) baseRadius, (GLdouble) topRadius, (GLdouble) height, @@ -1159,14 +1140,14 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluSphere ( JNIEnv *env, jobject obj, - jint qobj, + jlong qobj, jdouble radius, jint slices, jint stacks) { gluSphere ( - (GLUquadricObj *) qobj, + (GLUquadricObj *) (PointerHolder) qobj, (GLdouble) radius, (GLint) slices, (GLint) stacks @@ -1183,7 +1164,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluDisk ( JNIEnv *env, jobject obj, - jint qobj, + jlong qobj, jdouble innerRadius, jdouble outerRadius, jint slices, @@ -1191,7 +1172,7 @@ { gluDisk ( - (GLUquadricObj *) qobj, + (GLUquadricObj *) (PointerHolder) qobj, (GLdouble) innerRadius, (GLdouble) outerRadius, (GLint) slices, @@ -1209,7 +1190,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluPartialDisk ( JNIEnv *env, jobject obj, - jint qobj, + jlong qobj, jdouble innerRadius, jdouble outerRadius, jint slices, @@ -1219,7 +1200,7 @@ { gluPartialDisk ( - (GLUquadricObj *) qobj, + (GLUquadricObj *) (PointerHolder) qobj, (GLdouble) innerRadius, (GLdouble) outerRadius, (GLint) slices, @@ -1233,32 +1214,13 @@ /** * Original Function-Prototype : * <pre> - extern GLUnurbsObj * gluNewNurbsRenderer ( void ) ; - * </pre> - */ - JNIEXPORT jint JNICALL - Java_gl4java_GLUFuncJauJNI_gluNewNurbsRenderer ( - JNIEnv *env, jobject obj) - { - jint ret; - - - ret = (jint) gluNewNurbsRenderer ( - ); - - return ret; - } - -/** - * Original Function-Prototype : - * <pre> extern void gluLoadSamplingMatrices ( GLUnurbsObj * nobj , const GLfloat modelMatrix [ 16 ] , const GLfloat projMatrix [ 16 ] , const GLint viewport [ 4 ] ) ; * </pre> */ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluLoadSamplingMatrices ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jfloatArray modelMatrix, jfloatArray projMatrix, jintArray viewport) @@ -1298,7 +1260,7 @@ } } gluLoadSamplingMatrices ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (const GLfloat *) ptr1, (const GLfloat *) ptr2, (const GLint *) ptr3 @@ -1327,13 +1289,13 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNurbsProperty ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint property, jfloat value) { gluNurbsProperty ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLenum) property, (GLfloat) value ); @@ -1349,7 +1311,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluGetNurbsProperty ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint property, jfloatArray value) { @@ -1366,7 +1328,7 @@ } } gluGetNurbsProperty ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLenum) property, (GLfloat *) ptr2 ); @@ -1386,11 +1348,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluBeginCurve ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluBeginCurve ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1404,11 +1366,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluEndCurve ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluEndCurve ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1422,7 +1384,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNurbsCurve ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint nknots, jfloatArray knot, jint stride, @@ -1454,7 +1416,7 @@ } } gluNurbsCurve ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLint) nknots, (GLfloat *) ptr2, (GLint) stride, @@ -1482,11 +1444,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluBeginSurface ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluBeginSurface ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1500,11 +1462,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluEndSurface ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluEndSurface ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1518,7 +1480,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNurbsSurface ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint sknot_count, jfloatArray sknot, jint tknot_count, @@ -1565,7 +1527,7 @@ } } gluNurbsSurface ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLint) sknot_count, (GLfloat *) ptr2, (GLint) tknot_count, @@ -1601,11 +1563,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluBeginTrim ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluBeginTrim ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1619,11 +1581,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluEndTrim ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluEndTrim ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1637,7 +1599,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluPwlCurve ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint count, jfloatArray array, jint stride, @@ -1656,7 +1618,7 @@ } } gluPwlCurve ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLint) count, (GLfloat *) ptr2, (GLint) stride, @@ -1672,32 +1634,13 @@ /** * Original Function-Prototype : * <pre> - extern GLUtesselator * gluNewTess ( void ) ; - * </pre> - */ - JNIEXPORT jint JNICALL - Java_gl4java_GLUFuncJauJNI_gluNewTess ( - JNIEnv *env, jobject obj) - { - jint ret; - - - ret = (jint) gluNewTess ( - ); - - return ret; - } - -/** - * Original Function-Prototype : - * <pre> extern void gluTessBeginPolygon ( GLUtesselator * tobj , void * polygon_data ) ; * </pre> */ JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3B ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3B ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jbyteArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1713,7 +1656,7 @@ } } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1723,9 +1666,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3S ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3S ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jshortArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1741,7 +1684,7 @@ } } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1751,9 +1694,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3I ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3I ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jintArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1769,7 +1712,7 @@ } } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1779,9 +1722,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3F ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3F ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jfloatArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1797,7 +1740,7 @@ } } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1807,9 +1750,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3D ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3D ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1825,7 +1768,7 @@ } } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1835,9 +1778,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3Z ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3Z ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jbooleanArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1853,7 +1796,7 @@ } } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1863,9 +1806,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3J ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3J ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jlongArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1881,7 +1824,7 @@ } } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1900,11 +1843,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessBeginContour ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluTessBeginContour ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } @@ -1916,9 +1859,9 @@ * </pre> */ JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3B ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3B ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jbyteArray vertex_data) { @@ -1946,7 +1889,7 @@ } } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -1961,9 +1904,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3S ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3S ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jshortArray vertex_data) { @@ -1991,7 +1934,7 @@ } } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -2006,9 +1949,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3I ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3I ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jintArray vertex_data) { @@ -2036,7 +1979,7 @@ } } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -2051,9 +1994,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3F ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3F ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jfloatArray vertex_data) { @@ -2081,7 +2024,7 @@ } } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -2096,9 +2039,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3D ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3D ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jdoubleArray vertex_data) { @@ -2126,7 +2069,7 @@ } } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -2141,9 +2084,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3Z ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3Z ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jbooleanArray vertex_data) { @@ -2171,7 +2114,7 @@ } } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -2186,9 +2129,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3J ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3J ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jlongArray vertex_data) { @@ -2216,7 +2159,7 @@ } } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -2240,11 +2183,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessEndContour ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluTessEndContour ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } @@ -2258,11 +2201,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessEndPolygon ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluTessEndPolygon ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } @@ -2276,13 +2219,13 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessProperty ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jint which, jdouble value) { gluTessProperty ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLenum) which, (GLdouble) value ); @@ -2298,14 +2241,14 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessNormal ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdouble x, jdouble y, jdouble z) { gluTessNormal ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble) x, (GLdouble) y, (GLdouble) z @@ -2322,7 +2265,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluGetTessProperty ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jint which, jdoubleArray value) { @@ -2339,7 +2282,7 @@ } } gluGetTessProperty ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLenum) which, (GLdouble *) ptr2 ); @@ -2359,11 +2302,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluBeginPolygon ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluBeginPolygon ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } @@ -2377,12 +2320,12 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNextContour ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jint type) { gluNextContour ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLenum) type ); @@ -2397,13 +2340,13 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluEndPolygon ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluEndPolygon ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } -/* C2J Parser Version 1.4 Beta: Java program parsed successfully. */ +/* C2J Parser Version 1.5 Beta: Java program parsed successfully. */ diff --git a/C2J/glu-proto-auto-tst.c b/C2J/glu-proto-auto-tst.c index 3af5a20..ebfc6f9 100644 --- a/C2J/glu-proto-auto-tst.c +++ b/C2J/glu-proto-auto-tst.c @@ -1,5 +1,5 @@ /** - * C2J Parser Version 1.4 Beta + * C2J Parser Version 1.5 Beta * Jausoft - Sven Goethel Software Development * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! @@ -1026,37 +1026,18 @@ /** * Original Function-Prototype : * <pre> - extern GLUquadricObj * gluNewQuadric ( void ) ; - * </pre> - */ - JNIEXPORT jint JNICALL - Java_gl4java_GLUFuncJauJNI_gluNewQuadric ( - JNIEnv *env, jobject obj) - { - jint ret; - - - ret = (jint) gluNewQuadric ( - ); - - return ret; - } - -/** - * Original Function-Prototype : - * <pre> extern void gluQuadricDrawStyle ( GLUquadricObj * quadObject , GLenum drawStyle ) ; * </pre> */ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricDrawStyle ( JNIEnv *env, jobject obj, - jint quadObject, + jlong quadObject, jint drawStyle) { gluQuadricDrawStyle ( - (GLUquadricObj *) quadObject, + (GLUquadricObj *) (PointerHolder) quadObject, (GLenum) drawStyle ); @@ -1071,12 +1052,12 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricOrientation ( JNIEnv *env, jobject obj, - jint quadObject, + jlong quadObject, jint orientation) { gluQuadricOrientation ( - (GLUquadricObj *) quadObject, + (GLUquadricObj *) (PointerHolder) quadObject, (GLenum) orientation ); @@ -1091,12 +1072,12 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricNormals ( JNIEnv *env, jobject obj, - jint quadObject, + jlong quadObject, jint normals) { gluQuadricNormals ( - (GLUquadricObj *) quadObject, + (GLUquadricObj *) (PointerHolder) quadObject, (GLenum) normals ); @@ -1111,12 +1092,12 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricTexture ( JNIEnv *env, jobject obj, - jint quadObject, + jlong quadObject, jboolean textureCoords) { gluQuadricTexture ( - (GLUquadricObj *) quadObject, + (GLUquadricObj *) (PointerHolder) quadObject, (GLboolean) textureCoords ); @@ -1131,7 +1112,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluCylinder ( JNIEnv *env, jobject obj, - jint qobj, + jlong qobj, jdouble baseRadius, jdouble topRadius, jdouble height, @@ -1140,7 +1121,7 @@ { gluCylinder ( - (GLUquadricObj *) qobj, + (GLUquadricObj *) (PointerHolder) qobj, (GLdouble) baseRadius, (GLdouble) topRadius, (GLdouble) height, @@ -1159,14 +1140,14 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluSphere ( JNIEnv *env, jobject obj, - jint qobj, + jlong qobj, jdouble radius, jint slices, jint stacks) { gluSphere ( - (GLUquadricObj *) qobj, + (GLUquadricObj *) (PointerHolder) qobj, (GLdouble) radius, (GLint) slices, (GLint) stacks @@ -1183,7 +1164,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluDisk ( JNIEnv *env, jobject obj, - jint qobj, + jlong qobj, jdouble innerRadius, jdouble outerRadius, jint slices, @@ -1191,7 +1172,7 @@ { gluDisk ( - (GLUquadricObj *) qobj, + (GLUquadricObj *) (PointerHolder) qobj, (GLdouble) innerRadius, (GLdouble) outerRadius, (GLint) slices, @@ -1209,7 +1190,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluPartialDisk ( JNIEnv *env, jobject obj, - jint qobj, + jlong qobj, jdouble innerRadius, jdouble outerRadius, jint slices, @@ -1219,7 +1200,7 @@ { gluPartialDisk ( - (GLUquadricObj *) qobj, + (GLUquadricObj *) (PointerHolder) qobj, (GLdouble) innerRadius, (GLdouble) outerRadius, (GLint) slices, @@ -1233,32 +1214,13 @@ /** * Original Function-Prototype : * <pre> - extern GLUnurbsObj * gluNewNurbsRenderer ( void ) ; - * </pre> - */ - JNIEXPORT jint JNICALL - Java_gl4java_GLUFuncJauJNI_gluNewNurbsRenderer ( - JNIEnv *env, jobject obj) - { - jint ret; - - - ret = (jint) gluNewNurbsRenderer ( - ); - - return ret; - } - -/** - * Original Function-Prototype : - * <pre> extern void gluLoadSamplingMatrices ( GLUnurbsObj * nobj , const GLfloat modelMatrix [ 16 ] , const GLfloat projMatrix [ 16 ] , const GLint viewport [ 4 ] ) ; * </pre> */ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluLoadSamplingMatrices ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jfloatArray modelMatrix, jfloatArray projMatrix, jintArray viewport) @@ -1298,7 +1260,7 @@ } } gluLoadSamplingMatrices ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (const GLfloat *) ptr1, (const GLfloat *) ptr2, (const GLint *) ptr3 @@ -1327,13 +1289,13 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNurbsProperty ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint property, jfloat value) { gluNurbsProperty ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLenum) property, (GLfloat) value ); @@ -1349,7 +1311,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluGetNurbsProperty ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint property, jfloatArray value) { @@ -1366,7 +1328,7 @@ } } gluGetNurbsProperty ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLenum) property, (GLfloat *) ptr2 ); @@ -1386,11 +1348,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluBeginCurve ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluBeginCurve ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1404,11 +1366,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluEndCurve ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluEndCurve ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1422,7 +1384,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNurbsCurve ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint nknots, jfloatArray knot, jint stride, @@ -1454,7 +1416,7 @@ } } gluNurbsCurve ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLint) nknots, (GLfloat *) ptr2, (GLint) stride, @@ -1482,11 +1444,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluBeginSurface ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluBeginSurface ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1500,11 +1462,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluEndSurface ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluEndSurface ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1518,7 +1480,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNurbsSurface ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint sknot_count, jfloatArray sknot, jint tknot_count, @@ -1565,7 +1527,7 @@ } } gluNurbsSurface ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLint) sknot_count, (GLfloat *) ptr2, (GLint) tknot_count, @@ -1601,11 +1563,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluBeginTrim ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluBeginTrim ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1619,11 +1581,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluEndTrim ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluEndTrim ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1637,7 +1599,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluPwlCurve ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint count, jfloatArray array, jint stride, @@ -1656,7 +1618,7 @@ } } gluPwlCurve ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLint) count, (GLfloat *) ptr2, (GLint) stride, @@ -1672,32 +1634,13 @@ /** * Original Function-Prototype : * <pre> - extern GLUtesselator * gluNewTess ( void ) ; - * </pre> - */ - JNIEXPORT jint JNICALL - Java_gl4java_GLUFuncJauJNI_gluNewTess ( - JNIEnv *env, jobject obj) - { - jint ret; - - - ret = (jint) gluNewTess ( - ); - - return ret; - } - -/** - * Original Function-Prototype : - * <pre> extern void gluTessBeginPolygon ( GLUtesselator * tobj , void * polygon_data ) ; * </pre> */ JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3B ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3B ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jbyteArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1713,7 +1656,7 @@ } } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1723,9 +1666,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3S ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3S ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jshortArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1741,7 +1684,7 @@ } } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1751,9 +1694,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3I ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3I ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jintArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1769,7 +1712,7 @@ } } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1779,9 +1722,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3F ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3F ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jfloatArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1797,7 +1740,7 @@ } } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1807,9 +1750,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3D ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3D ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1825,7 +1768,7 @@ } } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1835,9 +1778,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3Z ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3Z ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jbooleanArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1853,7 +1796,7 @@ } } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1863,9 +1806,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3J ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3J ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jlongArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1881,7 +1824,7 @@ } } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1900,11 +1843,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessBeginContour ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluTessBeginContour ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } @@ -1916,9 +1859,9 @@ * </pre> */ JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3B ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3B ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jbyteArray vertex_data) { @@ -1946,7 +1889,7 @@ } } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -1961,9 +1904,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3S ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3S ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jshortArray vertex_data) { @@ -1991,7 +1934,7 @@ } } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -2006,9 +1949,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3I ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3I ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jintArray vertex_data) { @@ -2036,7 +1979,7 @@ } } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -2051,9 +1994,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3F ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3F ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jfloatArray vertex_data) { @@ -2081,7 +2024,7 @@ } } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -2096,9 +2039,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3D ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3D ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jdoubleArray vertex_data) { @@ -2126,7 +2069,7 @@ } } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -2141,9 +2084,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3Z ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3Z ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jbooleanArray vertex_data) { @@ -2171,7 +2114,7 @@ } } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -2186,9 +2129,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3J ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3J ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jlongArray vertex_data) { @@ -2216,7 +2159,7 @@ } } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -2240,11 +2183,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessEndContour ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluTessEndContour ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } @@ -2258,11 +2201,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessEndPolygon ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluTessEndPolygon ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } @@ -2276,13 +2219,13 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessProperty ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jint which, jdouble value) { gluTessProperty ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLenum) which, (GLdouble) value ); @@ -2298,14 +2241,14 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessNormal ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdouble x, jdouble y, jdouble z) { gluTessNormal ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble) x, (GLdouble) y, (GLdouble) z @@ -2322,7 +2265,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluGetTessProperty ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jint which, jdoubleArray value) { @@ -2339,7 +2282,7 @@ } } gluGetTessProperty ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLenum) which, (GLdouble *) ptr2 ); @@ -2359,11 +2302,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluBeginPolygon ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluBeginPolygon ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } @@ -2377,12 +2320,12 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNextContour ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jint type) { gluNextContour ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLenum) type ); @@ -2397,13 +2340,13 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluEndPolygon ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluEndPolygon ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } -/* C2J Parser Version 1.4 Beta: Java program parsed successfully. */ +/* C2J Parser Version 1.5 Beta: Java program parsed successfully. */ diff --git a/C2J/glu-proto-auto.c b/C2J/glu-proto-auto.c index a17b337..5153bfc 100644 --- a/C2J/glu-proto-auto.c +++ b/C2J/glu-proto-auto.c @@ -1,5 +1,5 @@ /** - * C2J Parser Version 1.4 Beta + * C2J Parser Version 1.5 Beta * Jausoft - Sven Goethel Software Development * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! @@ -860,37 +860,18 @@ /** * Original Function-Prototype : * <pre> - extern GLUquadricObj * gluNewQuadric ( void ) ; - * </pre> - */ - JNIEXPORT jint JNICALL - Java_gl4java_GLUFuncJauJNI_gluNewQuadric ( - JNIEnv *env, jobject obj) - { - jint ret; - - - ret = (jint) gluNewQuadric ( - ); - - return ret; - } - -/** - * Original Function-Prototype : - * <pre> extern void gluQuadricDrawStyle ( GLUquadricObj * quadObject , GLenum drawStyle ) ; * </pre> */ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricDrawStyle ( JNIEnv *env, jobject obj, - jint quadObject, + jlong quadObject, jint drawStyle) { gluQuadricDrawStyle ( - (GLUquadricObj *) quadObject, + (GLUquadricObj *) (PointerHolder) quadObject, (GLenum) drawStyle ); @@ -905,12 +886,12 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricOrientation ( JNIEnv *env, jobject obj, - jint quadObject, + jlong quadObject, jint orientation) { gluQuadricOrientation ( - (GLUquadricObj *) quadObject, + (GLUquadricObj *) (PointerHolder) quadObject, (GLenum) orientation ); @@ -925,12 +906,12 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricNormals ( JNIEnv *env, jobject obj, - jint quadObject, + jlong quadObject, jint normals) { gluQuadricNormals ( - (GLUquadricObj *) quadObject, + (GLUquadricObj *) (PointerHolder) quadObject, (GLenum) normals ); @@ -945,12 +926,12 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricTexture ( JNIEnv *env, jobject obj, - jint quadObject, + jlong quadObject, jboolean textureCoords) { gluQuadricTexture ( - (GLUquadricObj *) quadObject, + (GLUquadricObj *) (PointerHolder) quadObject, (GLboolean) textureCoords ); @@ -965,7 +946,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluCylinder ( JNIEnv *env, jobject obj, - jint qobj, + jlong qobj, jdouble baseRadius, jdouble topRadius, jdouble height, @@ -974,7 +955,7 @@ { gluCylinder ( - (GLUquadricObj *) qobj, + (GLUquadricObj *) (PointerHolder) qobj, (GLdouble) baseRadius, (GLdouble) topRadius, (GLdouble) height, @@ -993,14 +974,14 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluSphere ( JNIEnv *env, jobject obj, - jint qobj, + jlong qobj, jdouble radius, jint slices, jint stacks) { gluSphere ( - (GLUquadricObj *) qobj, + (GLUquadricObj *) (PointerHolder) qobj, (GLdouble) radius, (GLint) slices, (GLint) stacks @@ -1017,7 +998,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluDisk ( JNIEnv *env, jobject obj, - jint qobj, + jlong qobj, jdouble innerRadius, jdouble outerRadius, jint slices, @@ -1025,7 +1006,7 @@ { gluDisk ( - (GLUquadricObj *) qobj, + (GLUquadricObj *) (PointerHolder) qobj, (GLdouble) innerRadius, (GLdouble) outerRadius, (GLint) slices, @@ -1043,7 +1024,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluPartialDisk ( JNIEnv *env, jobject obj, - jint qobj, + jlong qobj, jdouble innerRadius, jdouble outerRadius, jint slices, @@ -1053,7 +1034,7 @@ { gluPartialDisk ( - (GLUquadricObj *) qobj, + (GLUquadricObj *) (PointerHolder) qobj, (GLdouble) innerRadius, (GLdouble) outerRadius, (GLint) slices, @@ -1067,32 +1048,13 @@ /** * Original Function-Prototype : * <pre> - extern GLUnurbsObj * gluNewNurbsRenderer ( void ) ; - * </pre> - */ - JNIEXPORT jint JNICALL - Java_gl4java_GLUFuncJauJNI_gluNewNurbsRenderer ( - JNIEnv *env, jobject obj) - { - jint ret; - - - ret = (jint) gluNewNurbsRenderer ( - ); - - return ret; - } - -/** - * Original Function-Prototype : - * <pre> extern void gluLoadSamplingMatrices ( GLUnurbsObj * nobj , const GLfloat modelMatrix [ 16 ] , const GLfloat projMatrix [ 16 ] , const GLint viewport [ 4 ] ) ; * </pre> */ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluLoadSamplingMatrices ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jfloatArray modelMatrix, jfloatArray projMatrix, jintArray viewport) @@ -1114,7 +1076,7 @@ ptr3 = (*env)->GetIntArrayElements(env, viewport, 0); } gluLoadSamplingMatrices ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (const GLfloat *) ptr1, (const GLfloat *) ptr2, (const GLint *) ptr3 @@ -1143,13 +1105,13 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNurbsProperty ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint property, jfloat value) { gluNurbsProperty ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLenum) property, (GLfloat) value ); @@ -1165,7 +1127,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluGetNurbsProperty ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint property, jfloatArray value) { @@ -1177,7 +1139,7 @@ ptr2 = (*env)->GetFloatArrayElements(env, value, &isCopiedArray2); } gluGetNurbsProperty ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLenum) property, (GLfloat *) ptr2 ); @@ -1197,11 +1159,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluBeginCurve ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluBeginCurve ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1215,11 +1177,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluEndCurve ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluEndCurve ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1233,7 +1195,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNurbsCurve ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint nknots, jfloatArray knot, jint stride, @@ -1255,7 +1217,7 @@ ptr4 = (*env)->GetFloatArrayElements(env, ctlarray, &isCopiedArray4); } gluNurbsCurve ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLint) nknots, (GLfloat *) ptr2, (GLint) stride, @@ -1283,11 +1245,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluBeginSurface ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluBeginSurface ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1301,11 +1263,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluEndSurface ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluEndSurface ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1319,7 +1281,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNurbsSurface ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint sknot_count, jfloatArray sknot, jint tknot_count, @@ -1351,7 +1313,7 @@ ptr7 = (*env)->GetFloatArrayElements(env, ctlarray, &isCopiedArray7); } gluNurbsSurface ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLint) sknot_count, (GLfloat *) ptr2, (GLint) tknot_count, @@ -1387,11 +1349,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluBeginTrim ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluBeginTrim ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1405,11 +1367,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluEndTrim ( JNIEnv *env, jobject obj, - jint nobj) + jlong nobj) { gluEndTrim ( - (GLUnurbsObj *) nobj + (GLUnurbsObj *) (PointerHolder) nobj ); } @@ -1423,7 +1385,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluPwlCurve ( JNIEnv *env, jobject obj, - jint nobj, + jlong nobj, jint count, jfloatArray array, jint stride, @@ -1437,7 +1399,7 @@ ptr2 = (*env)->GetFloatArrayElements(env, array, &isCopiedArray2); } gluPwlCurve ( - (GLUnurbsObj *) nobj, + (GLUnurbsObj *) (PointerHolder) nobj, (GLint) count, (GLfloat *) ptr2, (GLint) stride, @@ -1453,32 +1415,13 @@ /** * Original Function-Prototype : * <pre> - extern GLUtesselator * gluNewTess ( void ) ; - * </pre> - */ - JNIEXPORT jint JNICALL - Java_gl4java_GLUFuncJauJNI_gluNewTess ( - JNIEnv *env, jobject obj) - { - jint ret; - - - ret = (jint) gluNewTess ( - ); - - return ret; - } - -/** - * Original Function-Prototype : - * <pre> extern void gluTessBeginPolygon ( GLUtesselator * tobj , void * polygon_data ) ; * </pre> */ JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3B ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3B ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jbyteArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1489,7 +1432,7 @@ ptr1 = (*env)->GetByteArrayElements(env, polygon_data, &isCopiedArray1); } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1499,9 +1442,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3S ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3S ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jshortArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1512,7 +1455,7 @@ ptr1 = (*env)->GetShortArrayElements(env, polygon_data, &isCopiedArray1); } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1522,9 +1465,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3I ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3I ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jintArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1535,7 +1478,7 @@ ptr1 = (*env)->GetIntArrayElements(env, polygon_data, &isCopiedArray1); } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1545,9 +1488,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3F ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3F ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jfloatArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1558,7 +1501,7 @@ ptr1 = (*env)->GetFloatArrayElements(env, polygon_data, &isCopiedArray1); } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1568,9 +1511,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3D ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3D ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1581,7 +1524,7 @@ ptr1 = (*env)->GetDoubleArrayElements(env, polygon_data, &isCopiedArray1); } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1591,9 +1534,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3Z ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3Z ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jbooleanArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1604,7 +1547,7 @@ ptr1 = (*env)->GetBooleanArrayElements(env, polygon_data, &isCopiedArray1); } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1614,9 +1557,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__I_3J ( + Java_gl4java_GLUFuncJauJNI_gluTessBeginPolygon__J_3J ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jlongArray polygon_data) { jboolean isCopiedArray1 = JNI_FALSE; @@ -1627,7 +1570,7 @@ ptr1 = (*env)->GetLongArrayElements(env, polygon_data, &isCopiedArray1); } gluTessBeginPolygon ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (void *) ptr1 ); @@ -1646,11 +1589,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessBeginContour ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluTessBeginContour ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } @@ -1662,9 +1605,9 @@ * </pre> */ JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3B ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3B ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jbyteArray vertex_data) { @@ -1682,7 +1625,7 @@ ptr2 = (*env)->GetByteArrayElements(env, vertex_data, &isCopiedArray2); } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -1697,9 +1640,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3S ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3S ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jshortArray vertex_data) { @@ -1717,7 +1660,7 @@ ptr2 = (*env)->GetShortArrayElements(env, vertex_data, &isCopiedArray2); } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -1732,9 +1675,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3I ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3I ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jintArray vertex_data) { @@ -1752,7 +1695,7 @@ ptr2 = (*env)->GetIntArrayElements(env, vertex_data, &isCopiedArray2); } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -1767,9 +1710,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3F ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3F ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jfloatArray vertex_data) { @@ -1787,7 +1730,7 @@ ptr2 = (*env)->GetFloatArrayElements(env, vertex_data, &isCopiedArray2); } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -1802,9 +1745,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3D ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3D ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jdoubleArray vertex_data) { @@ -1822,7 +1765,7 @@ ptr2 = (*env)->GetDoubleArrayElements(env, vertex_data, &isCopiedArray2); } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -1837,9 +1780,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3Z ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3Z ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jbooleanArray vertex_data) { @@ -1857,7 +1800,7 @@ ptr2 = (*env)->GetBooleanArrayElements(env, vertex_data, &isCopiedArray2); } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -1872,9 +1815,9 @@ } } JNIEXPORT void JNICALL - Java_gl4java_GLUFuncJauJNI_gluTessVertex__I_3D_3J ( + Java_gl4java_GLUFuncJauJNI_gluTessVertex__J_3D_3J ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdoubleArray coords, jlongArray vertex_data) { @@ -1892,7 +1835,7 @@ ptr2 = (*env)->GetLongArrayElements(env, vertex_data, &isCopiedArray2); } gluTessVertex ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble *) ptr1, (void *) ptr2 ); @@ -1916,11 +1859,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessEndContour ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluTessEndContour ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } @@ -1934,11 +1877,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessEndPolygon ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluTessEndPolygon ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } @@ -1952,13 +1895,13 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessProperty ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jint which, jdouble value) { gluTessProperty ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLenum) which, (GLdouble) value ); @@ -1974,14 +1917,14 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessNormal ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jdouble x, jdouble y, jdouble z) { gluTessNormal ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLdouble) x, (GLdouble) y, (GLdouble) z @@ -1998,7 +1941,7 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluGetTessProperty ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jint which, jdoubleArray value) { @@ -2010,7 +1953,7 @@ ptr2 = (*env)->GetDoubleArrayElements(env, value, &isCopiedArray2); } gluGetTessProperty ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLenum) which, (GLdouble *) ptr2 ); @@ -2030,11 +1973,11 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluBeginPolygon ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluBeginPolygon ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } @@ -2048,12 +1991,12 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNextContour ( JNIEnv *env, jobject obj, - jint tobj, + jlong tobj, jint type) { gluNextContour ( - (GLUtesselator *) tobj, + (GLUtesselator *) (PointerHolder) tobj, (GLenum) type ); @@ -2068,13 +2011,13 @@ JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluEndPolygon ( JNIEnv *env, jobject obj, - jint tobj) + jlong tobj) { gluEndPolygon ( - (GLUtesselator *) tobj + (GLUtesselator *) (PointerHolder) tobj ); } -/* C2J Parser Version 1.4 Beta: Java program parsed successfully. */ +/* C2J Parser Version 1.5 Beta: Java program parsed successfully. */ diff --git a/C2J/glu-proto-auto.java b/C2J/glu-proto-auto.java index 8366474..7fe511c 100644 --- a/C2J/glu-proto-auto.java +++ b/C2J/glu-proto-auto.java @@ -1,5 +1,5 @@ /** - * C2J Parser Version 1.4 Beta + * C2J Parser Version 1.5 Beta * Jausoft - Sven Goethel Software Development * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! @@ -253,20 +253,11 @@ /** * Original Function-Prototype : * <pre> - extern GLUquadricObj * gluNewQuadric ( void ) ; - * </pre> - */ - public final native int gluNewQuadric ( - ) ; - -/** - * Original Function-Prototype : - * <pre> extern void gluQuadricDrawStyle ( GLUquadricObj * quadObject , GLenum drawStyle ) ; * </pre> */ public final native void gluQuadricDrawStyle ( - int quadObject, + long quadObject, int drawStyle ) ; @@ -277,7 +268,7 @@ * </pre> */ public final native void gluQuadricOrientation ( - int quadObject, + long quadObject, int orientation ) ; @@ -288,7 +279,7 @@ * </pre> */ public final native void gluQuadricNormals ( - int quadObject, + long quadObject, int normals ) ; @@ -299,7 +290,7 @@ * </pre> */ public final native void gluQuadricTexture ( - int quadObject, + long quadObject, boolean textureCoords ) ; @@ -310,7 +301,7 @@ * </pre> */ public final native void gluCylinder ( - int qobj, + long qobj, double baseRadius, double topRadius, double height, @@ -325,7 +316,7 @@ * </pre> */ public final native void gluSphere ( - int qobj, + long qobj, double radius, int slices, int stacks @@ -338,7 +329,7 @@ * </pre> */ public final native void gluDisk ( - int qobj, + long qobj, double innerRadius, double outerRadius, int slices, @@ -352,7 +343,7 @@ * </pre> */ public final native void gluPartialDisk ( - int qobj, + long qobj, double innerRadius, double outerRadius, int slices, @@ -364,20 +355,11 @@ /** * Original Function-Prototype : * <pre> - extern GLUnurbsObj * gluNewNurbsRenderer ( void ) ; - * </pre> - */ - public final native int gluNewNurbsRenderer ( - ) ; - -/** - * Original Function-Prototype : - * <pre> extern void gluLoadSamplingMatrices ( GLUnurbsObj * nobj , const GLfloat modelMatrix [ 16 ] , const GLfloat projMatrix [ 16 ] , const GLint viewport [ 4 ] ) ; * </pre> */ public final native void gluLoadSamplingMatrices ( - int nobj, + long nobj, float[] modelMatrix, float[] projMatrix, int[] viewport @@ -390,7 +372,7 @@ * </pre> */ public final native void gluNurbsProperty ( - int nobj, + long nobj, int property, float value ) ; @@ -402,7 +384,7 @@ * </pre> */ public final native void gluGetNurbsProperty ( - int nobj, + long nobj, int property, float[] value ) ; @@ -414,7 +396,7 @@ * </pre> */ public final native void gluBeginCurve ( - int nobj + long nobj ) ; /** @@ -424,7 +406,7 @@ * </pre> */ public final native void gluEndCurve ( - int nobj + long nobj ) ; /** @@ -434,7 +416,7 @@ * </pre> */ public final native void gluNurbsCurve ( - int nobj, + long nobj, int nknots, float[] knot, int stride, @@ -450,7 +432,7 @@ * </pre> */ public final native void gluBeginSurface ( - int nobj + long nobj ) ; /** @@ -460,7 +442,7 @@ * </pre> */ public final native void gluEndSurface ( - int nobj + long nobj ) ; /** @@ -470,7 +452,7 @@ * </pre> */ public final native void gluNurbsSurface ( - int nobj, + long nobj, int sknot_count, float[] sknot, int tknot_count, @@ -490,7 +472,7 @@ * </pre> */ public final native void gluBeginTrim ( - int nobj + long nobj ) ; /** @@ -500,7 +482,7 @@ * </pre> */ public final native void gluEndTrim ( - int nobj + long nobj ) ; /** @@ -510,7 +492,7 @@ * </pre> */ public final native void gluPwlCurve ( - int nobj, + long nobj, int count, float[] array, int stride, @@ -520,44 +502,35 @@ /** * Original Function-Prototype : * <pre> - extern GLUtesselator * gluNewTess ( void ) ; - * </pre> - */ - public final native int gluNewTess ( - ) ; - -/** - * Original Function-Prototype : - * <pre> extern void gluTessBeginPolygon ( GLUtesselator * tobj , void * polygon_data ) ; * </pre> */ public final native void gluTessBeginPolygon ( - int tobj, + long tobj, byte[] polygon_data ) ; public final native void gluTessBeginPolygon ( - int tobj, + long tobj, short[] polygon_data ) ; public final native void gluTessBeginPolygon ( - int tobj, + long tobj, int[] polygon_data ) ; public final native void gluTessBeginPolygon ( - int tobj, + long tobj, float[] polygon_data ) ; public final native void gluTessBeginPolygon ( - int tobj, + long tobj, double[] polygon_data ) ; public final native void gluTessBeginPolygon ( - int tobj, + long tobj, boolean[] polygon_data ) ; public final native void gluTessBeginPolygon ( - int tobj, + long tobj, long[] polygon_data ) ; @@ -568,7 +541,7 @@ * </pre> */ public final native void gluTessBeginContour ( - int tobj + long tobj ) ; /** @@ -578,37 +551,37 @@ * </pre> */ public final native void gluTessVertex ( - int tobj, + long tobj, double[] coords, byte[] vertex_data ) ; public final native void gluTessVertex ( - int tobj, + long tobj, double[] coords, short[] vertex_data ) ; public final native void gluTessVertex ( - int tobj, + long tobj, double[] coords, int[] vertex_data ) ; public final native void gluTessVertex ( - int tobj, + long tobj, double[] coords, float[] vertex_data ) ; public final native void gluTessVertex ( - int tobj, + long tobj, double[] coords, double[] vertex_data ) ; public final native void gluTessVertex ( - int tobj, + long tobj, double[] coords, boolean[] vertex_data ) ; public final native void gluTessVertex ( - int tobj, + long tobj, double[] coords, long[] vertex_data ) ; @@ -620,7 +593,7 @@ * </pre> */ public final native void gluTessEndContour ( - int tobj + long tobj ) ; /** @@ -630,7 +603,7 @@ * </pre> */ public final native void gluTessEndPolygon ( - int tobj + long tobj ) ; /** @@ -640,7 +613,7 @@ * </pre> */ public final native void gluTessProperty ( - int tobj, + long tobj, int which, double value ) ; @@ -652,7 +625,7 @@ * </pre> */ public final native void gluTessNormal ( - int tobj, + long tobj, double x, double y, double z @@ -665,7 +638,7 @@ * </pre> */ public final native void gluGetTessProperty ( - int tobj, + long tobj, int which, double[] value ) ; @@ -677,7 +650,7 @@ * </pre> */ public final native void gluBeginPolygon ( - int tobj + long tobj ) ; /** @@ -687,7 +660,7 @@ * </pre> */ public final native void gluNextContour ( - int tobj, + long tobj, int type ) ; @@ -698,7 +671,7 @@ * </pre> */ public final native void gluEndPolygon ( - int tobj + long tobj ) ; -/* C2J Parser Version 1.4 Beta: Java program parsed successfully. */ +/* C2J Parser Version 1.5 Beta: Java program parsed successfully. */ diff --git a/C2J/glu-proto-auto.orig.h b/C2J/glu-proto-auto.orig.h index 007921c..cf82c09 100644 --- a/C2J/glu-proto-auto.orig.h +++ b/C2J/glu-proto-auto.orig.h @@ -34,7 +34,6 @@ extern GLint gluBuild2DMipmaps( GLenum target, GLint components, GLint width, GLint height, GLenum format, GLenum type, const void *data ); -extern GLUquadricObj* gluNewQuadric( void ); extern void gluQuadricDrawStyle( GLUquadricObj *quadObject, GLenum drawStyle ); extern void gluQuadricOrientation( GLUquadricObj *quadObject, @@ -58,7 +57,6 @@ extern void gluPartialDisk( GLUquadricObj *qobj, GLdouble innerRadius, GLdouble outerRadius, GLint slices, GLint loops, GLdouble startAngle, GLdouble sweepAngle ); -extern GLUnurbsObj* gluNewNurbsRenderer( void ); extern void gluLoadSamplingMatrices( GLUnurbsObj *nobj, const GLfloat modelMatrix[16], const GLfloat projMatrix[16], @@ -87,7 +85,6 @@ extern void gluEndTrim( GLUnurbsObj *nobj ); extern void gluPwlCurve( GLUnurbsObj *nobj, GLint count, GLfloat *array, GLint stride, GLenum type ); -extern GLUtesselator* gluNewTess( void ); extern void gluTessBeginPolygon( GLUtesselator *tobj, void *polygon_data ); extern void gluTessBeginContour( GLUtesselator *tobj ); diff --git a/C2J/glu-protoVirt-auto.java b/C2J/glu-protoVirt-auto.java index 49e8364..a8f9c54 100644 --- a/C2J/glu-protoVirt-auto.java +++ b/C2J/glu-protoVirt-auto.java @@ -1,5 +1,5 @@ /** - * C2J Parser Version 1.4 Beta + * C2J Parser Version 1.5 Beta * Jausoft - Sven Goethel Software Development * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! @@ -253,20 +253,11 @@ /** * Original Function-Prototype : * <pre> - extern GLUquadricObj * gluNewQuadric ( void ) ; - * </pre> - */ - public int gluNewQuadric ( - ) ; - -/** - * Original Function-Prototype : - * <pre> extern void gluQuadricDrawStyle ( GLUquadricObj * quadObject , GLenum drawStyle ) ; * </pre> */ public void gluQuadricDrawStyle ( - int quadObject, + long quadObject, int drawStyle ) ; @@ -277,7 +268,7 @@ * </pre> */ public void gluQuadricOrientation ( - int quadObject, + long quadObject, int orientation ) ; @@ -288,7 +279,7 @@ * </pre> */ public void gluQuadricNormals ( - int quadObject, + long quadObject, int normals ) ; @@ -299,7 +290,7 @@ * </pre> */ public void gluQuadricTexture ( - int quadObject, + long quadObject, boolean textureCoords ) ; @@ -310,7 +301,7 @@ * </pre> */ public void gluCylinder ( - int qobj, + long qobj, double baseRadius, double topRadius, double height, @@ -325,7 +316,7 @@ * </pre> */ public void gluSphere ( - int qobj, + long qobj, double radius, int slices, int stacks @@ -338,7 +329,7 @@ * </pre> */ public void gluDisk ( - int qobj, + long qobj, double innerRadius, double outerRadius, int slices, @@ -352,7 +343,7 @@ * </pre> */ public void gluPartialDisk ( - int qobj, + long qobj, double innerRadius, double outerRadius, int slices, @@ -364,20 +355,11 @@ /** * Original Function-Prototype : * <pre> - extern GLUnurbsObj * gluNewNurbsRenderer ( void ) ; - * </pre> - */ - public int gluNewNurbsRenderer ( - ) ; - -/** - * Original Function-Prototype : - * <pre> extern void gluLoadSamplingMatrices ( GLUnurbsObj * nobj , const GLfloat modelMatrix [ 16 ] , const GLfloat projMatrix [ 16 ] , const GLint viewport [ 4 ] ) ; * </pre> */ public void gluLoadSamplingMatrices ( - int nobj, + long nobj, float[] modelMatrix, float[] projMatrix, int[] viewport @@ -390,7 +372,7 @@ * </pre> */ public void gluNurbsProperty ( - int nobj, + long nobj, int property, float value ) ; @@ -402,7 +384,7 @@ * </pre> */ public void gluGetNurbsProperty ( - int nobj, + long nobj, int property, float[] value ) ; @@ -414,7 +396,7 @@ * </pre> */ public void gluBeginCurve ( - int nobj + long nobj ) ; /** @@ -424,7 +406,7 @@ * </pre> */ public void gluEndCurve ( - int nobj + long nobj ) ; /** @@ -434,7 +416,7 @@ * </pre> */ public void gluNurbsCurve ( - int nobj, + long nobj, int nknots, float[] knot, int stride, @@ -450,7 +432,7 @@ * </pre> */ public void gluBeginSurface ( - int nobj + long nobj ) ; /** @@ -460,7 +442,7 @@ * </pre> */ public void gluEndSurface ( - int nobj + long nobj ) ; /** @@ -470,7 +452,7 @@ * </pre> */ public void gluNurbsSurface ( - int nobj, + long nobj, int sknot_count, float[] sknot, int tknot_count, @@ -490,7 +472,7 @@ * </pre> */ public void gluBeginTrim ( - int nobj + long nobj ) ; /** @@ -500,7 +482,7 @@ * </pre> */ public void gluEndTrim ( - int nobj + long nobj ) ; /** @@ -510,7 +492,7 @@ * </pre> */ public void gluPwlCurve ( - int nobj, + long nobj, int count, float[] array, int stride, @@ -520,44 +502,35 @@ /** * Original Function-Prototype : * <pre> - extern GLUtesselator * gluNewTess ( void ) ; - * </pre> - */ - public int gluNewTess ( - ) ; - -/** - * Original Function-Prototype : - * <pre> extern void gluTessBeginPolygon ( GLUtesselator * tobj , void * polygon_data ) ; * </pre> */ public void gluTessBeginPolygon ( - int tobj, + long tobj, byte[] polygon_data ) ; public void gluTessBeginPolygon ( - int tobj, + long tobj, short[] polygon_data ) ; public void gluTessBeginPolygon ( - int tobj, + long tobj, int[] polygon_data ) ; public void gluTessBeginPolygon ( - int tobj, + long tobj, float[] polygon_data ) ; public void gluTessBeginPolygon ( - int tobj, + long tobj, double[] polygon_data ) ; public void gluTessBeginPolygon ( - int tobj, + long tobj, boolean[] polygon_data ) ; public void gluTessBeginPolygon ( - int tobj, + long tobj, long[] polygon_data ) ; @@ -568,7 +541,7 @@ * </pre> */ public void gluTessBeginContour ( - int tobj + long tobj ) ; /** @@ -578,37 +551,37 @@ * </pre> */ public void gluTessVertex ( - int tobj, + long tobj, double[] coords, byte[] vertex_data ) ; public void gluTessVertex ( - int tobj, + long tobj, double[] coords, short[] vertex_data ) ; public void gluTessVertex ( - int tobj, + long tobj, double[] coords, int[] vertex_data ) ; public void gluTessVertex ( - int tobj, + long tobj, double[] coords, float[] vertex_data ) ; public void gluTessVertex ( - int tobj, + long tobj, double[] coords, double[] vertex_data ) ; public void gluTessVertex ( - int tobj, + long tobj, double[] coords, boolean[] vertex_data ) ; public void gluTessVertex ( - int tobj, + long tobj, double[] coords, long[] vertex_data ) ; @@ -620,7 +593,7 @@ * </pre> */ public void gluTessEndContour ( - int tobj + long tobj ) ; /** @@ -630,7 +603,7 @@ * </pre> */ public void gluTessEndPolygon ( - int tobj + long tobj ) ; /** @@ -640,7 +613,7 @@ * </pre> */ public void gluTessProperty ( - int tobj, + long tobj, int which, double value ) ; @@ -652,7 +625,7 @@ * </pre> */ public void gluTessNormal ( - int tobj, + long tobj, double x, double y, double z @@ -665,7 +638,7 @@ * </pre> */ public void gluGetTessProperty ( - int tobj, + long tobj, int which, double[] value ) ; @@ -677,7 +650,7 @@ * </pre> */ public void gluBeginPolygon ( - int tobj + long tobj ) ; /** @@ -687,7 +660,7 @@ * </pre> */ public void gluNextContour ( - int tobj, + long tobj, int type ) ; @@ -698,7 +671,7 @@ * </pre> */ public void gluEndPolygon ( - int tobj + long tobj ) ; -/* C2J Parser Version 1.4 Beta: Java program parsed successfully. */ +/* C2J Parser Version 1.5 Beta: Java program parsed successfully. */ diff --git a/C2J/manual/glu-manualCodedImplJNI.c b/C2J/manual/glu-manualCodedImplJNI.c index fcb4d00..5f3c925 100644 --- a/C2J/manual/glu-manualCodedImplJNI.c +++ b/C2J/manual/glu-manualCodedImplJNI.c @@ -42,7 +42,7 @@ Java_gl4java_GLUFuncJauJNI_getNativeVersion ( JNIEnv *env, jobject obj ) } static void _AddCallbackNode(JNIEnv *env, - jint qnt_obj, jint which, + jlong qnt_obj, jint which, jobject methodClassInstance, jstring methodName, jstring signature, @@ -61,7 +61,7 @@ static void _AddCallbackNode(JNIEnv *env, AddCallbackNode(env, methodClassInstance, strMethodName, strSignature, arrayLen1, arrayLen2, arrayLen3, arrayLen4, arrayLen5, - (void *)qnt_obj, which, glx); + (void *)((PointerHolder)qnt_obj), which, glx); free(strMethodName); free(strSignature); } @@ -69,7 +69,7 @@ static void _AddCallbackNode(JNIEnv *env, JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluQuadricCallback( JNIEnv *env, jobject obj, - jint qobj, jint which, + jlong qobj, jint which, jobject methodClassInstance, jstring methodName, jstring signature) @@ -77,8 +77,8 @@ Java_gl4java_GLUFuncJauJNI_gluQuadricCallback( JNIEnv *env, jobject obj, switch(which) { case GLU_ERROR: - gluQuadricCallback((void *)qobj, which, - cbf_GLU_ERROR ); + gluQuadricCallback((void *)((PointerHolder)qobj), + which, cbf_GLU_ERROR ); break; default: jnitoolsThrowByName(env, "java/lang/IllegalArgumentException", "Wrong Callback-Function type (\"which\") !"); @@ -93,7 +93,7 @@ Java_gl4java_GLUFuncJauJNI_gluQuadricCallback( JNIEnv *env, jobject obj, JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluNurbsCallback( JNIEnv *env, jobject obj, - jint nobj, jint which, + jlong nobj, jint which, jobject methodClassInstance, jstring methodName, jstring signature) @@ -101,7 +101,7 @@ Java_gl4java_GLUFuncJauJNI_gluNurbsCallback( JNIEnv *env, jobject obj, switch(which) { case GLU_ERROR: - gluNurbsCallback((void *)nobj, which, + gluNurbsCallback((void *)((PointerHolder)nobj), which, cbf_GLU_ERROR ); break; default: @@ -116,7 +116,7 @@ Java_gl4java_GLUFuncJauJNI_gluNurbsCallback( JNIEnv *env, jobject obj, JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluTessCallback( JNIEnv *env, jobject obj, - jint tobj, jint which, + jlong tobj, jint which, jobject methodClassInstance, jstring methodName, jstring signature, @@ -129,51 +129,63 @@ Java_gl4java_GLUFuncJauJNI_gluTessCallback( JNIEnv *env, jobject obj, switch(which) { case GLU_TESS_BEGIN: - gluTessCallback((GLUtesselator *)tobj, which, + gluTessCallback((GLUtesselator *)((PointerHolder)tobj), + which, cbf_GLU_TESS_BEGIN ); break; case GLU_TESS_BEGIN_DATA: - gluTessCallback((GLUtesselator *)tobj, which, + gluTessCallback((GLUtesselator *)((PointerHolder)tobj), + which, cbf_GLU_TESS_BEGIN_DATA ); break; case GLU_TESS_EDGE_FLAG: - gluTessCallback((GLUtesselator *)tobj, which, + gluTessCallback((GLUtesselator *)((PointerHolder)tobj), + which, cbf_GLU_TESS_EDGE_FLAG ); break; case GLU_TESS_EDGE_FLAG_DATA: - gluTessCallback((GLUtesselator *)tobj, which, + gluTessCallback((GLUtesselator *)((PointerHolder)tobj), + which, cbf_GLU_TESS_EDGE_FLAG_DATA ); break; case GLU_TESS_VERTEX: - gluTessCallback((GLUtesselator *)tobj, which, + gluTessCallback((GLUtesselator *)((PointerHolder)tobj), + which, cbf_GLU_TESS_VERTEX ); break; case GLU_TESS_VERTEX_DATA: - gluTessCallback((GLUtesselator *)tobj, which, + gluTessCallback((GLUtesselator *)((PointerHolder)tobj), + which, cbf_GLU_TESS_VERTEX_DATA ); break; case GLU_TESS_END: - gluTessCallback((GLUtesselator *)tobj, which, + gluTessCallback((GLUtesselator *)((PointerHolder)tobj), + which, cbf_GLU_TESS_END ); break; case GLU_TESS_END_DATA: - gluTessCallback((GLUtesselator *)tobj, which, + gluTessCallback((GLUtesselator *)((PointerHolder)tobj), + which, cbf_GLU_TESS_END_DATA ); break; case GLU_TESS_ERROR: - gluTessCallback((GLUtesselator *)tobj, which, + gluTessCallback((GLUtesselator *)((PointerHolder)tobj), + which, cbf_GLU_TESS_ERROR ); break; case GLU_TESS_ERROR_DATA: - gluTessCallback((GLUtesselator *)tobj, which, + gluTessCallback((GLUtesselator *)((PointerHolder)tobj), + which, cbf_GLU_TESS_ERROR_DATA ); break; case GLU_TESS_COMBINE: - gluTessCallback((GLUtesselator *)tobj, which, + gluTessCallback((GLUtesselator *)((PointerHolder)tobj), + which, cbf_GLU_TESS_COMBINE ); break; case GLU_TESS_COMBINE_DATA: - gluTessCallback((GLUtesselator *)tobj, which, + gluTessCallback((GLUtesselator *)((PointerHolder)tobj), + which, cbf_GLU_TESS_COMBINE_DATA ); break; default: @@ -189,25 +201,43 @@ Java_gl4java_GLUFuncJauJNI_gluTessCallback( JNIEnv *env, jobject obj, JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluDeleteQuadric( JNIEnv *env, jobject obj, - jint qobj ) + jlong qobj ) { - gluDeleteQuadric((void *)qobj); - RemoveCallbackNodes((void *)qobj); + gluDeleteQuadric((void *)((PointerHolder)qobj)); + RemoveCallbackNodes((void *)((PointerHolder)qobj)); } JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluDeleteNurbsRenderer( JNIEnv *env, jobject obj, - jint nobj ) + jlong nobj ) { - gluDeleteNurbsRenderer((void *)nobj); - RemoveCallbackNodes((void *)nobj); + gluDeleteNurbsRenderer((void *)((PointerHolder)nobj)); + RemoveCallbackNodes((void *)((PointerHolder)nobj)); } JNIEXPORT void JNICALL Java_gl4java_GLUFuncJauJNI_gluDeleteTess( JNIEnv *env, jobject obj, - jint tobj ) + jlong tobj ) { - gluDeleteTess((GLUtesselator *)tobj); - RemoveCallbackNodes((void *)tobj); + gluDeleteTess((GLUtesselator *)((PointerHolder)tobj)); + RemoveCallbackNodes((void *)((PointerHolder)tobj)); +} + +JNIEXPORT jlong JNICALL +Java_gl4java_GLUFuncJauJNI_gluNewQuadric( JNIEnv *env, jobject obj) +{ + return (jlong)((PointerHolder)gluNewQuadric()); +} + +JNIEXPORT jlong JNICALL +Java_gl4java_GLUFuncJauJNI_gluNewNurbsRenderer( JNIEnv *env, jobject obj) +{ + return (jlong)((PointerHolder)gluNewNurbsRenderer()); +} + +JNIEXPORT jlong JNICALL +Java_gl4java_GLUFuncJauJNI_gluNewTess( JNIEnv *env, jobject obj) +{ + return (jlong)((PointerHolder)gluNewTess()); } diff --git a/C2J/manual/glu-manualCodedImplJNI2.java b/C2J/manual/glu-manualCodedImplJNI2.java index 7559354..0beb75f 100644 --- a/C2J/manual/glu-manualCodedImplJNI2.java +++ b/C2J/manual/glu-manualCodedImplJNI2.java @@ -27,7 +27,7 @@ public final String getClassVersion ( ) * @see GLUFunc#gluNewQuadric */ public final native void gluQuadricCallback( - int qobj, int which, + long qobj, int which, Object methodClassInstance, String methodName, String signature @@ -48,7 +48,7 @@ public final native void gluQuadricCallback( * @see GLUFunc#gluNewNurbsRenderer */ public final native void gluNurbsCallback( - int nobj, int which, + long nobj, int which, Object methodClassInstance, String methodName, String signature @@ -80,7 +80,7 @@ public final native void gluNurbsCallback( * @see GLUFunc#gluNewTess */ public final native void gluTessCallback( - int tobj, int which, + long tobj, int which, Object methodClassInstance, String methodName, String signature, @@ -97,7 +97,7 @@ public final native void gluTessCallback( * @param qobj the quadratic id, for which all callback-methods * should be de-registered */ -public final native void gluDeleteQuadric( int qobj ); +public final native void gluDeleteQuadric( long qobj ); /** * The Callback de-registry function. @@ -105,7 +105,7 @@ public final native void gluDeleteQuadric( int qobj ); * @param nobj the nurbs id, for which all callback-methods * should be de-registered */ -public final native void gluDeleteNurbsRenderer( int nobj ); +public final native void gluDeleteNurbsRenderer( long nobj ); /** * The Callback de-registry function. @@ -113,5 +113,9 @@ public final native void gluDeleteNurbsRenderer( int nobj ); * @param tobj the tesselation id, for which all callback-methods * should be de-registered */ -public final native void gluDeleteTess( int tobj ); +public final native void gluDeleteTess( long tobj ); + +public final native long gluNewQuadric( ); +public final native long gluNewNurbsRenderer( ); +public final native long gluNewTess( ); diff --git a/C2J/manual/glu-manualCodedVirt.java b/C2J/manual/glu-manualCodedVirt.java index 2f77551..e8c3fe2 100644 --- a/C2J/manual/glu-manualCodedVirt.java +++ b/C2J/manual/glu-manualCodedVirt.java @@ -25,15 +25,19 @@ public String getNativeVersion ( ) ; public String getClassVendor ( ) ; public String getClassVersion ( ) ; +public long gluNewQuadric( ); +public long gluNewNurbsRenderer( ); +public long gluNewTess( ); + public void gluQuadricCallback( - int qobj, int which, + long qobj, int which, Object methodClassInstance, String methodName, String signature ); public void gluNurbsCallback( - int nobj, int which, + long nobj, int which, Object methodClassInstance, String methodName, String signature @@ -41,7 +45,7 @@ public void gluNurbsCallback( public void gluTessCallback( - int tobj, int which, + long tobj, int which, Object methodClassInstance, String methodName, String signature, @@ -52,9 +56,9 @@ public void gluTessCallback( int voidArrayLen5 ); -public void gluDeleteQuadric( int qobj ); +public void gluDeleteQuadric( long qobj ); -public void gluDeleteNurbsRenderer( int nobj ); +public void gluDeleteNurbsRenderer( long nobj ); -public void gluDeleteTess( int tobj ); +public void gluDeleteTess( long tobj ); |