diff options
author | Sven Gothel <[email protected]> | 2001-11-06 08:13:11 +0000 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2001-11-06 08:13:11 +0000 |
commit | 29a4ca7a93fc2547466a732441b8374a5c99019b (patch) | |
tree | 1cf028bfae15c5aef0a7024b78e53ca313aff245 /C2J/manual | |
parent | 1f5dea284e7202cce1fe1bcde5138ba5e5a7b4bd (diff) |
java.nio, mesa-4.0 (gl1.3)
Diffstat (limited to 'C2J/manual')
-rw-r--r-- | C2J/manual/gl-manualCodedImplJNI.c | 2 | ||||
-rw-r--r-- | C2J/manual/gl-manualCodedImplJNI2.java | 2 | ||||
-rw-r--r-- | C2J/manual/gl-manualCodedVirt1.java | 9 | ||||
-rw-r--r-- | C2J/manual/glu-enum-manualCoded.java | 1 | ||||
-rw-r--r-- | C2J/manual/glu-manualCodedImplJNI.c | 2 | ||||
-rw-r--r-- | C2J/manual/glu-manualCodedImplJNI2.java | 17 | ||||
-rw-r--r-- | C2J/manual/glu-manualCodedVirt.java | 110 |
7 files changed, 10 insertions, 133 deletions
diff --git a/C2J/manual/gl-manualCodedImplJNI.c b/C2J/manual/gl-manualCodedImplJNI.c index 6ac1bea..f3c4209 100644 --- a/C2J/manual/gl-manualCodedImplJNI.c +++ b/C2J/manual/gl-manualCodedImplJNI.c @@ -21,7 +21,7 @@ Java_gl4java_GLFuncJauJNI_glGetString ( JNIEnv *env, jobject obj, } static const char * _gl_lib_vendor_="Jausoft - Sven Goethel Software Development"; -static const char * _gl_lib_version_="2.8.0.0"; +static const char * _gl_lib_version_="2.8.0.8"; JNIEXPORT jstring JNICALL Java_gl4java_GLFuncJauJNI_getNativeVendor ( JNIEnv *env, jobject obj ) diff --git a/C2J/manual/gl-manualCodedImplJNI2.java b/C2J/manual/gl-manualCodedImplJNI2.java index 1339474..0159c32 100644 --- a/C2J/manual/gl-manualCodedImplJNI2.java +++ b/C2J/manual/gl-manualCodedImplJNI2.java @@ -8,7 +8,7 @@ public final String getClassVendor ( ) { return "Jausoft - Sven Goethel Software Development"; } public final String getClassVersion ( ) -{ return "2.8.0.0"; } +{ return "2.8.0.8"; } diff --git a/C2J/manual/gl-manualCodedVirt1.java b/C2J/manual/gl-manualCodedVirt1.java index 7bb01dc..f00c97d 100644 --- a/C2J/manual/gl-manualCodedVirt1.java +++ b/C2J/manual/gl-manualCodedVirt1.java @@ -15,12 +15,3 @@ public interface GLFunc extends GLEnum { -public String glGetString ( int name ) ; - -public String getNativeVendor ( ) ; -public String getNativeVersion ( ) ; - -public String getClassVendor ( ) ; -public String getClassVersion ( ) ; - -public static final String[] GL_PROC_NAMES = { diff --git a/C2J/manual/glu-enum-manualCoded.java b/C2J/manual/glu-enum-manualCoded.java index d8aa45f..49fb85b 100644 --- a/C2J/manual/glu-enum-manualCoded.java +++ b/C2J/manual/glu-enum-manualCoded.java @@ -14,4 +14,5 @@ package gl4java; */ public interface GLUEnum { + public static final double GLU_TESS_MAX_COORD = 1.0e150; diff --git a/C2J/manual/glu-manualCodedImplJNI.c b/C2J/manual/glu-manualCodedImplJNI.c index 8b428ac..f9f8c3b 100644 --- a/C2J/manual/glu-manualCodedImplJNI.c +++ b/C2J/manual/glu-manualCodedImplJNI.c @@ -33,7 +33,7 @@ Java_gl4java_GLUFuncJauJNI_gluGetString ( JNIEnv *env, jobject obj, } static const char * _glu_lib_vendor_="Jausoft - Sven Goethel Software Development"; -static const char * _glu_lib_version_="2.8.0.0"; +static const char * _glu_lib_version_="2.8.0.8"; JNIEXPORT jstring JNICALL Java_gl4java_GLUFuncJauJNI_getNativeVendor ( JNIEnv *env, jobject obj ) diff --git a/C2J/manual/glu-manualCodedImplJNI2.java b/C2J/manual/glu-manualCodedImplJNI2.java index d30c227..c62004c 100644 --- a/C2J/manual/glu-manualCodedImplJNI2.java +++ b/C2J/manual/glu-manualCodedImplJNI2.java @@ -9,7 +9,7 @@ public final String getClassVendor ( ) { return "Jausoft - Sven Goethel Software Development"; } public final String getClassVersion ( ) -{ return "2.8.0.4"; } +{ return "2.8.0.8"; } /** @@ -56,6 +56,11 @@ public final native void gluNurbsCallback( /** +extern void gluNurbsCallbackData (GLUnurbs* nurb, GLvoid* userData); +extern void gluNurbsCallbackDataEXT (GLUnurbs* nurb, GLvoid* userData); +**/ + +/** * The Callback registry function. * To achieve the signature (internal argument signature) * you can use the "javap -s <classname>" toolkit of the JDK ! @@ -158,11 +163,6 @@ public final int gluProject(double objx, double y[] = { 0 }; double z[] = { 0 }; - if(win!=null && win.length>=3) - { - x[0]=win[0]; y[0]=win[1]; z[0]=win[2]; - } - int r = gluProject(objx, objy, objz, modelMatrix, projMatrix, viewport, x, y, z); @@ -213,11 +213,6 @@ public final int gluUnProject(double winx, double y[] = { 0 }; double z[] = { 0 }; - if(obj!=null && obj.length>=3) - { - x[0]=obj[0]; y[0]=obj[1]; z[0]=obj[2]; - } - int r = gluUnProject(winx, winy, winz, modelMatrix, projMatrix, viewport, x, y, z); diff --git a/C2J/manual/glu-manualCodedVirt.java b/C2J/manual/glu-manualCodedVirt.java index 0f5dbae..a598ad3 100644 --- a/C2J/manual/glu-manualCodedVirt.java +++ b/C2J/manual/glu-manualCodedVirt.java @@ -15,113 +15,3 @@ public interface GLUFunc extends GLUEnum { -public String gluErrorString ( int errorCode ) ; - -public String gluGetString ( int name ) ; - -public String getNativeVendor ( ) ; -public String getNativeVersion ( ) ; - -public String getClassVendor ( ) ; -public String getClassVersion ( ) ; - -public long gluNewQuadric( ); -public long gluNewNurbsRenderer( ); -public long gluNewTess( ); - -public void gluQuadricCallback( - long qobj, int which, - Object methodClassInstance, - String methodName, - String signature - ); - -public void gluNurbsCallback( - long nobj, int which, - Object methodClassInstance, - String methodName, - String signature - ); - - -public void gluTessCallback( - long tobj, int which, - Object methodClassInstance, - String methodName, - String signature, - int voidArrayLen1, - int voidArrayLen2, - int voidArrayLen3, - int voidArrayLen4, - int voidArrayLen5 - ); - -public void gluDeleteQuadric( long qobj ); - -public void gluDeleteNurbsRenderer( long nobj ); - -public void gluDeleteTess( long tobj ); - -/** - * Wrapper for original gluProject, - * where the orig. last three arguments are wrapped - * mapped in one array: (winx[1], winy[1], winz[1]) <-> win[3] - * - * @param obj array of the three obj x,y,z input components - * @param win array of the three win x,y,z output components - * @see gl4java.GLUFunc#gluProject - */ -public int gluProject(double obj[], - double[] modelMatrix, - double[] projMatrix, - int[] viewport, - double[] win); - -/** - * Wrapper for original gluProject, - * where the orig. last three arguments are wrapped - * mapped in one array: (winx[1], winy[1], winz[1]) <-> win[3] - * - * @param win array of the three win x,y,z output components - * @see gl4java.GLUFunc#gluProject - */ -public int gluProject(double objx, - double objy, - double objz, - double[] modelMatrix, - double[] projMatrix, - int[] viewport, - double[] win); - -/** - * Wrapper for original gluUnProject, - * where the orig. last three arguments are wrapped - * mapped in one array: (objx[1], objy[1], objz[1]) <-> obj[3] - * - * @param win array of the three win x,y,z input components - * @param obj array of the three obj x,y,z output components - * @see gl4java.GLUFunc#gluUnProject - */ -public int gluUnProject(double win[], - double[] modelMatrix, - double[] projMatrix, - int[] viewport, - double[] obj); - -/** - * Wrapper for original gluUnProject, - * where the orig. last three arguments are wrapped - * mapped in one array: (objx[1], objy[1], objz[1]) <-> obj[3] - * - * @param obj array of the three obj x,y,z output components - * @see gl4java.GLUFunc#gluUnProject - */ -public int gluUnProject(double winx, - double winy, - double winz, - double[] modelMatrix, - double[] projMatrix, - int[] viewport, - double[] obj); - - |