Menu
▾
▴
[Java-game-lib-cvs] CVS: LWJGL/src/native/common org_lwjgl_Display.h,1.12,1.13 org_lwjgl_Sys.h,1.6,1.7 org_lwjgl_Window.h,1.3,1.4 org_lwjgl_input_Cursor.h,1.2,1.3 org_lwjgl_input_Keyboard.h,1.3,1.4 org_lwjgl_opengl_BaseGL.h,1.9,1.10 org_lwjgl_opengl_CoreGL.cpp,1.7,1.8 org_lwjgl_opengl_CoreGL.h,1.7,1.8 org_lwjgl_opengl_GL.cpp,1.7,1.8 org_lwjgl_opengl_GL.h,1.4,1.5 org_lwjgl_opengl_GLU.cpp,1.5,1.6 org_lwjgl_opengl_GLU.h,1.5,1.6
|
From: Elias N. <eli...@us...> - 2003-06-24 12:25:00
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/native/common Modified Files: org_lwjgl_Display.h org_lwjgl_Sys.h org_lwjgl_Window.h org_lwjgl_input_Cursor.h org_lwjgl_input_Keyboard.h org_lwjgl_opengl_BaseGL.h org_lwjgl_opengl_CoreGL.cpp org_lwjgl_opengl_CoreGL.h org_lwjgl_opengl_GL.cpp org_lwjgl_opengl_GL.h org_lwjgl_opengl_GLU.cpp org_lwjgl_opengl_GLU.h Log Message: Ported OpenGL to Buffers Index: org_lwjgl_Display.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Display.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Display.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- org_lwjgl_Display.h 27 May 2003 14:12:10 -0000 1.12 +++ org_lwjgl_Display.h 24 Jun 2003 12:24:55 -0000 1.13 @@ -70,10 +70,10 @@ /* * Class: org_lwjgl_Display * Method: setGammaRamp - * Signature: (I)Z + * Signature: (Ljava/nio/FloatBuffer;)Z */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_Display_setGammaRamp - (JNIEnv *, jclass, jint); + (JNIEnv *, jclass, jobject); #ifdef __cplusplus } Index: org_lwjgl_Sys.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Sys.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Sys.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- org_lwjgl_Sys.h 3 Apr 2003 20:20:28 -0000 1.6 +++ org_lwjgl_Sys.h 24 Jun 2003 12:24:55 -0000 1.7 @@ -24,26 +24,10 @@ /* * Class: org_lwjgl_Sys * Method: nGetNULLValue - * Signature: ()I + * Signature: ()Ljava/nio/ByteBuffer; */ -JNIEXPORT jint JNICALL Java_org_lwjgl_Sys_nGetNULLValue +JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_nGetNULLValue (JNIEnv *, jclass); - -/* - * Class: org_lwjgl_Sys - * Method: getDirectBufferAddress - * Signature: (Ljava/nio/Buffer;)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_Sys_getDirectBufferAddress - (JNIEnv *, jclass, jobject); - -/* - * Class: org_lwjgl_Sys - * Method: createDirectBuffer - * Signature: (II)Ljava/nio/ByteBuffer; - */ -JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_createDirectBuffer - (JNIEnv *, jclass, jint, jint); /* * Class: org_lwjgl_Sys Index: org_lwjgl_Window.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Window.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Window.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_Window.h 4 Jun 2003 21:46:13 -0000 1.3 +++ org_lwjgl_Window.h 24 Jun 2003 12:24:55 -0000 1.4 @@ -7,7 +7,9 @@ #ifdef __cplusplus extern "C" { #endif +/* Inaccessible static: _00024assertionsDisabled */ /* Inaccessible static: currentWindow */ +/* Inaccessible static: class_00024org_00024lwjgl_00024Window */ /* * Class: org_lwjgl_Window * Method: nSetTitle @@ -16,29 +18,29 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Window_nSetTitle (JNIEnv *, jobject, jstring); -/* - * Class: org_lwjgl_Window - * Method: tick - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_Window_tick - (JNIEnv *, jobject); - -/* - * Class: org_lwjgl_Window - * Method: minimize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_Window_minimize - (JNIEnv *, jobject); - -/* - * Class: org_lwjgl_Window - * Method: restore - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_Window_restore - (JNIEnv *, jobject); +/* + * Class: org_lwjgl_Window + * Method: minimize + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_Window_minimize + (JNIEnv *, jobject); + +/* + * Class: org_lwjgl_Window + * Method: restore + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_Window_restore + (JNIEnv *, jobject); + +/* + * Class: org_lwjgl_Window + * Method: tick + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_Window_tick + (JNIEnv *, jobject); #ifdef __cplusplus } Index: org_lwjgl_input_Cursor.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Cursor.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Cursor.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_input_Cursor.h 20 May 2003 12:20:12 -0000 1.2 +++ org_lwjgl_input_Cursor.h 24 Jun 2003 12:24:55 -0000 1.3 @@ -12,10 +12,10 @@ /* * Class: org_lwjgl_input_Cursor * Method: nCreateCursor - * Signature: (IIIIIII)I + * Signature: (IIIIILjava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)I */ JNIEXPORT jint JNICALL Java_org_lwjgl_input_Cursor_nCreateCursor - (JNIEnv *, jclass, jint, jint, jint, jint, jint, jint, jint); + (JNIEnv *, jclass, jint, jint, jint, jint, jint, jobject, jobject); /* * Class: org_lwjgl_input_Cursor Index: org_lwjgl_input_Keyboard.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Keyboard.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Keyboard.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_input_Keyboard.h 7 Jun 2003 12:47:19 -0000 1.3 +++ org_lwjgl_input_Keyboard.h 24 Jun 2003 12:24:55 -0000 1.4 @@ -258,9 +258,9 @@ #define org_lwjgl_input_Keyboard_KEY_POWER 222L #undef org_lwjgl_input_Keyboard_KEY_SLEEP #define org_lwjgl_input_Keyboard_KEY_SLEEP 223L +/* Inaccessible static: keyName */ /* Inaccessible static: created */ /* Inaccessible static: keyDownBuffer */ -/* Inaccessible static: keyDownAddress */ /* Inaccessible static: readBuffer */ /* Inaccessible static: translationEnabled */ /* Inaccessible static: numEvents */ @@ -295,10 +295,10 @@ /* * Class: org_lwjgl_input_Keyboard * Method: nPoll - * Signature: (I)V + * Signature: (Ljava/nio/ByteBuffer;)V */ JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nPoll - (JNIEnv *, jclass, jint); + (JNIEnv *, jclass, jobject); /* * Class: org_lwjgl_input_Keyboard @@ -311,7 +311,7 @@ /* * Class: org_lwjgl_input_Keyboard * Method: nEnableTranslation - * Signature: ()V + * Signature: ()Z */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Keyboard_nEnableTranslation (JNIEnv *, jclass); Index: org_lwjgl_opengl_BaseGL.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_BaseGL.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_BaseGL.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- org_lwjgl_opengl_BaseGL.h 26 Apr 2003 06:54:31 -0000 1.9 +++ org_lwjgl_opengl_BaseGL.h 24 Jun 2003 12:24:55 -0000 1.10 @@ -7,7 +7,9 @@ #ifdef __cplusplus extern "C" { #endif +/* Inaccessible static: _00024assertionsDisabled */ /* Inaccessible static: currentWindow */ +/* Inaccessible static: class_00024org_00024lwjgl_00024Window */ /* * Class: org_lwjgl_opengl_BaseGL * Method: swapBuffers Index: org_lwjgl_opengl_CoreGL.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- org_lwjgl_opengl_CoreGL.cpp 16 Mar 2003 17:37:18 -0000 1.7 +++ org_lwjgl_opengl_CoreGL.cpp 24 Jun 2003 12:24:55 -0000 1.8 @@ -49,9 +49,9 @@ /* * Class: org_lwjgl_opengl_CoreGL - * Method: accum + * Method: glAccum */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL_accum(JNIEnv * env, jobject obj, jint p0, jfloat p1) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL_glAccum(JNIEnv * env, jclass clazz, jint p0, jfloat p1) { glAccum((GLint) p0, (GLfloat) p1); CHECK_GL_ERROR [...5670 lines suppressed...] CHECK_EXISTS(glMultTransposeMatrixf) - glMultTransposeMatrixf((float *)m); + const GLfloat *address = (const GLfloat *)env->GetDirectBufferAddress(buffer); + glMultTransposeMatrixf(address); CHECK_GL_ERROR } /* * Class: org_lwjgl_opengl_CoreGL - * Method: sampleCoverage + * Method: glSampleCoverage * Signature: (FZ)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL_sampleCoverage - (JNIEnv *env, jobject obj, jfloat value, jboolean invert) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL_glSampleCoverage + (JNIEnv *env, jclass clazz, jfloat value, jboolean invert) { CHECK_EXISTS(glSampleCoverage) glSampleCoverage(value, invert); Index: org_lwjgl_opengl_CoreGL.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- org_lwjgl_opengl_CoreGL.h 17 Feb 2003 15:13:41 -0000 1.7 +++ org_lwjgl_opengl_CoreGL.h 24 Jun 2003 12:24:55 -0000 1.8 @@ -8,3359 +8,3351 @@ extern "C" { #endif /* Inaccessible static: _00024assertionsDisabled */ -/* Inaccessible static: currentContext */ -/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024BaseGL */ +/* Inaccessible static: currentWindow */ +/* Inaccessible static: class_00024org_00024lwjgl_00024Window */ /* * Class: org_lwjgl_opengl_CoreGL - * Method: accum + * Method: glAccum [...4763 lines suppressed...] */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL_multiDrawArrays - (JNIEnv *, jobject, jint, jint, jint, jint); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL_glViewport + (JNIEnv *, jclass, jint, jint, jint, jint); /* * Class: org_lwjgl_opengl_CoreGL - * Method: multiDrawElements - * Signature: (IIIII)V + * Method: glMultiDrawArrays + * Signature: (ILjava/nio/ByteBuffer;Ljava/nio/ByteBuffer;I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL_multiDrawElements - (JNIEnv *, jobject, jint, jint, jint, jint, jint); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL_glMultiDrawArrays + (JNIEnv *, jclass, jint, jobject, jobject, jint); #ifdef __cplusplus } Index: org_lwjgl_opengl_GL.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- org_lwjgl_opengl_GL.cpp 3 Apr 2003 11:32:31 -0000 1.7 +++ org_lwjgl_opengl_GL.cpp 24 Jun 2003 12:24:55 -0000 1.8 @@ -49,9 +49,9 @@ /* * Class: org_lwjgl_opengl_GL - * Method: activeStencilFaceEXT + * Method: glActiveStencilFaceEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_activeStencilFaceEXT(JNIEnv * env, jobject obj, jint p0) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glActiveStencilFaceEXT(JNIEnv * env, jclass clazz, jint p0) { CHECK_EXISTS(glActiveStencilFaceEXT) glActiveStencilFaceEXT((GLint) p0); [...5762 lines suppressed...] } /* * Class: org_lwjgl_opengl_GL - * Method: getBufferPointervARB + * Method: glGetBufferPointervARB * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_getBufferPointervARB(JNIEnv *env, jobject obj, jint target, jint pname, jint params) +JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetBufferPointervARB(JNIEnv *env, jclass clazz, jint target, jint pname, jint size) { CHECK_EXISTS(glGetBufferPointervARB) - glGetBufferPointervARB((GLenum)target, (GLenum)pname, (GLvoid **)params); + void *pointer; + glGetBufferPointervARB((GLenum)target, (GLenum)pname, &pointer); CHECK_GL_ERROR + return env->NewDirectByteBuffer(pointer, size); } /* Index: org_lwjgl_opengl_GL.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- org_lwjgl_opengl_GL.h 3 Apr 2003 11:32:32 -0000 1.4 +++ org_lwjgl_opengl_GL.h 24 Jun 2003 12:24:55 -0000 1.5 @@ -7,7 +7,9 @@ #ifdef __cplusplus extern "C" { #endif +/* Inaccessible static: _00024assertionsDisabled */ /* Inaccessible static: currentWindow */ +/* Inaccessible static: class_00024org_00024lwjgl_00024Window */ /* Inaccessible static: WGL_ARB_buffer_region */ /* Inaccessible static: WGL_ARB_extensions_string */ /* Inaccessible static: WGL_ARB_pbuffer */ @@ -18,3042 +20,3034 @@ /* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024GL */ [...4853 lines suppressed...] */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_getBufferParameterivARB - (JNIEnv *, jobject, jint, jint, jint); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glGetBufferParameterivARB + (JNIEnv *, jclass, jint, jint, jobject); /* * Class: org_lwjgl_opengl_GL - * Method: getBufferPointervARB - * Signature: (III)V + * Method: glGetBufferPointervARB + * Signature: (III)Ljava/nio/ByteBuffer; */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_getBufferPointervARB - (JNIEnv *, jobject, jint, jint, jint); +JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetBufferPointervARB + (JNIEnv *, jclass, jint, jint, jint); /* * Class: org_lwjgl_opengl_GL Index: org_lwjgl_opengl_GLU.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- org_lwjgl_opengl_GLU.cpp 11 Dec 2002 07:16:31 -0000 1.5 +++ org_lwjgl_opengl_GLU.cpp 24 Jun 2003 12:24:55 -0000 1.6 @@ -49,7 +49,7 @@ * Class: org_lwjgl_opengl_GLU * Method: getString */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_opengl_GLU_getString(JNIEnv * env, jobject obj, jint p0) +JNIEXPORT jstring JNICALL Java_org_lwjgl_opengl_GLU_gluGetString(JNIEnv * env, jclass clazz, jint p0) { const char * msg = (const char *) gluGetString((GLint) p0); jstring ret = env->NewStringUTF(msg); @@ -60,7 +60,7 @@ * Class: org_lwjgl_opengl_GLU * Method: errorString */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_opengl_GLU_errorString(JNIEnv * env, jobject obj, jint p0) +JNIEXPORT jstring JNICALL Java_org_lwjgl_opengl_GLU_gluErrorString(JNIEnv * env, jclass clazz, jint p0) { const GLubyte * msg = gluErrorString((GLint) p0); jstring ret = env->NewStringUTF((const char *) msg); @@ -71,7 +71,7 @@ * Class: org_lwjgl_opengl_GLU * Method: ortho2D */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_ortho2D(JNIEnv * env, jobject obj, jdouble p0, jdouble p1, jdouble p2, jdouble p3) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluOrtho2D(JNIEnv * env, jclass clazz, jdouble p0, jdouble p1, jdouble p2, jdouble p3) { gluOrtho2D((GLdouble) p0, (GLdouble) p1, (GLdouble) p2, (GLdouble) p3); CHECK_GL_ERROR @@ -81,7 +81,7 @@ * Class: org_lwjgl_opengl_GLU * Method: perspective */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_perspective(JNIEnv * env, jobject obj, jdouble p0, jdouble p1, jdouble p2, jdouble p3) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluPerspective(JNIEnv * env, jclass clazz, jdouble p0, jdouble p1, jdouble p2, jdouble p3) { gluPerspective((GLdouble) p0, (GLdouble) p1, (GLdouble) p2, (GLdouble) p3); CHECK_GL_ERROR @@ -91,9 +91,10 @@ * Class: org_lwjgl_opengl_GLU * Method: pickMatrix */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_pickMatrix(JNIEnv * env, jobject obj, jdouble p0, jdouble p1, jdouble p2, jdouble p3, jint p4) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluPickMatrix(JNIEnv * env, jclass clazz, jdouble p0, jdouble p1, jdouble p2, jdouble p3, jobject buffer) { - gluPickMatrix((GLdouble) p0, (GLdouble) p1, (GLdouble) p2, (GLdouble) p3, (GLint *) p4); + GLint *address = (GLint *)env->GetDirectBufferAddress(buffer); + gluPickMatrix((GLdouble) p0, (GLdouble) p1, (GLdouble) p2, (GLdouble) p3, address); CHECK_GL_ERROR } @@ -101,7 +102,7 @@ * Class: org_lwjgl_opengl_GLU * Method: lookAt */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_lookAt(JNIEnv * env, jobject obj, jdouble p0, jdouble p1, jdouble p2, jdouble p3, jdouble p4, jdouble p5, jdouble p6, jdouble p7, jdouble p8) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluLookAt(JNIEnv * env, jclass clazz, jdouble p0, jdouble p1, jdouble p2, jdouble p3, jdouble p4, jdouble p5, jdouble p6, jdouble p7, jdouble p8) { gluLookAt((GLdouble) p0, (GLdouble) p1, (GLdouble) p2, (GLdouble) p3, (GLdouble) p4, (GLdouble) p5, (GLdouble) p6, (GLdouble) p7, (GLdouble) p8); CHECK_GL_ERROR @@ -111,9 +112,15 @@ * Class: org_lwjgl_opengl_GLU * Method: project */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_project(JNIEnv * env, jobject obj, jdouble p0, jdouble p1, jdouble p2, jint p3, jint p4, jint p5, jint p6, jint p7, jint p8) +JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluProject(JNIEnv * env, jclass clazz, jdouble p0, jdouble p1, jdouble p2, jobject buffer, jobject buffer2, jobject buffer3, jobject buffer4, jobject buffer5, jobject buffer6) { - jint ret = (jint) gluProject((GLdouble) p0, (GLdouble) p1, (GLdouble) p2, (const GLdouble *) p3, (const GLdouble *) p4, (const GLint *) p5, (GLdouble *) p6, (GLdouble *) p7, (GLdouble *) p8); + const GLdouble *address = (const GLdouble *)env->GetDirectBufferAddress(buffer); + const GLdouble *address2 = (const GLdouble *)env->GetDirectBufferAddress(buffer2); + const GLint *address3 = (const GLint *)env->GetDirectBufferAddress(buffer3); + GLdouble *address4 = (GLdouble *)env->GetDirectBufferAddress(buffer4); + GLdouble *address5 = (GLdouble *)env->GetDirectBufferAddress(buffer5); + GLdouble *address6 = (GLdouble *)env->GetDirectBufferAddress(buffer6); + jint ret = (jint) gluProject((GLdouble) p0, (GLdouble) p1, (GLdouble) p2, address, address2, address3, address4, address5, address6); CHECK_GL_ERROR return ret; } @@ -122,9 +129,15 @@ * Class: org_lwjgl_opengl_GLU * Method: unProject */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_unProject(JNIEnv * env, jobject obj, jdouble p0, jdouble p1, jdouble p2, jint p3, jint p4, jint p5, jint p6, jint p7, jint p8) +JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluUnProject(JNIEnv * env, jclass clazz, jdouble p0, jdouble p1, jdouble p2, jobject buffer, jobject buffer2, jobject buffer3, jobject buffer4, jobject buffer5, jobject buffer6) { - jint ret = (jint) gluUnProject((GLdouble) p0, (GLdouble) p1, (GLdouble) p2, (const GLdouble *) p3, (const GLdouble *) p4, (const GLint *) p5, (GLdouble *) p6, (GLdouble *) p7, (GLdouble *) p8); + const GLdouble *address = (const GLdouble *)env->GetDirectBufferAddress(buffer); + const GLdouble *address2 = (const GLdouble *)env->GetDirectBufferAddress(buffer2); + const GLint *address3 = (const GLint *)env->GetDirectBufferAddress(buffer3); + GLdouble *address4 = (GLdouble *)env->GetDirectBufferAddress(buffer4); + GLdouble *address5 = (GLdouble *)env->GetDirectBufferAddress(buffer5); + GLdouble *address6 = (GLdouble *)env->GetDirectBufferAddress(buffer6); + jint ret = (jint) gluUnProject((GLdouble) p0, (GLdouble) p1, (GLdouble) p2, address, address2, address3, address4, address5, address6); CHECK_GL_ERROR return ret; } @@ -133,9 +146,11 @@ * Class: org_lwjgl_opengl_GLU * Method: scaleImage */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_scaleImage(JNIEnv * env, jobject obj, jint p0, jint p1, jint p2, jint p3, jint p4, jint p5, jint p6, jint p7, jint p8) +JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluScaleImage(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jobject buffer, jint p5, jint p6, jint p7, jobject buffer2) { - jint ret = (jint) gluScaleImage((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (const void *) p4, (GLint) p5, (GLint) p6, (GLint) p7, (void *) p8); + const void *address = (const void *)env->GetDirectBufferAddress(buffer); + void *address2 = (void *)env->GetDirectBufferAddress(buffer2); + jint ret = (jint) gluScaleImage((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, address, (GLint) p5, (GLint) p6, (GLint) p7, address2); CHECK_GL_ERROR return ret; } @@ -144,9 +159,10 @@ * Class: org_lwjgl_opengl_GLU * Method: build1DMipmaps */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_build1DMipmaps(JNIEnv * env, jobject obj, jint p0, jint p1, jint p2, jint p3, jint p4, jint p5) +JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluBuild1DMipmaps(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jint p4, jobject buffer) { - jint ret = (jint) gluBuild1DMipmaps((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (const void *) p5); + const void *address = (const void *)env->GetDirectBufferAddress(buffer); + jint ret = (jint) gluBuild1DMipmaps((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, address); CHECK_GL_ERROR return ret; } @@ -155,9 +171,10 @@ * Class: org_lwjgl_opengl_GLU * Method: build2DMipmaps */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_build2DMipmaps(JNIEnv * env, jobject obj, jint p0, jint p1, jint p2, jint p3, jint p4, jint p5, jint p6) +JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluBuild2DMipmaps(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jint p4, jint p5, jobject buffer) { - jint ret = (jint) gluBuild2DMipmaps((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (GLint) p5, (const void *) p6); + const void *address = (const void *)env->GetDirectBufferAddress(buffer); + jint ret = (jint) gluBuild2DMipmaps((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (GLint) p5, address); CHECK_GL_ERROR return ret; } @@ -166,111 +183,120 @@ * Class: org_lwjgl_opengl_GLU * Method: newQuadric */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_newQuadric(JNIEnv * env, jobject obj) +JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GLU_gluNewQuadric(JNIEnv * env, jclass clazz) { - jint ret = (jint) gluNewQuadric(); - CHECK_GL_ERROR - return ret; + GLUquadricObj *ret = gluNewQuadric(); + CHECK_GL_ERROR + return env->NewDirectByteBuffer(ret, 0); } /* * Class: org_lwjgl_opengl_GLU * Method: cylinder */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_cylinder(JNIEnv * env, jobject obj, jint quad, jdouble baseRadius, jdouble topRadius, jdouble height, jint slices, jint stacks) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluCylinder(JNIEnv * env, jclass clazz, jobject quad, jdouble baseRadius, jdouble topRadius, jdouble height, jint slices, jint stacks) { - gluCylinder((GLUquadricObj *) quad, (GLdouble) baseRadius, (GLdouble) topRadius, (GLdouble) height, (GLint) slices, (GLint) stacks); - CHECK_GL_ERROR + GLUquadricObj *address = (GLUquadricObj *)env->GetDirectBufferAddress(quad); + gluCylinder(address, (GLdouble) baseRadius, (GLdouble) topRadius, (GLdouble) height, (GLint) slices, (GLint) stacks); + CHECK_GL_ERROR } /* * Class: org_lwjgl_opengl_GLU * Method: deleteQuadric */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_deleteQuadric(JNIEnv * env, jobject obj, jint quad) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluDeleteQuadric(JNIEnv * env, jclass clazz, jobject quad) { - gluDeleteQuadric((GLUquadricObj *) quad); - GLUQuadricCallbacks::clear(); - CHECK_GL_ERROR + GLUquadricObj *address = (GLUquadricObj *)env->GetDirectBufferAddress(quad); + gluDeleteQuadric(address); + GLUQuadricCallbacks::clear(); + CHECK_GL_ERROR } /* * Class: org_lwjgl_opengl_GLU * Method: disk */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_disk - (JNIEnv * env, jobject obj, jint quad, jdouble innerRadius, jdouble outerRadius, jint slices, jint loops) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluDisk + (JNIEnv * env, jclass clazz, jobject quad, jdouble innerRadius, jdouble outerRadius, jint slices, jint loops) { - gluDisk((GLUquadricObj *) quad, (GLdouble) innerRadius, (GLdouble) outerRadius, (GLint) slices, (GLint) loops); - CHECK_GL_ERROR + GLUquadricObj *address = (GLUquadricObj *)env->GetDirectBufferAddress(quad); + gluDisk(address, (GLdouble) innerRadius, (GLdouble) outerRadius, (GLint) slices, (GLint) loops); + CHECK_GL_ERROR } /* * Class: org_lwjgl_opengl_GLU * Method: partialDisk */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_partialDisk - (JNIEnv * env, jobject obj, jint quad, jdouble innerRadius, jdouble outerRadius, +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluPartialDisk + (JNIEnv * env, jclass clazz, jobject quad, jdouble innerRadius, jdouble outerRadius, jint slices, jint loops, jdouble startAngle, jdouble sweepAngle) { - gluPartialDisk((GLUquadricObj *) quad, (GLdouble) innerRadius, (GLdouble) outerRadius, - (GLint) slices, (GLint) loops, (GLdouble) startAngle, (GLdouble) sweepAngle); - CHECK_GL_ERROR + GLUquadricObj *address = (GLUquadricObj *)env->GetDirectBufferAddress(quad); + gluPartialDisk(address, (GLdouble) innerRadius, (GLdouble) outerRadius, + (GLint) slices, (GLint) loops, (GLdouble) startAngle, (GLdouble) sweepAngle); + CHECK_GL_ERROR } /* * Class: org_lwjgl_opengl_GLU * Method: quadricDrawStyle */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricDrawStyle - (JNIEnv * env, jobject obj, jint quad, jint drawStyle) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricDrawStyle + (JNIEnv * env, jclass clazz, jobject quad, jint drawStyle) { - gluQuadricDrawStyle((GLUquadricObj *) quad, (GLenum) drawStyle); - CHECK_GL_ERROR + GLUquadricObj *address = (GLUquadricObj *)env->GetDirectBufferAddress(quad); + gluQuadricDrawStyle(address, (GLenum) drawStyle); + CHECK_GL_ERROR } /* * Class: org_lwjgl_opengl_GLU * Method: quadricNormals */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricNormals - (JNIEnv * env, jobject obj, jint quad, jint normals) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricNormals + (JNIEnv * env, jclass clazz, jobject quad, jint normals) { - gluQuadricNormals((GLUquadricObj *) quad, (GLenum) normals); - CHECK_GL_ERROR + GLUquadricObj *address = (GLUquadricObj *)env->GetDirectBufferAddress(quad); + gluQuadricNormals(address, (GLenum) normals); + CHECK_GL_ERROR } /* * Class: org_lwjgl_opengl_GLU * Method: quadricOrientation */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricOrientation - (JNIEnv * env, jobject obj, jint quad, jint orientation) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricOrientation + (JNIEnv * env, jclass clazz, jobject quad, jint orientation) { - gluQuadricOrientation((GLUquadricObj *) quad, (GLenum) orientation); - CHECK_GL_ERROR + GLUquadricObj *address = (GLUquadricObj *)env->GetDirectBufferAddress(quad); + gluQuadricOrientation(address, (GLenum) orientation); + CHECK_GL_ERROR } /* * Class: org_lwjgl_opengl_GLU * Method: quadricTexture */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricTexture - (JNIEnv * env, jobject obj, jint quad, jboolean textureCoords) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricTexture + (JNIEnv * env, jclass clazz, jobject quad, jboolean textureCoords) { - gluQuadricTexture((GLUquadricObj *) quad, (GLboolean) textureCoords); - CHECK_GL_ERROR + GLUquadricObj *address = (GLUquadricObj *)env->GetDirectBufferAddress(quad); + gluQuadricTexture(address, (GLboolean) textureCoords); + CHECK_GL_ERROR } /* * Class: org_lwjgl_opengl_GLU * Method: sphere */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_sphere - (JNIEnv * env, jobject obj, jint quad, jdouble radius, jint slices, jint stacks) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluSphere + (JNIEnv * env, jclass clazz, jobject quad, jdouble radius, jint slices, jint stacks) { - gluSphere((GLUquadricObj *) quad, (GLdouble) radius, (GLint) slices, (GLint) stacks); - CHECK_GL_ERROR + GLUquadricObj *address = (GLUquadricObj *)env->GetDirectBufferAddress(quad); + gluSphere(address, (GLdouble) radius, (GLint) slices, (GLint) stacks); + CHECK_GL_ERROR } /* @@ -278,26 +304,28 @@ * Method: quadricCallback * Signature: (IILjava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricCallback__IILjava_lang_String_2 - (JNIEnv * env, jobject obj, jint quad, jint type, jstring method) +/*JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricCallback__IILjava_lang_String_2 + (JNIEnv * env, jclass clazz, jobject quad, jint type, jstring method) { - GLUQuadricCallbacks::set(quad, - new JavaMethod(env, obj, env->GetStringUTFChars(method, 0)), - type); - CHECK_GL_ERROR + GLUquadricObj *address = (GLUquadricObj *)env->GetDirectBufferAddress(quad); + GLUQuadricCallbacks::set(address, + new JavaMethod(env, obj, env->GetStringUTFChars(method, 0)), + type); + CHECK_GL_ERROR } - +*/ /* * Class: org_lwjgl_opengl_GLU * Method: quadricCallback * Signature: (IILjava/lang/Object;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricCallback__IILjava_lang_Object_2Ljava_lang_String_2 - (JNIEnv * env, jobject obj, jint quad, jint type, jobject target, jstring method) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricCallback__IILjava_lang_Object_2Ljava_lang_String_2 + (JNIEnv * env, jclass clazz, jobject quad, jint type, jobject target, jstring method) { - GLUQuadricCallbacks::set(quad, - new JavaMethod(env, target, env->GetStringUTFChars(method, 0)), - type); - CHECK_GL_ERROR + GLUquadricObj *address = (GLUquadricObj *)env->GetDirectBufferAddress(quad); + GLUQuadricCallbacks::set(address, + new JavaMethod(env, target, env->GetStringUTFChars(method, 0)), + type); + CHECK_GL_ERROR } Index: org_lwjgl_opengl_GLU.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- org_lwjgl_opengl_GLU.h 30 Nov 2002 03:28:30 -0000 1.5 +++ org_lwjgl_opengl_GLU.h 24 Jun 2003 12:24:55 -0000 1.6 @@ -9,187 +9,179 @@ #endif /* * Class: org_lwjgl_opengl_GLU - * Method: errorString + * Method: gluErrorString * Signature: (I)Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_opengl_GLU_errorString - (JNIEnv *, jobject, jint); +JNIEXPORT jstring JNICALL Java_org_lwjgl_opengl_GLU_gluErrorString + (JNIEnv *, jclass, jint); /* * Class: org_lwjgl_opengl_GLU - * Method: getString + * Method: gluGetString * Signature: (I)Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_opengl_GLU_getString - (JNIEnv *, jobject, jint); +JNIEXPORT jstring JNICALL Java_org_lwjgl_opengl_GLU_gluGetString + (JNIEnv *, jclass, jint); /* * Class: org_lwjgl_opengl_GLU - * Method: ortho2D + * Method: gluOrtho2D * Signature: (DDDD)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_ortho2D - (JNIEnv *, jobject, jdouble, jdouble, jdouble, jdouble); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluOrtho2D + (JNIEnv *, jclass, jdouble, jdouble, jdouble, jdouble); /* * Class: org_lwjgl_opengl_GLU - * Method: perspective + * Method: gluPerspective * Signature: (DDDD)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_perspective - (JNIEnv *, jobject, jdouble, jdouble, jdouble, jdouble); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluPerspective + (JNIEnv *, jclass, jdouble, jdouble, jdouble, jdouble); /* * Class: org_lwjgl_opengl_GLU - * Method: pickMatrix - * Signature: (DDDDI)V + * Method: gluPickMatrix + * Signature: (DDDDLjava/nio/IntBuffer;)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_pickMatrix - (JNIEnv *, jobject, jdouble, jdouble, jdouble, jdouble, jint); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluPickMatrix + (JNIEnv *, jclass, jdouble, jdouble, jdouble, jdouble, jobject); /* * Class: org_lwjgl_opengl_GLU - * Method: lookAt + * Method: gluLookAt * Signature: (DDDDDDDDD)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_lookAt - (JNIEnv *, jobject, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble); - -/* - * Class: org_lwjgl_opengl_GLU - * Method: project - * Signature: (DDDIIIIII)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_project - (JNIEnv *, jobject, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluLookAt + (JNIEnv *, jclass, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble); /* * Class: org_lwjgl_opengl_GLU - * Method: unProject - * Signature: (DDDIIIIII)I + * Method: gluProject + * Signature: (DDDLjava/nio/DoubleBuffer;Ljava/nio/DoubleBuffer;Ljava/nio/IntBuffer;Ljava/nio/DoubleBuffer;Ljava/nio/DoubleBuffer;Ljava/nio/DoubleBuffer;)I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_unProject - (JNIEnv *, jobject, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint); +JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluProject + (JNIEnv *, jclass, jdouble, jdouble, jdouble, jobject, jobject, jobject, jobject, jobject, jobject); /* * Class: org_lwjgl_opengl_GLU - * Method: scaleImage - * Signature: (IIIIIIIII)I + * Method: gluUnProject + * Signature: (DDDLjava/nio/DoubleBuffer;Ljava/nio/DoubleBuffer;Ljava/nio/IntBuffer;Ljava/nio/DoubleBuffer;Ljava/nio/DoubleBuffer;Ljava/nio/DoubleBuffer;)I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_scaleImage - (JNIEnv *, jobject, jint, jint, jint, jint, jint, jint, jint, jint, jint); +JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluUnProject + (JNIEnv *, jclass, jdouble, jdouble, jdouble, jobject, jobject, jobject, jobject, jobject, jobject); /* * Class: org_lwjgl_opengl_GLU - * Method: build1DMipmaps - * Signature: (IIIIII)I + * Method: gluScaleImage + * Signature: (IIIILjava/nio/ByteBuffer;IIILjava/nio/ByteBuffer;)I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_build1DMipmaps - (JNIEnv *, jobject, jint, jint, jint, jint, jint, jint); +JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluScaleImage + (JNIEnv *, jclass, jint, jint, jint, jint, jobject, jint, jint, jint, jobject); /* * Class: org_lwjgl_opengl_GLU - * Method: build2DMipmaps - * Signature: (IIIIIII)I + * Method: gluBuild1DMipmaps + * Signature: (IIIIILjava/nio/ByteBuffer;)I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_build2DMipmaps - (JNIEnv *, jobject, jint, jint, jint, jint, jint, jint, jint); +JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluBuild1DMipmaps + (JNIEnv *, jclass, jint, jint, jint, jint, jint, jobject); /* * Class: org_lwjgl_opengl_GLU - * Method: newQuadric - * Signature: ()I + * Method: gluBuild2DMipmaps + * Signature: (IIIIIILjava/nio/ByteBuffer;)I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_newQuadric - (JNIEnv *, jobject); +JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluBuild2DMipmaps + (JNIEnv *, jclass, jint, jint, jint, jint, jint, jint, jobject); /* * Class: org_lwjgl_opengl_GLU - * Method: cylinder - * Signature: (IDDDII)V + * Method: gluNewQuadric + * Signature: ()Ljava/nio/ByteBuffer; */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_cylinder - (JNIEnv *, jobject, jint, jdouble, jdouble, jdouble, jint, jint); +JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GLU_gluNewQuadric + (JNIEnv *, jclass); /* * Class: org_lwjgl_opengl_GLU - * Method: deleteQuadric - * Signature: (I)V + * Method: gluCylinder + * Signature: (Ljava/nio/ByteBuffer;DDDII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_deleteQuadric - (JNIEnv *, jobject, jint); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluCylinder + (JNIEnv *, jclass, jobject, jdouble, jdouble, jdouble, jint, jint); /* * Class: org_lwjgl_opengl_GLU - * Method: disk - * Signature: (IDDII)V + * Method: gluDeleteQuadric + * Signature: (Ljava/nio/ByteBuffer;)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_disk - (JNIEnv *, jobject, jint, jdouble, jdouble, jint, jint); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluDeleteQuadric + (JNIEnv *, jclass, jobject); /* * Class: org_lwjgl_opengl_GLU - * Method: partialDisk - * Signature: (IDDIIDD)V + * Method: gluDisk + * Signature: (Ljava/nio/ByteBuffer;DDII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_partialDisk - (JNIEnv *, jobject, jint, jdouble, jdouble, jint, jint, jdouble, jdouble); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluDisk + (JNIEnv *, jclass, jobject, jdouble, jdouble, jint, jint); /* * Class: org_lwjgl_opengl_GLU - * Method: quadricDrawStyle - * Signature: (II)V + * Method: gluPartialDisk + * Signature: (Ljava/nio/ByteBuffer;DDIIDD)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricDrawStyle - (JNIEnv *, jobject, jint, jint); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluPartialDisk + (JNIEnv *, jclass, jobject, jdouble, jdouble, jint, jint, jdouble, jdouble); /* * Class: org_lwjgl_opengl_GLU - * Method: quadricNormals - * Signature: (II)V + * Method: gluQuadricDrawStyle + * Signature: (Ljava/nio/ByteBuffer;I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricNormals - (JNIEnv *, jobject, jint, jint); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricDrawStyle + (JNIEnv *, jclass, jobject, jint); /* * Class: org_lwjgl_opengl_GLU - * Method: quadricOrientation - * Signature: (II)V + * Method: gluQuadricNormals + * Signature: (Ljava/nio/ByteBuffer;I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricOrientation - (JNIEnv *, jobject, jint, jint); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricNormals + (JNIEnv *, jclass, jobject, jint); /* * Class: org_lwjgl_opengl_GLU - * Method: quadricTexture - * Signature: (IZ)V + * Method: gluQuadricOrientation + * Signature: (Ljava/nio/ByteBuffer;I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricTexture - (JNIEnv *, jobject, jint, jboolean); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricOrientation + (JNIEnv *, jclass, jobject, jint); /* * Class: org_lwjgl_opengl_GLU - * Method: sphere - * Signature: (IDII)V + * Method: gluQuadricTexture + * Signature: (Ljava/nio/ByteBuffer;Z)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_sphere - (JNIEnv *, jobject, jint, jdouble, jint, jint); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricTexture + (JNIEnv *, jclass, jobject, jboolean); /* * Class: org_lwjgl_opengl_GLU - * Method: quadricCallback - * Signature: (IILjava/lang/String;)V + * Method: gluSphere + * Signature: (Ljava/nio/ByteBuffer;DII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricCallback__IILjava_lang_String_2 - (JNIEnv *, jobject, jint, jint, jstring); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluSphere + (JNIEnv *, jclass, jobject, jdouble, jint, jint); /* * Class: org_lwjgl_opengl_GLU - * Method: quadricCallback - * Signature: (IILjava/lang/Object;Ljava/lang/String;)V + * Method: gluQuadricCallback + * Signature: (Ljava/nio/ByteBuffer;ILjava/lang/Object;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricCallback__IILjava_lang_Object_2Ljava_lang_String_2 - (JNIEnv *, jobject, jint, jint, jobject, jstring); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricCallback + (JNIEnv *, jclass, jobject, jint, jobject, jstring); #ifdef __cplusplus } |
