You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(134) |
Sep
(52) |
Oct
(13) |
Nov
(342) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(44) |
Feb
(62) |
Mar
(158) |
Apr
(38) |
May
(70) |
Jun
(58) |
Jul
(104) |
Aug
(207) |
Sep
(83) |
Oct
(122) |
Nov
(23) |
Dec
(49) |
| 2004 |
Jan
(119) |
Feb
(132) |
Mar
(192) |
Apr
(140) |
May
(77) |
Jun
(74) |
Jul
(201) |
Aug
(63) |
Sep
(102) |
Oct
(70) |
Nov
(173) |
Dec
(78) |
| 2005 |
Jan
(174) |
Feb
(197) |
Mar
(105) |
Apr
(59) |
May
(77) |
Jun
(43) |
Jul
(21) |
Aug
(18) |
Sep
(47) |
Oct
(37) |
Nov
(74) |
Dec
(50) |
| 2006 |
Jan
(44) |
Feb
(19) |
Mar
(32) |
Apr
(24) |
May
(31) |
Jun
(55) |
Jul
(138) |
Aug
(28) |
Sep
(12) |
Oct
(41) |
Nov
(58) |
Dec
(24) |
| 2007 |
Jan
(28) |
Feb
(14) |
Mar
(10) |
Apr
(68) |
May
(30) |
Jun
(26) |
Jul
(18) |
Aug
(63) |
Sep
(19) |
Oct
(29) |
Nov
(20) |
Dec
(10) |
| 2008 |
Jan
(38) |
Feb
(7) |
Mar
(37) |
Apr
(120) |
May
(41) |
Jun
(36) |
Jul
(39) |
Aug
(24) |
Sep
(28) |
Oct
(30) |
Nov
(36) |
Dec
(75) |
| 2009 |
Jan
(46) |
Feb
(22) |
Mar
(50) |
Apr
(70) |
May
(134) |
Jun
(105) |
Jul
(75) |
Aug
(34) |
Sep
(38) |
Oct
(34) |
Nov
(19) |
Dec
(20) |
| 2010 |
Jan
(11) |
Feb
(20) |
Mar
(65) |
Apr
(83) |
May
(104) |
Jun
(73) |
Jul
(78) |
Aug
(57) |
Sep
(43) |
Oct
(35) |
Nov
(9) |
Dec
(4) |
| 2011 |
Jan
(21) |
Feb
(11) |
Mar
(18) |
Apr
(10) |
May
(18) |
Jun
(15) |
Jul
(48) |
Aug
(25) |
Sep
(17) |
Oct
(45) |
Nov
(15) |
Dec
(12) |
| 2012 |
Jan
(21) |
Feb
(9) |
Mar
(12) |
Apr
(9) |
May
(9) |
Jun
(5) |
Jul
(1) |
Aug
(10) |
Sep
(12) |
Oct
(1) |
Nov
(28) |
Dec
(5) |
| 2013 |
Jan
(4) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2016 |
Jan
(2) |
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(2) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
1
(6) |
2
|
3
|
4
(3) |
5
|
6
|
7
(11) |
|
8
(2) |
9
|
10
|
11
|
12
(6) |
13
|
14
|
|
15
(1) |
16
(4) |
17
(8) |
18
|
19
|
20
|
21
|
|
22
|
23
|
24
(17) |
25
|
26
|
27
|
28
|
|
29
|
30
|
|
|
|
|
|
|
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 } |
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/java/org/lwjgl/opengl/ext Modified Files: EXTAbgr.java EXTBgra.java EXTBlendColor.java EXTBlendMinmax.java EXTBlendSubtract.java EXTCompiledVertexArray.java EXTDrawRangeElements.java EXTFogCoord.java EXTLightMaxExponent.java EXTPackedPixels.java EXTPointParameters.java EXTRescaleNormal.java EXTSecondaryColor.java EXTSeparateSpecularColor.java EXTSharedTexturePalette.java EXTStencilTwoSide.java EXTStencilWrap.java EXTTextureCompressionS3TC.java EXTTextureEnvCombine.java EXTTextureEnvDot3.java EXTTextureFilterAnisotropic.java EXTTextureLODBias.java EXTVertexArray.java EXTVertexShader.java EXTVertexWeighting.java Log Message: Ported OpenGL to Buffers Index: EXTAbgr.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTAbgr.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTAbgr.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- EXTAbgr.java 21 Dec 2002 12:37:19 -0000 1.3 +++ EXTAbgr.java 24 Jun 2003 12:24:54 -0000 1.4 @@ -42,5 +42,5 @@ public interface EXTAbgr { - public static final int ABGR_EXT = 0x8000; + public static final int GL_ABGR_EXT = 0x8000; } Index: EXTBgra.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTBgra.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTBgra.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- EXTBgra.java 21 Dec 2002 12:37:19 -0000 1.4 +++ EXTBgra.java 24 Jun 2003 12:24:54 -0000 1.5 @@ -39,7 +39,7 @@ */ public interface EXTBgra { /* - public static final int BGR_EXT = 0x80E0; - public static final int BGRA_EXT = 0x80E1; + public static final int GL_ BGR_EXT = 0x80E0; + public static final int GL_ BGRA_EXT = 0x80E1; */ } Index: EXTBlendColor.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTBlendColor.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTBlendColor.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- EXTBlendColor.java 21 Dec 2002 12:37:19 -0000 1.4 +++ EXTBlendColor.java 24 Jun 2003 12:24:54 -0000 1.5 @@ -37,9 +37,9 @@ * Creation date: (29/06/2000 00:45:10) */ public interface EXTBlendColor { - public static final int CONSTANT_COLOR_EXT = 0x8001; - public static final int ONE_MINUS_CONSTANT_COLOR_EXT = 0x8002; - public static final int CONSTANT_ALPHA_EXT = 0x8003; - public static final int ONE_MINUS_CONSTANT_ALPHA_EXT = 0x8004; - public static final int BLEND_COLOR_EXT = 0x8005; + public static final int GL_CONSTANT_COLOR_EXT = 0x8001; + public static final int GL_ONE_MINUS_CONSTANT_COLOR_EXT = 0x8002; + public static final int GL_CONSTANT_ALPHA_EXT = 0x8003; + public static final int GL_ONE_MINUS_CONSTANT_ALPHA_EXT = 0x8004; + public static final int GL_BLEND_COLOR_EXT = 0x8005; } Index: EXTBlendMinmax.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTBlendMinmax.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTBlendMinmax.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- EXTBlendMinmax.java 21 Dec 2002 12:37:19 -0000 1.4 +++ EXTBlendMinmax.java 24 Jun 2003 12:24:54 -0000 1.5 @@ -37,8 +37,8 @@ * @author cas */ public interface EXTBlendMinmax { - public static final int FUNC_ADD_EXT = 0x8006; - public static final int MIN_EXT = 0x8007; - public static final int MAX_EXT = 0x8008; - public static final int BLEND_EQUATION_EXT = 0x8009; + public static final int GL_FUNC_ADD_EXT = 0x8006; + public static final int GL_MIN_EXT = 0x8007; + public static final int GL_MAX_EXT = 0x8008; + public static final int GL_BLEND_EQUATION_EXT = 0x8009; } Index: EXTBlendSubtract.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTBlendSubtract.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTBlendSubtract.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- EXTBlendSubtract.java 21 Dec 2002 12:37:19 -0000 1.4 +++ EXTBlendSubtract.java 24 Jun 2003 12:24:54 -0000 1.5 @@ -37,6 +37,6 @@ * @author cas */ public interface EXTBlendSubtract { - public static final int FUNC_SUBTRACT_EXT = 0x800A; - public static final int FUNC_REVERSE_SUBTRACT_EXT = 0x800B; + public static final int GL_FUNC_SUBTRACT_EXT = 0x800A; + public static final int GL_FUNC_REVERSE_SUBTRACT_EXT = 0x800B; } Index: EXTCompiledVertexArray.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTCompiledVertexArray.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTCompiledVertexArray.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTCompiledVertexArray.java 21 Dec 2002 12:37:19 -0000 1.2 +++ EXTCompiledVertexArray.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,7 +41,6 @@ public interface EXTCompiledVertexArray { - public static final int ARRAY_ELEMENT_LOCK_FIRST_EXT = 0x81A8; - public static final int ARRAY_ELEMENT_LOCK_COUNT_EXT = 0x81A9; - + public static final int GL_ARRAY_ELEMENT_LOCK_FIRST_EXT = 0x81A8; + public static final int GL_ARRAY_ELEMENT_LOCK_COUNT_EXT = 0x81A9; } Index: EXTDrawRangeElements.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTDrawRangeElements.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTDrawRangeElements.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTDrawRangeElements.java 21 Dec 2002 12:37:19 -0000 1.2 +++ EXTDrawRangeElements.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,6 +41,6 @@ public interface EXTDrawRangeElements { - public static final int MAX_ELEMENTS_VERTICES_EXT = 0x80E8; - public static final int MAX_ELEMENTS_INDICES_EXT = 0x80E9; + public static final int GL_MAX_ELEMENTS_VERTICES_EXT = 0x80E8; + public static final int GL_MAX_ELEMENTS_INDICES_EXT = 0x80E9; } Index: EXTFogCoord.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTFogCoord.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTFogCoord.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTFogCoord.java 21 Dec 2002 12:37:19 -0000 1.2 +++ EXTFogCoord.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,13 +41,13 @@ public interface EXTFogCoord { - public static final int FOG_COORDINATE_SOURCE_EXT = 0x8450; - public static final int FOG_COORDINATE_EXT = 0x8451; - public static final int FRAGMENT_DEPTH_EXT = 0x8452; - public static final int CURRENT_FOG_COORDINATE_EXT = 0x8453; - public static final int FOG_COORDINATE_ARRAY_TYPE_EXT = 0x8454; - public static final int FOG_COORDINATE_ARRAY_STRIDE_EXT = 0x8455; - public static final int FOG_COORDINATE_ARRAY_POINTER_EXT = 0x8456; - public static final int FOG_COORDINATE_ARRAY_EXT = 0x8457; + public static final int GL_FOG_COORDINATE_SOURCE_EXT = 0x8450; + public static final int GL_FOG_COORDINATE_EXT = 0x8451; + public static final int GL_FRAGMENT_DEPTH_EXT = 0x8452; + public static final int GL_CURRENT_FOG_COORDINATE_EXT = 0x8453; + public static final int GL_FOG_COORDINATE_ARRAY_TYPE_EXT = 0x8454; + public static final int GL_FOG_COORDINATE_ARRAY_STRIDE_EXT = 0x8455; + public static final int GL_FOG_COORDINATE_ARRAY_POINTER_EXT = 0x8456; + public static final int GL_FOG_COORDINATE_ARRAY_EXT = 0x8457; } Index: EXTLightMaxExponent.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTLightMaxExponent.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTLightMaxExponent.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- EXTLightMaxExponent.java 21 Dec 2002 12:37:19 -0000 1.4 +++ EXTLightMaxExponent.java 24 Jun 2003 12:24:54 -0000 1.5 @@ -37,6 +37,6 @@ * @author cas */ public interface EXTLightMaxExponent { - public static final int MAX_SHININESS_EXT = 0x8504; - public static final int MAX_SPOT_EXPONENT_EXT = 0x8505; + public static final int GL_MAX_SHININESS_EXT = 0x8504; + public static final int GL_MAX_SPOT_EXPONENT_EXT = 0x8505; } Index: EXTPackedPixels.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTPackedPixels.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTPackedPixels.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- EXTPackedPixels.java 21 Dec 2002 12:37:19 -0000 1.4 +++ EXTPackedPixels.java 24 Jun 2003 12:24:54 -0000 1.5 @@ -37,9 +37,9 @@ * Creation date: (07/11/99 19:16:17) */ public interface EXTPackedPixels { - public static final int UNSIGNED_BYTE_3_3_2_EXT = 0x8032; - public static final int UNSIGNED_SHORT_4_4_4_4_EXT = 0x8033; - public static final int UNSIGNED_SHORT_5_5_5_1_EXT = 0x8034; - public static final int UNSIGNED_INT_8_8_8_8_EXT = 0x8035; - public static final int UNSIGNED_INT_10_10_10_2_EXT = 0x8036; + public static final int GL_UNSIGNED_BYTE_3_3_2_EXT = 0x8032; + public static final int GL_UNSIGNED_SHORT_4_4_4_4_EXT = 0x8033; + public static final int GL_UNSIGNED_SHORT_5_5_5_1_EXT = 0x8034; + public static final int GL_UNSIGNED_INT_8_8_8_8_EXT = 0x8035; + public static final int GL_UNSIGNED_INT_10_10_10_2_EXT = 0x8036; } Index: EXTPointParameters.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTPointParameters.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTPointParameters.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTPointParameters.java 21 Dec 2002 12:37:19 -0000 1.2 +++ EXTPointParameters.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,9 +41,8 @@ public interface EXTPointParameters { - public static final int POINT_SIZE_MIN_EXT = 0x8126; - public static final int POINT_SIZE_MAX_EXT = 0x8127; - public static final int POINT_FADE_THRESHOLD_SIZE_EXT = 0x8128; - public static final int DISTANCE_ATTENUATION_EXT = 0x8129; - + public static final int GL_POINT_SIZE_MIN_EXT = 0x8126; + public static final int GL_POINT_SIZE_MAX_EXT = 0x8127; + public static final int GL_POINT_FADE_THRESHOLD_SIZE_EXT = 0x8128; + public static final int GL_DISTANCE_ATTENUATION_EXT = 0x8129; } Index: EXTRescaleNormal.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTRescaleNormal.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTRescaleNormal.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- EXTRescaleNormal.java 21 Dec 2002 12:37:19 -0000 1.4 +++ EXTRescaleNormal.java 24 Jun 2003 12:24:54 -0000 1.5 @@ -38,5 +38,5 @@ * @author cas */ public interface EXTRescaleNormal { - public static final int RESCALE_NORMAL_EXT = 0x803A; + public static final int GL_RESCALE_NORMAL_EXT = 0x803A; } Index: EXTSecondaryColor.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTSecondaryColor.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTSecondaryColor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTSecondaryColor.java 21 Dec 2002 12:37:19 -0000 1.2 +++ EXTSecondaryColor.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,12 +41,11 @@ public interface EXTSecondaryColor { - public static final int COLOR_SUM_EXT = 0x8458; - public static final int CURRENT_SECONDARY_COLOR_EXT = 0x8459; - public static final int SECONDARY_COLOR_ARRAY_SIZE_EXT = 0x845A; - public static final int SECONDARY_COLOR_ARRAY_TYPE_EXT = 0x845B; - public static final int SECONDARY_COLOR_ARRAY_STRIDE_EXT = 0x845C; - public static final int SECONDARY_COLOR_ARRAY_POINTER_EXT = 0x845D; - public static final int SECONDARY_COLOR_ARRAY_EXT = 0x845E; - + public static final int GL_COLOR_SUM_EXT = 0x8458; + public static final int GL_CURRENT_SECONDARY_COLOR_EXT = 0x8459; + public static final int GL_SECONDARY_COLOR_ARRAY_SIZE_EXT = 0x845A; + public static final int GL_SECONDARY_COLOR_ARRAY_TYPE_EXT = 0x845B; + public static final int GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT = 0x845C; + public static final int GL_SECONDARY_COLOR_ARRAY_POINTER_EXT = 0x845D; + public static final int GL_SECONDARY_COLOR_ARRAY_EXT = 0x845E; } Index: EXTSeparateSpecularColor.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTSeparateSpecularColor.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTSeparateSpecularColor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- EXTSeparateSpecularColor.java 21 Dec 2002 12:07:15 -0000 1.3 +++ EXTSeparateSpecularColor.java 24 Jun 2003 12:24:54 -0000 1.4 @@ -38,7 +38,7 @@ * @author cas */ public interface EXTSeparateSpecularColor { - public static final int SINGLE_COLOR_EXT = 0x81F9; - public static final int SEPARATE_SPECULAR_COLOR_EXT = 0x81FA; - public static final int LIGHT_MODEL_COLOR_CONTROL_EXT = 0x81F8; + public static final int GL_SINGLE_COLOR_EXT = 0x81F9; + public static final int GL_SEPARATE_SPECULAR_COLOR_EXT = 0x81FA; + public static final int GL_LIGHT_MODEL_COLOR_CONTROL_EXT = 0x81F8; } Index: EXTSharedTexturePalette.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTSharedTexturePalette.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTSharedTexturePalette.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- EXTSharedTexturePalette.java 21 Dec 2002 12:37:19 -0000 1.4 +++ EXTSharedTexturePalette.java 24 Jun 2003 12:24:54 -0000 1.5 @@ -37,5 +37,5 @@ * Creation date: (07/11/99 19:15:54) */ public interface EXTSharedTexturePalette { - public static final int SHARED_TEXTURE_PALETTE_EXT = 0x81FB; + public static final int GL_SHARED_TEXTURE_PALETTE_EXT = 0x81FB; } Index: EXTStencilTwoSide.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTStencilTwoSide.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTStencilTwoSide.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTStencilTwoSide.java 21 Dec 2002 12:37:19 -0000 1.2 +++ EXTStencilTwoSide.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,6 +41,6 @@ public interface EXTStencilTwoSide { - public static final int STENCIL_TEST_TWO_SIDE_EXT = 0x8910; - public static final int ACTIVE_STENCIL_FACE_EXT = 0x8911; + public static final int GL_STENCIL_TEST_TWO_SIDE_EXT = 0x8910; + public static final int GL_ACTIVE_STENCIL_FACE_EXT = 0x8911; } Index: EXTStencilWrap.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTStencilWrap.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTStencilWrap.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTStencilWrap.java 21 Dec 2002 12:37:19 -0000 1.2 +++ EXTStencilWrap.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,6 +41,6 @@ public interface EXTStencilWrap { - public static final int INCR_WRAP_EXT = 0x8507; - public static final int DECR_WRAP_EXT = 0x8508; + public static final int GL_INCR_WRAP_EXT = 0x8507; + public static final int GL_DECR_WRAP_EXT = 0x8508; } Index: EXTTextureCompressionS3TC.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTTextureCompressionS3TC.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTTextureCompressionS3TC.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTTextureCompressionS3TC.java 21 Dec 2002 12:37:19 -0000 1.2 +++ EXTTextureCompressionS3TC.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,8 +41,8 @@ public interface EXTTextureCompressionS3TC { - public static final int COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0; - public static final int COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1; - public static final int COMPRESSED_RGBA_S3TC_DXT3_EXT = 0x83F2; - public static final int COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3; + public static final int GL_COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0; + public static final int GL_COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1; + public static final int GL_COMPRESSED_RGBA_S3TC_DXT3_EXT = 0x83F2; + public static final int GL_COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3; } Index: EXTTextureEnvCombine.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTTextureEnvCombine.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTTextureEnvCombine.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- EXTTextureEnvCombine.java 21 Dec 2002 12:37:19 -0000 1.4 +++ EXTTextureEnvCombine.java 24 Jun 2003 12:24:54 -0000 1.5 @@ -37,25 +37,25 @@ * Creation date: (22/02/00 01:26:05) */ public interface EXTTextureEnvCombine { - public static final int COMBINE_EXT = 0x8570; - public static final int COMBINE_RGB_EXT = 0x8571; - public static final int COMBINE_ALPHA_EXT = 0x8572; - public static final int SOURCE0_RGB_EXT = 0x8580; - public static final int SOURCE1_RGB_EXT = 0x8581; - public static final int SOURCE2_RGB_EXT = 0x8582; - public static final int SOURCE0_ALPHA_EXT = 0x8588; - public static final int SOURCE1_ALPHA_EXT = 0x8589; - public static final int SOURCE2_ALPHA_EXT = 0x858A; - public static final int OPERAND0_RGB_EXT = 0x8590; - public static final int OPERAND1_RGB_EXT = 0x8591; - public static final int OPERAND2_RGB_EXT = 0x8592; - public static final int OPERAND0_ALPHA_EXT = 0x8598; - public static final int OPERAND1_ALPHA_EXT = 0x8599; - public static final int OPERAND2_ALPHA_EXT = 0x859A; - public static final int RGB_SCALE_EXT = 0x8573; - public static final int ADD_SIGNED_EXT = 0x8574; - public static final int INTERPOLATE_EXT = 0x8575; - public static final int CONSTANT_EXT = 0x8576; - public static final int PRIMARY_COLOR_EXT = 0x8577; - public static final int PREVIOUS_EXT = 0x8578; + public static final int GL_COMBINE_EXT = 0x8570; + public static final int GL_COMBINE_RGB_EXT = 0x8571; + public static final int GL_COMBINE_ALPHA_EXT = 0x8572; + public static final int GL_SOURCE0_RGB_EXT = 0x8580; + public static final int GL_SOURCE1_RGB_EXT = 0x8581; + public static final int GL_SOURCE2_RGB_EXT = 0x8582; + public static final int GL_SOURCE0_ALPHA_EXT = 0x8588; + public static final int GL_SOURCE1_ALPHA_EXT = 0x8589; + public static final int GL_SOURCE2_ALPHA_EXT = 0x858A; + public static final int GL_OPERAND0_RGB_EXT = 0x8590; + public static final int GL_OPERAND1_RGB_EXT = 0x8591; + public static final int GL_OPERAND2_RGB_EXT = 0x8592; + public static final int GL_OPERAND0_ALPHA_EXT = 0x8598; + public static final int GL_OPERAND1_ALPHA_EXT = 0x8599; + public static final int GL_OPERAND2_ALPHA_EXT = 0x859A; + public static final int GL_RGB_SCALE_EXT = 0x8573; + public static final int GL_ADD_SIGNED_EXT = 0x8574; + public static final int GL_INTERPOLATE_EXT = 0x8575; + public static final int GL_CONSTANT_EXT = 0x8576; + public static final int GL_PRIMARY_COLOR_EXT = 0x8577; + public static final int GL_PREVIOUS_EXT = 0x8578; } Index: EXTTextureEnvDot3.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTTextureEnvDot3.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTTextureEnvDot3.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- EXTTextureEnvDot3.java 21 Dec 2002 12:37:19 -0000 1.4 +++ EXTTextureEnvDot3.java 24 Jun 2003 12:24:54 -0000 1.5 @@ -38,6 +38,6 @@ * @author cas */ public interface EXTTextureEnvDot3 { - public static final int DOT3_RGB_EXT = 0x8740; - public static final int DOT3_RGBA_EXT = 0x8741; + public static final int GL_DOT3_RGB_EXT = 0x8740; + public static final int GL_DOT3_RGBA_EXT = 0x8741; } Index: EXTTextureFilterAnisotropic.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTTextureFilterAnisotropic.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTTextureFilterAnisotropic.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTTextureFilterAnisotropic.java 21 Dec 2002 12:37:19 -0000 1.2 +++ EXTTextureFilterAnisotropic.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,6 +41,6 @@ public interface EXTTextureFilterAnisotropic { - public static final int TEXTURE_MAX_ANISOTROPY_EXT = 0x84FE; - public static final int MAX_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FF; + public static final int GL_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FE; + public static final int GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FF; } Index: EXTTextureLODBias.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTTextureLODBias.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTTextureLODBias.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTTextureLODBias.java 21 Dec 2002 12:37:19 -0000 1.2 +++ EXTTextureLODBias.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,7 +41,7 @@ public interface EXTTextureLODBias { - public static final int TEXTURE_FILTER_CONTROL_EXT = 0x8500; - public static final int TEXTURE_LOD_BIAS_EXT = 0x8501; - public static final int MAX_TEXTURE_LOD_BIAS_EXT = 0x84FD; + public static final int GL_TEXTURE_FILTER_CONTROL_EXT = 0x8500; + public static final int GL_TEXTURE_LOD_BIAS_EXT = 0x8501; + public static final int GL_MAX_TEXTURE_LOD_BIAS_EXT = 0x84FD; } Index: EXTVertexArray.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTVertexArray.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTVertexArray.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- EXTVertexArray.java 21 Dec 2002 12:37:19 -0000 1.4 +++ EXTVertexArray.java 24 Jun 2003 12:24:54 -0000 1.5 @@ -36,36 +36,36 @@ * Creation date: (07/11/99 18:58:04) */ public interface EXTVertexArray { - public static final int VERTEX_ARRAY_EXT = 0x8074; - public static final int NORMAL_ARRAY_EXT = 0x8075; - public static final int COLOR_ARRAY_EXT = 0x8076; - public static final int INDEX_ARRAY_EXT = 0x8077; - public static final int TEXTURE_COORD_ARRAY_EXT = 0x8078; - public static final int EDGE_FLAG_ARRAY_EXT = 0x8079; - public static final int VERTEX_ARRAY_SIZE_EXT = 0x807A; - public static final int VERTEX_ARRAY_TYPE_EXT = 0x807B; - public static final int VERTEX_ARRAY_STRIDE_EXT = 0x807C; - public static final int VERTEX_ARRAY_COUNT_EXT = 0x807D; - public static final int NORMAL_ARRAY_TYPE_EXT = 0x807E; - public static final int NORMAL_ARRAY_STRIDE_EXT = 0x807F; - public static final int NORMAL_ARRAY_COUNT_EXT = 0x8080; - public static final int COLOR_ARRAY_SIZE_EXT = 0x8081; - public static final int COLOR_ARRAY_TYPE_EXT = 0x8082; - public static final int COLOR_ARRAY_STRIDE_EXT = 0x8083; - public static final int COLOR_ARRAY_COUNT_EXT = 0x8084; - public static final int INDEX_ARRAY_TYPE_EXT = 0x8085; - public static final int INDEX_ARRAY_STRIDE_EXT = 0x8086; - public static final int INDEX_ARRAY_COUNT_EXT = 0x8087; - public static final int TEXTURE_COORD_ARRAY_SIZE_EXT = 0x8088; - public static final int TEXTURE_COORD_ARRAY_TYPE_EXT = 0x8089; - public static final int TEXTURE_COORD_ARRAY_STRIDE_EXT = 0x808A; - public static final int TEXTURE_COORD_ARRAY_COUNT_EXT = 0x808B; - public static final int EDGE_FLAG_ARRAY_STRIDE_EXT = 0x808C; - public static final int EDGE_FLAG_ARRAY_COUNT_EXT = 0x808D; - public static final int VERTEX_ARRAY_POINTER_EXT = 0x808E; - public static final int NORMAL_ARRAY_POINTER_EXT = 0x808F; - public static final int COLOR_ARRAY_POINTER_EXT = 0x8090; - public static final int INDEX_ARRAY_POINTER_EXT = 0x8091; - public static final int TEXTURE_COORD_ARRAY_POINTER_EXT = 0x8092; - public static final int EDGE_FLAG_ARRAY_POINTER_EXT = 0x8093; + public static final int GL_VERTEX_ARRAY_EXT = 0x8074; + public static final int GL_NORMAL_ARRAY_EXT = 0x8075; + public static final int GL_COLOR_ARRAY_EXT = 0x8076; + public static final int GL_INDEX_ARRAY_EXT = 0x8077; + public static final int GL_TEXTURE_COORD_ARRAY_EXT = 0x8078; + public static final int GL_EDGE_FLAG_ARRAY_EXT = 0x8079; + public static final int GL_VERTEX_ARRAY_SIZE_EXT = 0x807A; + public static final int GL_VERTEX_ARRAY_TYPE_EXT = 0x807B; + public static final int GL_VERTEX_ARRAY_STRIDE_EXT = 0x807C; + public static final int GL_VERTEX_ARRAY_COUNT_EXT = 0x807D; + public static final int GL_NORMAL_ARRAY_TYPE_EXT = 0x807E; + public static final int GL_NORMAL_ARRAY_STRIDE_EXT = 0x807F; + public static final int GL_NORMAL_ARRAY_COUNT_EXT = 0x8080; + public static final int GL_COLOR_ARRAY_SIZE_EXT = 0x8081; + public static final int GL_COLOR_ARRAY_TYPE_EXT = 0x8082; + public static final int GL_COLOR_ARRAY_STRIDE_EXT = 0x8083; + public static final int GL_COLOR_ARRAY_COUNT_EXT = 0x8084; + public static final int GL_INDEX_ARRAY_TYPE_EXT = 0x8085; + public static final int GL_INDEX_ARRAY_STRIDE_EXT = 0x8086; + public static final int GL_INDEX_ARRAY_COUNT_EXT = 0x8087; + public static final int GL_TEXTURE_COORD_ARRAY_SIZE_EXT = 0x8088; + public static final int GL_TEXTURE_COORD_ARRAY_TYPE_EXT = 0x8089; + public static final int GL_TEXTURE_COORD_ARRAY_STRIDE_EXT = 0x808A; + public static final int GL_TEXTURE_COORD_ARRAY_COUNT_EXT = 0x808B; + public static final int GL_EDGE_FLAG_ARRAY_STRIDE_EXT = 0x808C; + public static final int GL_EDGE_FLAG_ARRAY_COUNT_EXT = 0x808D; + public static final int GL_VERTEX_ARRAY_POINTER_EXT = 0x808E; + public static final int GL_NORMAL_ARRAY_POINTER_EXT = 0x808F; + public static final int GL_COLOR_ARRAY_POINTER_EXT = 0x8090; + public static final int GL_INDEX_ARRAY_POINTER_EXT = 0x8091; + public static final int GL_TEXTURE_COORD_ARRAY_POINTER_EXT = 0x8092; + public static final int GL_EDGE_FLAG_ARRAY_POINTER_EXT = 0x8093; } Index: EXTVertexShader.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTVertexShader.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTVertexShader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTVertexShader.java 21 Dec 2002 12:37:19 -0000 1.2 +++ EXTVertexShader.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,114 +41,114 @@ public interface EXTVertexShader { - public static final int VERTEX_SHADER_EXT = 0x8780; - public static final int VERTEX_SHADER_BINDING_EXT = 0x8781; - public static final int OP_INDEX_EXT = 0x8782; - public static final int OP_NEGATE_EXT = 0x8783; - public static final int OP_DOT3_EXT = 0x8784; - public static final int OP_DOT4_EXT = 0x8785; - public static final int OP_MUL_EXT = 0x8786; - public static final int OP_ADD_EXT = 0x8787; - public static final int OP_MADD_EXT = 0x8788; - public static final int OP_FRAC_EXT = 0x8789; - public static final int OP_MAX_EXT = 0x878A; - public static final int OP_MIN_EXT = 0x878B; - public static final int OP_SET_GE_EXT = 0x878C; - public static final int OP_SET_LT_EXT = 0x878D; - public static final int OP_CLAMP_EXT = 0x878E; - public static final int OP_FLOOR_EXT = 0x878F; - public static final int OP_ROUND_EXT = 0x8790; - public static final int OP_EXP_BASE_2_EXT = 0x8791; - public static final int OP_LOG_BASE_2_EXT = 0x8792; - public static final int OP_POWER_EXT = 0x8793; - public static final int OP_RECIP_EXT = 0x8794; - public static final int OP_RECIP_SQRT_EXT = 0x8795; - public static final int OP_SUB_EXT = 0x8796; - public static final int OP_CROSS_PRODUCT_EXT = 0x8797; - public static final int OP_MULTIPLY_MATRIX_EXT = 0x8798; - public static final int OP_MOV_EXT = 0x8799; - public static final int OUTPUT_VERTEX_EXT = 0x879A; - public static final int OUTPUT_COLOR0_EXT = 0x879B; - public static final int OUTPUT_COLOR1_EXT = 0x879C; - public static final int OUTPUT_TEXTURE_COORD0_EXT = 0x879D; - public static final int OUTPUT_TEXTURE_COORD1_EXT = 0x879E; - public static final int OUTPUT_TEXTURE_COORD2_EXT = 0x879F; - public static final int OUTPUT_TEXTURE_COORD3_EXT = 0x87A0; - public static final int OUTPUT_TEXTURE_COORD4_EXT = 0x87A1; - public static final int OUTPUT_TEXTURE_COORD5_EXT = 0x87A2; - public static final int OUTPUT_TEXTURE_COORD6_EXT = 0x87A3; - public static final int OUTPUT_TEXTURE_COORD7_EXT = 0x87A4; - public static final int OUTPUT_TEXTURE_COORD8_EXT = 0x87A5; - public static final int OUTPUT_TEXTURE_COORD9_EXT = 0x87A6; - public static final int OUTPUT_TEXTURE_COORD10_EXT = 0x87A7; - public static final int OUTPUT_TEXTURE_COORD11_EXT = 0x87A8; - public static final int OUTPUT_TEXTURE_COORD12_EXT = 0x87A9; - public static final int OUTPUT_TEXTURE_COORD13_EXT = 0x87AA; - public static final int OUTPUT_TEXTURE_COORD14_EXT = 0x87AB; - public static final int OUTPUT_TEXTURE_COORD15_EXT = 0x87AC; - public static final int OUTPUT_TEXTURE_COORD16_EXT = 0x87AD; - public static final int OUTPUT_TEXTURE_COORD17_EXT = 0x87AE; - public static final int OUTPUT_TEXTURE_COORD18_EXT = 0x87AF; - public static final int OUTPUT_TEXTURE_COORD19_EXT = 0x87B0; - public static final int OUTPUT_TEXTURE_COORD20_EXT = 0x87B1; - public static final int OUTPUT_TEXTURE_COORD21_EXT = 0x87B2; - public static final int OUTPUT_TEXTURE_COORD22_EXT = 0x87B3; - public static final int OUTPUT_TEXTURE_COORD23_EXT = 0x87B4; - public static final int OUTPUT_TEXTURE_COORD24_EXT = 0x87B5; - public static final int OUTPUT_TEXTURE_COORD25_EXT = 0x87B6; - public static final int OUTPUT_TEXTURE_COORD26_EXT = 0x87B7; - public static final int OUTPUT_TEXTURE_COORD27_EXT = 0x87B8; - public static final int OUTPUT_TEXTURE_COORD28_EXT = 0x87B9; - public static final int OUTPUT_TEXTURE_COORD29_EXT = 0x87BA; - public static final int OUTPUT_TEXTURE_COORD30_EXT = 0x87BB; - public static final int OUTPUT_TEXTURE_COORD31_EXT = 0x87BC; - public static final int OUTPUT_FOG_EXT = 0x87BD; - public static final int SCALAR_EXT = 0x87BE; - public static final int VECTOR_EXT = 0x87BF; - public static final int MATRIX_EXT = 0x87C0; - public static final int VARIANT_EXT = 0x87C1; - public static final int INVARIANT_EXT = 0x87C2; - public static final int LOCAL_CONSTANT_EXT = 0x87C3; - public static final int LOCAL_EXT = 0x87C4; - public static final int MAX_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87C5; - public static final int MAX_VERTEX_SHADER_VARIANTS_EXT = 0x87C6; - public static final int MAX_VERTEX_SHADER_INVARIANTS_EXT = 0x87C7; - public static final int MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87C8; - public static final int MAX_VERTEX_SHADER_LOCALS_EXT = 0x87C9; - public static final int MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CA; - public static final int MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT = 0x87CB; - public static final int MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT = 0x87CC; - public static final int MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87CD; - public static final int MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT = 0x87CE; - public static final int VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CF; - public static final int VERTEX_SHADER_VARIANTS_EXT = 0x87D0; - public static final int VERTEX_SHADER_INVARIANTS_EXT = 0x87D1; - public static final int VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87D2; - public static final int VERTEX_SHADER_LOCALS_EXT = 0x87D3; - public static final int VERTEX_SHADER_OPTIMIZED_EXT = 0x87D4; - public static final int X_EXT = 0x87D5; - public static final int Y_EXT = 0x87D6; - public static final int Z_EXT = 0x87D7; - public static final int W_EXT = 0x87D8; - public static final int NEGATIVE_X_EXT = 0x87D9; - public static final int NEGATIVE_Y_EXT = 0x87DA; - public static final int NEGATIVE_Z_EXT = 0x87DB; - public static final int NEGATIVE_W_EXT = 0x87DC; - public static final int ZERO_EXT = 0x87DD; - public static final int ONE_EXT = 0x87DE; - public static final int NEGATIVE_ONE_EXT = 0x87DF; - public static final int NORMALIZED_RANGE_EXT = 0x87E0; - public static final int FULL_RANGE_EXT = 0x87E1; - public static final int CURRENT_VERTEX_EXT = 0x87E2; - public static final int MVP_MATRIX_EXT = 0x87E3; - public static final int VARIANT_VALUE_EXT = 0x87E4; - public static final int VARIANT_DATATYPE_EXT = 0x87E5; - public static final int VARIANT_ARRAY_STRIDE_EXT = 0x87E6; - public static final int VARIANT_ARRAY_TYPE_EXT = 0x87E7; - public static final int VARIANT_ARRAY_EXT = 0x87E8; - public static final int VARIANT_ARRAY_POINTER_EXT = 0x87E9; - public static final int INVARIANT_VALUE_EXT = 0x87EA; - public static final int INVARIANT_DATATYPE_EXT = 0x87EB; - public static final int LOCAL_CONSTANT_VALUE_EXT = 0x87EC; - public static final int LOCAL_CONSTANT_DATATYPE_EXT = 0x87ED; + public static final int GL_VERTEX_SHADER_EXT = 0x8780; + public static final int GL_VERTEX_SHADER_BINDING_EXT = 0x8781; + public static final int GL_OP_INDEX_EXT = 0x8782; + public static final int GL_OP_NEGATE_EXT = 0x8783; + public static final int GL_OP_DOT3_EXT = 0x8784; + public static final int GL_OP_DOT4_EXT = 0x8785; + public static final int GL_OP_MUL_EXT = 0x8786; + public static final int GL_OP_ADD_EXT = 0x8787; + public static final int GL_OP_MADD_EXT = 0x8788; + public static final int GL_OP_FRAC_EXT = 0x8789; + public static final int GL_OP_MAX_EXT = 0x878A; + public static final int GL_OP_MIN_EXT = 0x878B; + public static final int GL_OP_SET_GE_EXT = 0x878C; + public static final int GL_OP_SET_LT_EXT = 0x878D; + public static final int GL_OP_CLAMP_EXT = 0x878E; + public static final int GL_OP_FLOOR_EXT = 0x878F; + public static final int GL_OP_ROUND_EXT = 0x8790; + public static final int GL_OP_EXP_BASE_2_EXT = 0x8791; + public static final int GL_OP_LOG_BASE_2_EXT = 0x8792; + public static final int GL_OP_POWER_EXT = 0x8793; + public static final int GL_OP_RECIP_EXT = 0x8794; + public static final int GL_OP_RECIP_SQRT_EXT = 0x8795; + public static final int GL_OP_SUB_EXT = 0x8796; + public static final int GL_OP_CROSS_PRODUCT_EXT = 0x8797; + public static final int GL_OP_MULTIPLY_MATRIX_EXT = 0x8798; + public static final int GL_OP_MOV_EXT = 0x8799; + public static final int GL_OUTPUT_VERTEX_EXT = 0x879A; + public static final int GL_OUTPUT_COLOR0_EXT = 0x879B; + public static final int GL_OUTPUT_COLOR1_EXT = 0x879C; + public static final int GL_OUTPUT_TEXTURE_COORD0_EXT = 0x879D; + public static final int GL_OUTPUT_TEXTURE_COORD1_EXT = 0x879E; + public static final int GL_OUTPUT_TEXTURE_COORD2_EXT = 0x879F; + public static final int GL_OUTPUT_TEXTURE_COORD3_EXT = 0x87A0; + public static final int GL_OUTPUT_TEXTURE_COORD4_EXT = 0x87A1; + public static final int GL_OUTPUT_TEXTURE_COORD5_EXT = 0x87A2; + public static final int GL_OUTPUT_TEXTURE_COORD6_EXT = 0x87A3; + public static final int GL_OUTPUT_TEXTURE_COORD7_EXT = 0x87A4; + public static final int GL_OUTPUT_TEXTURE_COORD8_EXT = 0x87A5; + public static final int GL_OUTPUT_TEXTURE_COORD9_EXT = 0x87A6; + public static final int GL_OUTPUT_TEXTURE_COORD10_EXT = 0x87A7; + public static final int GL_OUTPUT_TEXTURE_COORD11_EXT = 0x87A8; + public static final int GL_OUTPUT_TEXTURE_COORD12_EXT = 0x87A9; + public static final int GL_OUTPUT_TEXTURE_COORD13_EXT = 0x87AA; + public static final int GL_OUTPUT_TEXTURE_COORD14_EXT = 0x87AB; + public static final int GL_OUTPUT_TEXTURE_COORD15_EXT = 0x87AC; + public static final int GL_OUTPUT_TEXTURE_COORD16_EXT = 0x87AD; + public static final int GL_OUTPUT_TEXTURE_COORD17_EXT = 0x87AE; + public static final int GL_OUTPUT_TEXTURE_COORD18_EXT = 0x87AF; + public static final int GL_OUTPUT_TEXTURE_COORD19_EXT = 0x87B0; + public static final int GL_OUTPUT_TEXTURE_COORD20_EXT = 0x87B1; + public static final int GL_OUTPUT_TEXTURE_COORD21_EXT = 0x87B2; + public static final int GL_OUTPUT_TEXTURE_COORD22_EXT = 0x87B3; + public static final int GL_OUTPUT_TEXTURE_COORD23_EXT = 0x87B4; + public static final int GL_OUTPUT_TEXTURE_COORD24_EXT = 0x87B5; + public static final int GL_OUTPUT_TEXTURE_COORD25_EXT = 0x87B6; + public static final int GL_OUTPUT_TEXTURE_COORD26_EXT = 0x87B7; + public static final int GL_OUTPUT_TEXTURE_COORD27_EXT = 0x87B8; + public static final int GL_OUTPUT_TEXTURE_COORD28_EXT = 0x87B9; + public static final int GL_OUTPUT_TEXTURE_COORD29_EXT = 0x87BA; + public static final int GL_OUTPUT_TEXTURE_COORD30_EXT = 0x87BB; + public static final int GL_OUTPUT_TEXTURE_COORD31_EXT = 0x87BC; + public static final int GL_OUTPUT_FOG_EXT = 0x87BD; + public static final int GL_SCALAR_EXT = 0x87BE; + public static final int GL_VECTOR_EXT = 0x87BF; + public static final int GL_MATRIX_EXT = 0x87C0; + public static final int GL_VARIANT_EXT = 0x87C1; + public static final int GL_INVARIANT_EXT = 0x87C2; + public static final int GL_LOCAL_CONSTANT_EXT = 0x87C3; + public static final int GL_LOCAL_EXT = 0x87C4; + public static final int GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87C5; + public static final int GL_MAX_VERTEX_SHADER_VARIANTS_EXT = 0x87C6; + public static final int GL_MAX_VERTEX_SHADER_INVARIANTS_EXT = 0x87C7; + public static final int GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87C8; + public static final int GL_MAX_VERTEX_SHADER_LOCALS_EXT = 0x87C9; + public static final int GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CA; + public static final int GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT = 0x87CB; + public static final int GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT = 0x87CC; + public static final int GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87CD; + public static final int GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT = 0x87CE; + public static final int GL_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CF; + public static final int GL_VERTEX_SHADER_VARIANTS_EXT = 0x87D0; + public static final int GL_VERTEX_SHADER_INVARIANTS_EXT = 0x87D1; + public static final int GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87D2; + public static final int GL_VERTEX_SHADER_LOCALS_EXT = 0x87D3; + public static final int GL_VERTEX_SHADER_OPTIMIZED_EXT = 0x87D4; + public static final int GL_X_EXT = 0x87D5; + public static final int GL_Y_EXT = 0x87D6; + public static final int GL_Z_EXT = 0x87D7; + public static final int GL_W_EXT = 0x87D8; + public static final int GL_NEGATIVE_X_EXT = 0x87D9; + public static final int GL_NEGATIVE_Y_EXT = 0x87DA; + public static final int GL_NEGATIVE_Z_EXT = 0x87DB; + public static final int GL_NEGATIVE_W_EXT = 0x87DC; + public static final int GL_ZERO_EXT = 0x87DD; + public static final int GL_ONE_EXT = 0x87DE; + public static final int GL_NEGATIVE_ONE_EXT = 0x87DF; + public static final int GL_NORMALIZED_RANGE_EXT = 0x87E0; + public static final int GL_FULL_RANGE_EXT = 0x87E1; + public static final int GL_CURRENT_VERTEX_EXT = 0x87E2; + public static final int GL_MVP_MATRIX_EXT = 0x87E3; + public static final int GL_VARIANT_VALUE_EXT = 0x87E4; + public static final int GL_VARIANT_DATATYPE_EXT = 0x87E5; + public static final int GL_VARIANT_ARRAY_STRIDE_EXT = 0x87E6; + public static final int GL_VARIANT_ARRAY_TYPE_EXT = 0x87E7; + public static final int GL_VARIANT_ARRAY_EXT = 0x87E8; + public static final int GL_VARIANT_ARRAY_POINTER_EXT = 0x87E9; + public static final int GL_INVARIANT_VALUE_EXT = 0x87EA; + public static final int GL_INVARIANT_DATATYPE_EXT = 0x87EB; + public static final int GL_LOCAL_CONSTANT_VALUE_EXT = 0x87EC; + public static final int GL_LOCAL_CONSTANT_DATATYPE_EXT = 0x87ED; } Index: EXTVertexWeighting.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTVertexWeighting.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ext/EXTVertexWeighting.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTVertexWeighting.java 21 Dec 2002 12:37:19 -0000 1.2 +++ EXTVertexWeighting.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,17 +41,17 @@ public interface EXTVertexWeighting { - public static final int MODELVIEW0_STACK_DEPTH_EXT = 0x0BA3; /* alias to MODELVIEW_STACK_DEPTH */ - public static final int MODELVIEW1_STACK_DEPTH_EXT = 0x8502; - public static final int MODELVIEW0_MATRIX_EXT = 0x0BA6; /* alias to MODELVIEW_MATRIX */ - public static final int MODELVIEW1_MATRIX_EXT = 0x8506; - public static final int VERTEX_WEIGHTING_EXT = 0x8509; - public static final int MODELVIEW0_EXT = 0x1700; /* alias to MODELVIEW */ - public static final int MODELVIEW1_EXT = 0x850A; - public static final int CURRENT_VERTEX_WEIGHT_EXT = 0x850B; - public static final int VERTEX_WEIGHT_ARRAY_EXT = 0x850C; - public static final int VERTEX_WEIGHT_ARRAY_SIZE_EXT = 0x850D; - public static final int VERTEX_WEIGHT_ARRAY_TYPE_EXT = 0x850E; - public static final int VERTEX_WEIGHT_ARRAY_STRIDE_EXT = 0x850F; - public static final int VERTEX_WEIGHT_ARRAY_POINTER_EXT = 0x8510; + public static final int GL_MODELVIEW0_STACK_DEPTH_EXT = 0x0BA3; /* alias to MODELVIEW_STACK_DEPTH */ + public static final int GL_MODELVIEW1_STACK_DEPTH_EXT = 0x8502; + public static final int GL_MODELVIEW0_MATRIX_EXT = 0x0BA6; /* alias to MODELVIEW_MATRIX */ + public static final int GL_MODELVIEW1_MATRIX_EXT = 0x8506; + public static final int GL_VERTEX_WEIGHTING_EXT = 0x8509; + public static final int GL_MODELVIEW0_EXT = 0x1700; /* alias to MODELVIEW */ + public static final int GL_MODELVIEW1_EXT = 0x850A; + public static final int GL_CURRENT_VERTEX_WEIGHT_EXT = 0x850B; + public static final int GL_VERTEX_WEIGHT_ARRAY_EXT = 0x850C; + public static final int GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT = 0x850D; + public static final int GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT = 0x850E; + public static final int GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT = 0x850F; + public static final int GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT = 0x8510; } |
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/native/win32 Modified Files: org_lwjgl_Display.cpp org_lwjgl_Sys.cpp org_lwjgl_input_Cursor.cpp org_lwjgl_input_Keyboard.cpp org_lwjgl_input_Mouse.cpp Log Message: Ported OpenGL to Buffers Index: org_lwjgl_Display.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- org_lwjgl_Display.cpp 7 Jun 2003 19:28:52 -0000 1.40 +++ org_lwjgl_Display.cpp 24 Jun 2003 12:24:55 -0000 1.41 @@ -360,9 +360,9 @@ * Signature: (I)Z */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_Display_setGammaRamp - (JNIEnv * env, jclass clazz, jint gammaRampAddress) + (JNIEnv * env, jclass clazz, jobject gammaRampBuffer) { - float *gammaRamp = (float *)gammaRampAddress; + const float *gammaRamp = (const float *)env->GetDirectBufferAddress(gammaRampBuffer); // Turn array of floats into array of RGB WORDs for (int i = 0; i < 256; i ++) { Index: org_lwjgl_Sys.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Sys.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Sys.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- org_lwjgl_Sys.cpp 3 Apr 2003 20:20:29 -0000 1.7 +++ org_lwjgl_Sys.cpp 24 Jun 2003 12:24:55 -0000 1.8 @@ -54,32 +54,10 @@ * Method: nGetNULLValue * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_Sys_nGetNULLValue - (JNIEnv *, jclass) -{ - return (jint)NULL; -} - -/* - * Class: org_lwjgl_Sys - * Method: getDirectBufferAddress - * Signature: (Ljava/nio/Buffer;)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_Sys_getDirectBufferAddress - (JNIEnv * env, jclass clazz, jobject buf) -{ - return (jint) env->GetDirectBufferAddress(buf); -} - -/* - * Class: org_lwjgl_Sys - * Method: createDirectBuffer - * Signature: (II)Ljava/nio/ByteBuffer; - */ -JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_createDirectBuffer - (JNIEnv * env, jclass clazz, jint address, jint length) +JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_nGetNULLValue + (JNIEnv *env, jclass clazz) { - return env->NewDirectByteBuffer((void *)address, length); + return env->NewDirectByteBuffer(NULL, 0); } /* Index: org_lwjgl_input_Cursor.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Cursor.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Cursor.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_input_Cursor.cpp 20 May 2003 12:20:13 -0000 1.2 +++ org_lwjgl_input_Cursor.cpp 24 Jun 2003 12:24:55 -0000 1.3 @@ -8,15 +8,15 @@ * Signature: (IIIIIIIII)I */ JNIEXPORT jint JNICALL Java_org_lwjgl_input_Cursor_nCreateCursor - (JNIEnv *env, jclass clazz, jint width, jint height, jint x_hotspot, jint y_hotspot, jint num_images, jint image_address, jint delay_addresses) + (JNIEnv *env, jclass clazz, jint width, jint height, jint x_hotspot, jint y_hotspot, jint num_images, jobject image_buffer, jobject delay_buffer) { - int *pixels = (int *)image_address; - - BITMAPINFO bitmapInfo; + const int *pixels = (const int *)env->GetDirectBufferAddress(image_buffer); + + BITMAPINFO bitmapInfo; char *ptrCursorImage; - HBITMAP colorDIB; - HBITMAP colorBitmap; + HBITMAP colorDIB; + HBITMAP colorBitmap; int x, y; memset(&bitmapInfo, 0, sizeof(BITMAPINFO)); @@ -34,7 +34,7 @@ NULL, 0); int *srcPtr = pixels; char *dstPtr = ptrCursorImage; - if (!dstPtr) { + if (!dstPtr) { throwException(env, "Could not allocate DIB section."); return 0; } @@ -56,46 +56,46 @@ (BITMAPINFO*)&bitmapInfo, DIB_RGB_COLORS); - DeleteObject(colorDIB); - + DeleteObject(colorDIB); + // Convert alpha map to pixel packed mask - int bitWidth = width >> 3; - int scanlinePad = bitWidth & (sizeof(WORD) - 1); - int imageSize = (bitWidth + scanlinePad)*height; // Size in bits - unsigned char *maskPixels = new unsigned char[imageSize]; - memset(maskPixels, 0, imageSize); - int pixelCount = 0; - int maskCount = 0; - for (y = 0; y < height; y++) - for (x = 0; x < bitWidth; x++) { - unsigned char col0 = (pixels[pixelCount++] & 0x01000000) >> 17; - unsigned char col1 = (pixels[pixelCount++] & 0x01000000) >> 18; - unsigned char col2 = (pixels[pixelCount++] & 0x01000000) >> 19; - unsigned char col3 = (pixels[pixelCount++] & 0x01000000) >> 20; - unsigned char col4 = (pixels[pixelCount++] & 0x01000000) >> 21; - unsigned char col5 = (pixels[pixelCount++] & 0x01000000) >> 22; - unsigned char col6 = (pixels[pixelCount++] & 0x01000000) >> 23; - unsigned char col7 = (pixels[pixelCount++] & 0x01000000) >> 24; - unsigned char mask = col0 | col1 | col2 | col3 | col4 | col5 | col6 | col7; - maskPixels[maskCount++] = ~mask; // 1 is tranparant, 0 opaque - } - - HBITMAP cursorMask = CreateBitmap(width, height, 1, 1, maskPixels); - - HCURSOR cursor = NULL; - ICONINFO iconInfo; - memset(&iconInfo, 0, sizeof(ICONINFO)); - iconInfo.hbmMask = cursorMask; - iconInfo.hbmColor = colorBitmap; - iconInfo.fIcon = FALSE; - iconInfo.xHotspot = x_hotspot; - iconInfo.yHotspot = y_hotspot; - cursor = CreateIconIndirect(&iconInfo); - DeleteObject(colorBitmap); - DeleteObject(cursorMask); + int bitWidth = width >> 3; + int scanlinePad = bitWidth & (sizeof(WORD) - 1); + int imageSize = (bitWidth + scanlinePad)*height; // Size in bits + unsigned char *maskPixels = new unsigned char[imageSize]; + memset(maskPixels, 0, imageSize); + int pixelCount = 0; + int maskCount = 0; + for (y = 0; y < height; y++) + for (x = 0; x < bitWidth; x++) { + unsigned char col0 = (pixels[pixelCount++] & 0x01000000) >> 17; + unsigned char col1 = (pixels[pixelCount++] & 0x01000000) >> 18; + unsigned char col2 = (pixels[pixelCount++] & 0x01000000) >> 19; + unsigned char col3 = (pixels[pixelCount++] & 0x01000000) >> 20; + unsigned char col4 = (pixels[pixelCount++] & 0x01000000) >> 21; + unsigned char col5 = (pixels[pixelCount++] & 0x01000000) >> 22; + unsigned char col6 = (pixels[pixelCount++] & 0x01000000) >> 23; + unsigned char col7 = (pixels[pixelCount++] & 0x01000000) >> 24; + unsigned char mask = col0 | col1 | col2 | col3 | col4 | col5 | col6 | col7; + maskPixels[maskCount++] = ~mask; // 1 is tranparant, 0 opaque + } + + HBITMAP cursorMask = CreateBitmap(width, height, 1, 1, maskPixels); + + HCURSOR cursor = NULL; + ICONINFO iconInfo; + memset(&iconInfo, 0, sizeof(ICONINFO)); + iconInfo.hbmMask = cursorMask; + iconInfo.hbmColor = colorBitmap; + iconInfo.fIcon = FALSE; + iconInfo.xHotspot = x_hotspot; + iconInfo.yHotspot = y_hotspot; + cursor = CreateIconIndirect(&iconInfo); + DeleteObject(colorBitmap); + DeleteObject(cursorMask); delete[] maskPixels; - return (jint)cursor; + return (jint)cursor; } /* Index: org_lwjgl_input_Keyboard.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- org_lwjgl_input_Keyboard.cpp 7 Jun 2003 13:56:06 -0000 1.19 +++ org_lwjgl_input_Keyboard.cpp 24 Jun 2003 12:24:55 -0000 1.20 @@ -150,7 +150,7 @@ * Signature: (I)V */ JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nPoll - (JNIEnv * env, jclass clazz, jint buf) + (JNIEnv * env, jclass clazz, jobject buffer) { HRESULT ret; do { @@ -176,7 +176,8 @@ } } while (ret != DI_OK && ret != S_FALSE); - lpdiKeyboard->GetDeviceState(256, (void *)buf); + void *keyboardBuffer = (void *)env->GetDirectBufferAddress(buffer); + lpdiKeyboard->GetDeviceState(256, keyboardBuffer); } /* Index: org_lwjgl_input_Mouse.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- org_lwjgl_input_Mouse.cpp 7 Jun 2003 19:28:53 -0000 1.23 +++ org_lwjgl_input_Mouse.cpp 24 Jun 2003 12:24:55 -0000 1.24 @@ -166,7 +166,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nSetNativeCursor (JNIEnv *env, jclass clazz, jint cursor_handle) { - if (cursor_handle != NULL) { + if (cursor_handle != 0) { if (mDIDevice == NULL) throwException(env, "null device!"); mDIDevice->Unacquire(); |
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/java/org/lwjgl/opengl/arb Modified Files: ARBCubeMap.java ARBDepthTexture.java ARBMatrixPalette.java ARBMultisample.java ARBMultitexture.java ARBPointParameters.java ARBShadow.java ARBShadowAmbient.java ARBTextureBorderClamp.java ARBTextureCompression.java ARBTextureEnvCombine.java ARBTextureEnvDot3.java ARBTextureMirroredRepeat.java ARBTransposeMatrix.java ARBVertexBlend.java ARBVertexBufferObject.java ARBVertexProgram.java Log Message: Ported OpenGL to Buffers Index: ARBCubeMap.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBCubeMap.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBCubeMap.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBCubeMap.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ARBCubeMap.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,16 +41,16 @@ public interface ARBCubeMap { - public static final int NORMAL_MAP_ARB = 0x8511; - public static final int REFLECTION_MAP_ARB = 0x8512; - public static final int TEXTURE_CUBE_MAP_ARB = 0x8513; - public static final int TEXTURE_BINDING_CUBE_MAP_ARB = 0x8514; - public static final int TEXTURE_CUBE_MAP_POSITIVE_X_ARB = 0x8515; - public static final int TEXTURE_CUBE_MAP_NEGATIVE_X_ARB = 0x8516; - public static final int TEXTURE_CUBE_MAP_POSITIVE_Y_ARB = 0x8517; - public static final int TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB = 0x8518; - public static final int TEXTURE_CUBE_MAP_POSITIVE_Z_ARB = 0x8519; - public static final int TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB = 0x851A; - public static final int PROXY_TEXTURE_CUBE_MAP_ARB = 0x851B; - public static final int MAX_CUBE_MAP_TEXTURE_SIZE_ARB = 0x851C; + public static final int GL_NORMAL_MAP_ARB = 0x8511; + public static final int GL_REFLECTION_MAP_ARB = 0x8512; + public static final int GL_TEXTURE_CUBE_MAP_ARB = 0x8513; + public static final int GL_TEXTURE_BINDING_CUBE_MAP_ARB = 0x8514; + public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB = 0x8515; + public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB = 0x8516; + public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB = 0x8517; + public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB = 0x8518; + public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB = 0x8519; + public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB = 0x851A; + public static final int GL_PROXY_TEXTURE_CUBE_MAP_ARB = 0x851B; + public static final int GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB = 0x851C; } Index: ARBDepthTexture.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBDepthTexture.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBDepthTexture.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBDepthTexture.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ARBDepthTexture.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,9 +41,9 @@ public interface ARBDepthTexture { - public static final int DEPTH_COMPONENT16_ARB = 0x81A5; - public static final int DEPTH_COMPONENT24_ARB = 0x81A6; - public static final int DEPTH_COMPONENT32_ARB = 0x81A7; - public static final int TEXTURE_DEPTH_SIZE_ARB = 0x884A; - public static final int DEPTH_TEXTURE_MODE_ARB = 0x884B; + public static final int GL_DEPTH_COMPONENT16_ARB = 0x81A5; + public static final int GL_DEPTH_COMPONENT24_ARB = 0x81A6; + public static final int GL_DEPTH_COMPONENT32_ARB = 0x81A7; + public static final int GL_TEXTURE_DEPTH_SIZE_ARB = 0x884A; + public static final int GL_DEPTH_TEXTURE_MODE_ARB = 0x884B; } Index: ARBMatrixPalette.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBMatrixPalette.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBMatrixPalette.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBMatrixPalette.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ARBMatrixPalette.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,14 +41,14 @@ public interface ARBMatrixPalette { - public static final int MATRIX_PALETTE_ARB = 0x8840; - public static final int MAX_MATRIX_PALETTE_STACK_DEPTH_ARB = 0x8841; - public static final int MAX_PALETTE_MATRICES_ARB = 0x8842; - public static final int CURRENT_PALETTE_MATRIX_ARB = 0x8843; - public static final int MATRIX_INDEX_ARRAY_ARB = 0x8844; - public static final int CURRENT_MATRIX_INDEX_ARB = 0x8845; - public static final int MATRIX_INDEX_ARRAY_SIZE_ARB = 0x8846; - public static final int MATRIX_INDEX_ARRAY_TYPE_ARB = 0x8847; - public static final int MATRIX_INDEX_ARRAY_STRIDE_ARB = 0x8848; - public static final int MATRIX_INDEX_ARRAY_POINTER_ARB = 0x8849; + public static final int GL_MATRIX_PALETTE_ARB = 0x8840; + public static final int GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB = 0x8841; + public static final int GL_MAX_PALETTE_MATRICES_ARB = 0x8842; + public static final int GL_CURRENT_PALETTE_MATRIX_ARB = 0x8843; + public static final int GL_MATRIX_INDEX_ARRAY_ARB = 0x8844; + public static final int GL_CURRENT_MATRIX_INDEX_ARB = 0x8845; + public static final int GL_MATRIX_INDEX_ARRAY_SIZE_ARB = 0x8846; + public static final int GL_MATRIX_INDEX_ARRAY_TYPE_ARB = 0x8847; + public static final int GL_MATRIX_INDEX_ARRAY_STRIDE_ARB = 0x8848; + public static final int GL_MATRIX_INDEX_ARRAY_POINTER_ARB = 0x8849; } Index: ARBMultisample.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBMultisample.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBMultisample.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBMultisample.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ARBMultisample.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,13 +41,13 @@ public interface ARBMultisample { - public static final int MULTISAMPLE_ARB = 0x809D; - public static final int SAMPLE_ALPHA_TO_COVERAGE_ARB = 0x809E; - public static final int SAMPLE_ALPHA_TO_ONE_ARB = 0x809F; - public static final int SAMPLE_COVERAGE_ARB = 0x80A0; - public static final int SAMPLE_BUFFERS_ARB = 0x80A8; - public static final int SAMPLES_ARB = 0x80A9; - public static final int SAMPLE_COVERAGE_VALUE_ARB = 0x80AA; - public static final int SAMPLE_COVERAGE_INVERT_ARB = 0x80AB; - public static final int MULTISAMPLE_BIT_ARB = 0x20000000; + public static final int GL_MULTISAMPLE_ARB = 0x809D; + public static final int GL_SAMPLE_ALPHA_TO_COVERAGE_ARB = 0x809E; + public static final int GL_SAMPLE_ALPHA_TO_ONE_ARB = 0x809F; + public static final int GL_SAMPLE_COVERAGE_ARB = 0x80A0; + public static final int GL_SAMPLE_BUFFERS_ARB = 0x80A8; + public static final int GL_SAMPLES_ARB = 0x80A9; + public static final int GL_SAMPLE_COVERAGE_VALUE_ARB = 0x80AA; + public static final int GL_SAMPLE_COVERAGE_INVERT_ARB = 0x80AB; + public static final int GL_MULTISAMPLE_BIT_ARB = 0x20000000; } Index: ARBMultitexture.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBMultitexture.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBMultitexture.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBMultitexture.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ARBMultitexture.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,39 +41,39 @@ public interface ARBMultitexture { - public static final int TEXTURE0_ARB = 0x84C0; - public static final int TEXTURE1_ARB = 0x84C1; - public static final int TEXTURE2_ARB = 0x84C2; - public static final int TEXTURE3_ARB = 0x84C3; - public static final int TEXTURE4_ARB = 0x84C4; - public static final int TEXTURE5_ARB = 0x84C5; - public static final int TEXTURE6_ARB = 0x84C6; - public static final int TEXTURE7_ARB = 0x84C7; - public static final int TEXTURE8_ARB = 0x84C8; - public static final int TEXTURE9_ARB = 0x84C9; - public static final int TEXTURE10_ARB = 0x84CA; - public static final int TEXTURE11_ARB = 0x84CB; - public static final int TEXTURE12_ARB = 0x84CC; - public static final int TEXTURE13_ARB = 0x84CD; - public static final int TEXTURE14_ARB = 0x84CE; - public static final int TEXTURE15_ARB = 0x84CF; - public static final int TEXTURE16_ARB = 0x84D0; - public static final int TEXTURE17_ARB = 0x84D1; - public static final int TEXTURE18_ARB = 0x84D2; - public static final int TEXTURE19_ARB = 0x84D3; - public static final int TEXTURE20_ARB = 0x84D4; - public static final int TEXTURE21_ARB = 0x84D5; - public static final int TEXTURE22_ARB = 0x84D6; - public static final int TEXTURE23_ARB = 0x84D7; - public static final int TEXTURE24_ARB = 0x84D8; - public static final int TEXTURE25_ARB = 0x84D9; - public static final int TEXTURE26_ARB = 0x84DA; - public static final int TEXTURE27_ARB = 0x84DB; - public static final int TEXTURE28_ARB = 0x84DC; - public static final int TEXTURE29_ARB = 0x84DD; - public static final int TEXTURE30_ARB = 0x84DE; - public static final int TEXTURE31_ARB = 0x84DF; - public static final int ACTIVE_TEXTURE_ARB = 0x84E0; - public static final int CLIENT_ACTIVE_TEXTURE_ARB = 0x84E1; - public static final int MAX_TEXTURE_UNITS_ARB = 0x84E2; + public static final int GL_TEXTURE0_ARB = 0x84C0; + public static final int GL_TEXTURE1_ARB = 0x84C1; + public static final int GL_TEXTURE2_ARB = 0x84C2; + public static final int GL_TEXTURE3_ARB = 0x84C3; + public static final int GL_TEXTURE4_ARB = 0x84C4; + public static final int GL_TEXTURE5_ARB = 0x84C5; + public static final int GL_TEXTURE6_ARB = 0x84C6; + public static final int GL_TEXTURE7_ARB = 0x84C7; + public static final int GL_TEXTURE8_ARB = 0x84C8; + public static final int GL_TEXTURE9_ARB = 0x84C9; + public static final int GL_TEXTURE10_ARB = 0x84CA; + public static final int GL_TEXTURE11_ARB = 0x84CB; + public static final int GL_TEXTURE12_ARB = 0x84CC; + public static final int GL_TEXTURE13_ARB = 0x84CD; + public static final int GL_TEXTURE14_ARB = 0x84CE; + public static final int GL_TEXTURE15_ARB = 0x84CF; + public static final int GL_TEXTURE16_ARB = 0x84D0; + public static final int GL_TEXTURE17_ARB = 0x84D1; + public static final int GL_TEXTURE18_ARB = 0x84D2; + public static final int GL_TEXTURE19_ARB = 0x84D3; + public static final int GL_TEXTURE20_ARB = 0x84D4; + public static final int GL_TEXTURE21_ARB = 0x84D5; + public static final int GL_TEXTURE22_ARB = 0x84D6; + public static final int GL_TEXTURE23_ARB = 0x84D7; + public static final int GL_TEXTURE24_ARB = 0x84D8; + public static final int GL_TEXTURE25_ARB = 0x84D9; + public static final int GL_TEXTURE26_ARB = 0x84DA; + public static final int GL_TEXTURE27_ARB = 0x84DB; + public static final int GL_TEXTURE28_ARB = 0x84DC; + public static final int GL_TEXTURE29_ARB = 0x84DD; + public static final int GL_TEXTURE30_ARB = 0x84DE; + public static final int GL_TEXTURE31_ARB = 0x84DF; + public static final int GL_ACTIVE_TEXTURE_ARB = 0x84E0; + public static final int GL_CLIENT_ACTIVE_TEXTURE_ARB = 0x84E1; + public static final int GL_MAX_TEXTURE_UNITS_ARB = 0x84E2; } Index: ARBPointParameters.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBPointParameters.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBPointParameters.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBPointParameters.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ARBPointParameters.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,8 +41,8 @@ public interface ARBPointParameters { - public static final int POINT_SIZE_MIN_ARB = 0x8126; - public static final int POINT_SIZE_MAX_ARB = 0x8127; - public static final int POINT_FADE_THRESHOLD_SIZE_ARB = 0x8128; - public static final int POINT_DISTANCE_ATTENUATION_ARB = 0x8129; + public static final int GL_POINT_SIZE_MIN_ARB = 0x8126; + public static final int GL_POINT_SIZE_MAX_ARB = 0x8127; + public static final int GL_POINT_FADE_THRESHOLD_SIZE_ARB = 0x8128; + public static final int GL_POINT_DISTANCE_ATTENUATION_ARB = 0x8129; } Index: ARBShadow.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBShadow.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBShadow.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBShadow.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ARBShadow.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,7 +41,7 @@ public interface ARBShadow { - public static final int TEXTURE_COMPARE_MODE_ARB = 0x884C; - public static final int TEXTURE_COMPARE_FUNC_ARB = 0x884D; - public static final int COMPARE_R_TO_TEXTURE_ARB = 0x884E; + public static final int GL_TEXTURE_COMPARE_MODE_ARB = 0x884C; + public static final int GL_TEXTURE_COMPARE_FUNC_ARB = 0x884D; + public static final int GL_COMPARE_R_TO_TEXTURE_ARB = 0x884E; } Index: ARBShadowAmbient.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBShadowAmbient.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBShadowAmbient.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBShadowAmbient.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ARBShadowAmbient.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,5 +41,5 @@ public interface ARBShadowAmbient { - public static final int TEXTURE_COMPARE_FAIL_VALUE_ARB = 0x80BF; + public static final int GL_TEXTURE_COMPARE_FAIL_VALUE_ARB = 0x80BF; } Index: ARBTextureBorderClamp.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBTextureBorderClamp.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBTextureBorderClamp.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBTextureBorderClamp.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ARBTextureBorderClamp.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,5 +41,5 @@ public interface ARBTextureBorderClamp { - public static final int CLAMP_TO_BORDER_ARB = 0x812D; + public static final int GL_CLAMP_TO_BORDER_ARB = 0x812D; } Index: ARBTextureCompression.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBTextureCompression.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBTextureCompression.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBTextureCompression.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ARBTextureCompression.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,15 +41,15 @@ public interface ARBTextureCompression { - public static final int COMPRESSED_ALPHA_ARB = 0x84E9; - public static final int COMPRESSED_LUMINANCE_ARB = 0x84EA; - public static final int COMPRESSED_LUMINANCE_ALPHA_ARB = 0x84EB; - public static final int COMPRESSED_INTENSITY_ARB = 0x84EC; - public static final int COMPRESSED_RGB_ARB = 0x84ED; - public static final int COMPRESSED_RGBA_ARB = 0x84EE; - public static final int TEXTURE_COMPRESSION_HINT_ARB = 0x84EF; - public static final int TEXTURE_IMAGE_SIZE_ARB = 0x86A0; - public static final int TEXTURE_COMPRESSED_ARB = 0x86A1; - public static final int NUM_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A2; - public static final int COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A3; + public static final int GL_COMPRESSED_ALPHA_ARB = 0x84E9; + public static final int GL_COMPRESSED_LUMINANCE_ARB = 0x84EA; + public static final int GL_COMPRESSED_LUMINANCE_ALPHA_ARB = 0x84EB; + public static final int GL_COMPRESSED_INTENSITY_ARB = 0x84EC; + public static final int GL_COMPRESSED_RGB_ARB = 0x84ED; + public static final int GL_COMPRESSED_RGBA_ARB = 0x84EE; + public static final int GL_TEXTURE_COMPRESSION_HINT_ARB = 0x84EF; + public static final int GL_TEXTURE_IMAGE_SIZE_ARB = 0x86A0; + public static final int GL_TEXTURE_COMPRESSED_ARB = 0x86A1; + public static final int GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A2; + public static final int GL_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A3; } Index: ARBTextureEnvCombine.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBTextureEnvCombine.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBTextureEnvCombine.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBTextureEnvCombine.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ARBTextureEnvCombine.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,25 +41,25 @@ public interface ARBTextureEnvCombine { - public static final int COMBINE_ARB = 0x8570; - public static final int COMBINE_RGB_ARB = 0x8571; - public static final int COMBINE_ALPHA_ARB = 0x8572; - public static final int RGB_SCALE_ARB = 0x8573; - public static final int ADD_SIGNED_ARB = 0x8574; - public static final int INTERPOLATE_ARB = 0x8575; - public static final int CONSTANT_ARB = 0x8576; - public static final int PRIMARY_COLOR_ARB = 0x8577; - public static final int PREVIOUS_ARB = 0x8578; - public static final int SOURCE0_RGB_ARB = 0x8580; - public static final int SOURCE1_RGB_ARB = 0x8581; - public static final int SOURCE2_RGB_ARB = 0x8582; - public static final int SOURCE0_ALPHA_ARB = 0x8588; - public static final int SOURCE1_ALPHA_ARB = 0x8589; - public static final int SOURCE2_ALPHA_ARB = 0x858A; - public static final int OPERAND0_RGB_ARB = 0x8590; - public static final int OPERAND1_RGB_ARB = 0x8591; - public static final int OPERAND2_RGB_ARB = 0x8592; - public static final int OPERAND0_ALPHA_ARB = 0x8598; - public static final int OPERAND1_ALPHA_ARB = 0x8599; - public static final int OPERAND2_ALPHA_ARB = 0x859A; + public static final int GL_COMBINE_ARB = 0x8570; + public static final int GL_COMBINE_RGB_ARB = 0x8571; + public static final int GL_COMBINE_ALPHA_ARB = 0x8572; + public static final int GL_RGB_SCALE_ARB = 0x8573; + public static final int GL_ADD_SIGNED_ARB = 0x8574; + public static final int GL_INTERPOLATE_ARB = 0x8575; + public static final int GL_CONSTANT_ARB = 0x8576; + public static final int GL_PRIMARY_COLOR_ARB = 0x8577; + public static final int GL_PREVIOUS_ARB = 0x8578; + public static final int GL_SOURCE0_RGB_ARB = 0x8580; + public static final int GL_SOURCE1_RGB_ARB = 0x8581; + public static final int GL_SOURCE2_RGB_ARB = 0x8582; + public static final int GL_SOURCE0_ALPHA_ARB = 0x8588; + public static final int GL_SOURCE1_ALPHA_ARB = 0x8589; + public static final int GL_SOURCE2_ALPHA_ARB = 0x858A; + public static final int GL_OPERAND0_RGB_ARB = 0x8590; + public static final int GL_OPERAND1_RGB_ARB = 0x8591; + public static final int GL_OPERAND2_RGB_ARB = 0x8592; + public static final int GL_OPERAND0_ALPHA_ARB = 0x8598; + public static final int GL_OPERAND1_ALPHA_ARB = 0x8599; + public static final int GL_OPERAND2_ALPHA_ARB = 0x859A; } Index: ARBTextureEnvDot3.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBTextureEnvDot3.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBTextureEnvDot3.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBTextureEnvDot3.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ARBTextureEnvDot3.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,7 +41,7 @@ public interface ARBTextureEnvDot3 { - public static final int DOT3_RGB_ARB = 0x86AE; - public static final int DOT3_RGBA_ARB = 0x86AF; + public static final int GL_DOT3_RGB_ARB = 0x86AE; + public static final int GL_DOT3_RGBA_ARB = 0x86AF; } Index: ARBTextureMirroredRepeat.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBTextureMirroredRepeat.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBTextureMirroredRepeat.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBTextureMirroredRepeat.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ARBTextureMirroredRepeat.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,5 +41,5 @@ public interface ARBTextureMirroredRepeat { - public static final int MIRRORED_REPEAT_ARB = 0x8370; + public static final int GL_MIRRORED_REPEAT_ARB = 0x8370; } Index: ARBTransposeMatrix.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBTransposeMatrix.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBTransposeMatrix.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBTransposeMatrix.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ARBTransposeMatrix.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,8 +41,8 @@ public interface ARBTransposeMatrix { - public static final int TRANSPOSE_MODELVIEW_MATRIX_ARB = 0x84E3; - public static final int TRANSPOSE_PROJECTION_MATRIX_ARB = 0x84E4; - public static final int TRANSPOSE_TEXTURE_MATRIX_ARB = 0x84E5; - public static final int TRANSPOSE_COLOR_MATRIX_ARB = 0x84E6; + public static final int GL_TRANSPOSE_MODELVIEW_MATRIX_ARB = 0x84E3; + public static final int GL_TRANSPOSE_PROJECTION_MATRIX_ARB = 0x84E4; + public static final int GL_TRANSPOSE_TEXTURE_MATRIX_ARB = 0x84E5; + public static final int GL_TRANSPOSE_COLOR_MATRIX_ARB = 0x84E6; } Index: ARBVertexBlend.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBVertexBlend.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBVertexBlend.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBVertexBlend.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ARBVertexBlend.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,46 +41,46 @@ public interface ARBVertexBlend { - public static final int MAX_VERTEX_UNITS_ARB = 0x86A4; - public static final int ACTIVE_VERTEX_UNITS_ARB = 0x86A5; - public static final int WEIGHT_SUM_UNITY_ARB = 0x86A6; - public static final int VERTEX_BLEND_ARB = 0x86A7; - public static final int CURRENT_WEIGHT_ARB = 0x86A8; - public static final int WEIGHT_ARRAY_TYPE_ARB = 0x86A9; - public static final int WEIGHT_ARRAY_STRIDE_ARB = 0x86AA; - public static final int WEIGHT_ARRAY_SIZE_ARB = 0x86AB; - public static final int WEIGHT_ARRAY_POINTER_ARB = 0x86AC; - public static final int WEIGHT_ARRAY_ARB = 0x86AD; - public static final int MODELVIEW0_ARB = 0x1700; - public static final int MODELVIEW1_ARB = 0x850a; - public static final int MODELVIEW2_ARB = 0x8722; - public static final int MODELVIEW3_ARB = 0x8723; - public static final int MODELVIEW4_ARB = 0x8724; - public static final int MODELVIEW5_ARB = 0x8725; - public static final int MODELVIEW6_ARB = 0x8726; - public static final int MODELVIEW7_ARB = 0x8727; - public static final int MODELVIEW8_ARB = 0x8728; - public static final int MODELVIEW9_ARB = 0x8729; - public static final int MODELVIEW10_ARB = 0x872A; - public static final int MODELVIEW11_ARB = 0x872B; - public static final int MODELVIEW12_ARB = 0x872C; - public static final int MODELVIEW13_ARB = 0x872D; - public static final int MODELVIEW14_ARB = 0x872E; - public static final int MODELVIEW15_ARB = 0x872F; - public static final int MODELVIEW16_ARB = 0x8730; - public static final int MODELVIEW17_ARB = 0x8731; - public static final int MODELVIEW18_ARB = 0x8732; - public static final int MODELVIEW19_ARB = 0x8733; - public static final int MODELVIEW20_ARB = 0x8734; - public static final int MODELVIEW21_ARB = 0x8735; - public static final int MODELVIEW22_ARB = 0x8736; - public static final int MODELVIEW23_ARB = 0x8737; - public static final int MODELVIEW24_ARB = 0x8738; - public static final int MODELVIEW25_ARB = 0x8739; - public static final int MODELVIEW26_ARB = 0x873A; - public static final int MODELVIEW27_ARB = 0x873B; - public static final int MODELVIEW28_ARB = 0x873C; - public static final int MODELVIEW29_ARB = 0x873D; - public static final int MODELVIEW30_ARB = 0x873E; - public static final int MODELVIEW31_ARB = 0x873F; + public static final int GL_MAX_VERTEX_UNITS_ARB = 0x86A4; + public static final int GL_ACTIVE_VERTEX_UNITS_ARB = 0x86A5; + public static final int GL_WEIGHT_SUM_UNITY_ARB = 0x86A6; + public static final int GL_VERTEX_BLEND_ARB = 0x86A7; + public static final int GL_CURRENT_WEIGHT_ARB = 0x86A8; + public static final int GL_WEIGHT_ARRAY_TYPE_ARB = 0x86A9; + public static final int GL_WEIGHT_ARRAY_STRIDE_ARB = 0x86AA; + public static final int GL_WEIGHT_ARRAY_SIZE_ARB = 0x86AB; + public static final int GL_WEIGHT_ARRAY_POINTER_ARB = 0x86AC; + public static final int GL_WEIGHT_ARRAY_ARB = 0x86AD; + public static final int GL_MODELVIEW0_ARB = 0x1700; + public static final int GL_MODELVIEW1_ARB = 0x850a; + public static final int GL_MODELVIEW2_ARB = 0x8722; + public static final int GL_MODELVIEW3_ARB = 0x8723; + public static final int GL_MODELVIEW4_ARB = 0x8724; + public static final int GL_MODELVIEW5_ARB = 0x8725; + public static final int GL_MODELVIEW6_ARB = 0x8726; + public static final int GL_MODELVIEW7_ARB = 0x8727; + public static final int GL_MODELVIEW8_ARB = 0x8728; + public static final int GL_MODELVIEW9_ARB = 0x8729; + public static final int GL_MODELVIEW10_ARB = 0x872A; + public static final int GL_MODELVIEW11_ARB = 0x872B; + public static final int GL_MODELVIEW12_ARB = 0x872C; + public static final int GL_MODELVIEW13_ARB = 0x872D; + public static final int GL_MODELVIEW14_ARB = 0x872E; + public static final int GL_MODELVIEW15_ARB = 0x872F; + public static final int GL_MODELVIEW16_ARB = 0x8730; + public static final int GL_MODELVIEW17_ARB = 0x8731; + public static final int GL_MODELVIEW18_ARB = 0x8732; + public static final int GL_MODELVIEW19_ARB = 0x8733; + public static final int GL_MODELVIEW20_ARB = 0x8734; + public static final int GL_MODELVIEW21_ARB = 0x8735; + public static final int GL_MODELVIEW22_ARB = 0x8736; + public static final int GL_MODELVIEW23_ARB = 0x8737; + public static final int GL_MODELVIEW24_ARB = 0x8738; + public static final int GL_MODELVIEW25_ARB = 0x8739; + public static final int GL_MODELVIEW26_ARB = 0x873A; + public static final int GL_MODELVIEW27_ARB = 0x873B; + public static final int GL_MODELVIEW28_ARB = 0x873C; + public static final int GL_MODELVIEW29_ARB = 0x873D; + public static final int GL_MODELVIEW30_ARB = 0x873E; + public static final int GL_MODELVIEW31_ARB = 0x873F; } Index: ARBVertexBufferObject.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBVertexBufferObject.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBVertexBufferObject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBVertexBufferObject.java 3 Apr 2003 11:32:27 -0000 1.1 +++ ARBVertexBufferObject.java 24 Jun 2003 12:24:54 -0000 1.2 @@ -43,35 +43,35 @@ public interface ARBVertexBufferObject { - public static final int ARRAY_BUFFER_ARB = 0x8892; - public static final int ELEMENT_ARRAY_BUFFER_ARB = 0x8893; - public static final int ARRAY_BUFFER_BINDING_ARB = 0x8894; - public static final int ELEMENT_ARRAY_BUFFER_BINDING_ARB = 0x8895; - public static final int VERTEX_ARRAY_BUFFER_BINDING_ARB = 0x8896; - public static final int NORMAL_ARRAY_BUFFER_BINDING_ARB = 0x8897; - public static final int COLOR_ARRAY_BUFFER_BINDING_ARB = 0x8898; - public static final int INDEX_ARRAY_BUFFER_BINDING_ARB = 0x8899; - public static final int TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB = 0x889A; - public static final int EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB = 0x889B; - public static final int SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x889C; - public static final int FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB = 0x889D; - public static final int WEIGHT_ARRAY_BUFFER_BINDING_ARB = 0x889E; - public static final int VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB = 0x889F; - public static final int STREAM_DRAW_ARB = 0x88E0; - public static final int STREAM_READ_ARB = 0x88E1; - public static final int STREAM_COPY_ARB = 0x88E2; - public static final int STATIC_DRAW_ARB = 0x88E4; - public static final int STATIC_READ_ARB = 0x88E5; - public static final int STATIC_COPY_ARB = 0x88E6; - public static final int DYNAMIC_DRAW_ARB = 0x88E8; - public static final int DYNAMIC_READ_ARB = 0x88E9; - public static final int DYNAMIC_COPY_ARB = 0x88EA; - public static final int READ_ONLY_ARB = 0x88B8; - public static final int WRITE_ONLY_ARB = 0x88B9; - public static final int READ_WRITE_ARB = 0x88BA; - public static final int BUFFER_SIZE_ARB = 0x8764; - public static final int BUFFER_USAGE_ARB = 0x8765; - public static final int BUFFER_ACCESS_ARB = 0x88BB; - public static final int BUFFER_MAPPED_ARB = 0x88BC; - public static final int BUFFER_MAP_POINTER_ARB = 0x88BD; + public static final int GL_ARRAY_BUFFER_ARB = 0x8892; + public static final int GL_ELEMENT_ARRAY_BUFFER_ARB = 0x8893; + public static final int GL_ARRAY_BUFFER_BINDING_ARB = 0x8894; + public static final int GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB = 0x8895; + public static final int GL_VERTEX_ARRAY_BUFFER_BINDING_ARB = 0x8896; + public static final int GL_NORMAL_ARRAY_BUFFER_BINDING_ARB = 0x8897; + public static final int GL_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x8898; + public static final int GL_INDEX_ARRAY_BUFFER_BINDING_ARB = 0x8899; + public static final int GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB = 0x889A; + public static final int GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB = 0x889B; + public static final int GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x889C; + public static final int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB = 0x889D; + public static final int GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB = 0x889E; + public static final int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB = 0x889F; + public static final int GL_STREAM_DRAW_ARB = 0x88E0; + public static final int GL_STREAM_READ_ARB = 0x88E1; + public static final int GL_STREAM_COPY_ARB = 0x88E2; + public static final int GL_STATIC_DRAW_ARB = 0x88E4; + public static final int GL_STATIC_READ_ARB = 0x88E5; + public static final int GL_STATIC_COPY_ARB = 0x88E6; + public static final int GL_DYNAMIC_DRAW_ARB = 0x88E8; + public static final int GL_DYNAMIC_READ_ARB = 0x88E9; + public static final int GL_DYNAMIC_COPY_ARB = 0x88EA; + public static final int GL_READ_ONLY_ARB = 0x88B8; + public static final int GL_WRITE_ONLY_ARB = 0x88B9; + public static final int GL_READ_WRITE_ARB = 0x88BA; + public static final int GL_BUFFER_SIZE_ARB = 0x8764; + public static final int GL_BUFFER_USAGE_ARB = 0x8765; + public static final int GL_BUFFER_ACCESS_ARB = 0x88BB; + public static final int GL_BUFFER_MAPPED_ARB = 0x88BC; + public static final int GL_BUFFER_MAP_POINTER_ARB = 0x88BD; } Index: ARBVertexProgram.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBVertexProgram.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/arb/ARBVertexProgram.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBVertexProgram.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ARBVertexProgram.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,83 +41,83 @@ public interface ARBVertexProgram { - public static final int VERTEX_PROGRAM_ARB = 0x8620; - public static final int VERTEX_PROGRAM_POINT_SIZE_ARB = 0x8642; - public static final int VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643; - public static final int COLOR_SUM_ARB = 0x8458; - public static final int PROGRAM_FORMAT_ASCII_ARB = 0x8875; - public static final int VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622; - public static final int VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623; - public static final int VERTEX_ATTRIB_ARRAY_STRIDE_ARB = 0x8624; - public static final int VERTEX_ATTRIB_ARRAY_TYPE_ARB = 0x8625; - public static final int VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB = 0x886A; - public static final int CURRENT_VERTEX_ATTRIB_ARB = 0x8626; - public static final int VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645; - public static final int PROGRAM_LENGTH_ARB = 0x8627; - public static final int PROGRAM_FORMAT_ARB = 0x8876; - public static final int PROGRAM_BINDING_ARB = 0x8677; - public static final int PROGRAM_INSTRUCTIONS_ARB = 0x88A0; - public static final int MAX_PROGRAM_INSTRUCTIONS_ARB = 0x88A1; - public static final int PROGRAM_NATIVE_INSTRUCTIONS_ARB = 0x88A2; - public static final int MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB = 0x88A3; - public static final int PROGRAM_TEMPORARIES_ARB = 0x88A4; - public static final int MAX_PROGRAM_TEMPORARIES_ARB = 0x88A5; - public static final int PROGRAM_NATIVE_TEMPORARIES_ARB = 0x88A6; - public static final int MAX_PROGRAM_NATIVE_TEMPORARIES_ARB = 0x88A7; - public static final int PROGRAM_PARAMETERS_ARB = 0x88A8; - public static final int MAX_PROGRAM_PARAMETERS_ARB = 0x88A9; - public static final int PROGRAM_NATIVE_PARAMETERS_ARB = 0x88AA; - public static final int MAX_PROGRAM_NATIVE_PARAMETERS_ARB = 0x88AB; - public static final int PROGRAM_ATTRIBS_ARB = 0x88AC; - public static final int MAX_PROGRAM_ATTRIBS_ARB = 0x88AD; - public static final int PROGRAM_NATIVE_ATTRIBS_ARB = 0x88AE; - public static final int MAX_PROGRAM_NATIVE_ATTRIBS_ARB = 0x88AF; - public static final int PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B0; - public static final int MAX_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B1; - public static final int PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B2; - public static final int MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B3; - public static final int MAX_PROGRAM_LOCAL_PARAMETERS_ARB = 0x88B4; - public static final int MAX_PROGRAM_ENV_PARAMETERS_ARB = 0x88B5; - public static final int PROGRAM_UNDER_NATIVE_LIMITS_ARB = 0x88B6; - public static final int PROGRAM_STRING_ARB = 0x8628; - public static final int PROGRAM_ERROR_POSITION_ARB = 0x864B; - public static final int CURRENT_MATRIX_ARB = 0x8641; - public static final int TRANSPOSE_CURRENT_MATRIX_ARB = 0x88B7; - public static final int CURRENT_MATRIX_STACK_DEPTH_ARB = 0x8640; - public static final int MAX_VERTEX_ATTRIBS_ARB = 0x8869; - public static final int MAX_PROGRAM_MATRICES_ARB = 0x862F; - public static final int MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB = 0x862E; - public static final int PROGRAM_ERROR_STRING_ARB = 0x8874; - public static final int MATRIX0_ARB = 0x88C0; - public static final int MATRIX1_ARB = 0x88C1; - public static final int MATRIX2_ARB = 0x88C2; - public static final int MATRIX3_ARB = 0x88C3; - public static final int MATRIX4_ARB = 0x88C4; - public static final int MATRIX5_ARB = 0x88C5; - public static final int MATRIX6_ARB = 0x88C6; - public static final int MATRIX7_ARB = 0x88C7; - public static final int MATRIX8_ARB = 0x88C8; - public static final int MATRIX9_ARB = 0x88C9; - public static final int MATRIX10_ARB = 0x88CA; - public static final int MATRIX11_ARB = 0x88CB; - public static final int MATRIX12_ARB = 0x88CC; - public static final int MATRIX13_ARB = 0x88CD; - public static final int MATRIX14_ARB = 0x88CE; - public static final int MATRIX15_ARB = 0x88CF; - public static final int MATRIX16_ARB = 0x88D0; - public static final int MATRIX17_ARB = 0x88D1; - public static final int MATRIX18_ARB = 0x88D2; - public static final int MATRIX19_ARB = 0x88D3; - public static final int MATRIX20_ARB = 0x88D4; - public static final int MATRIX21_ARB = 0x88D5; - public static final int MATRIX22_ARB = 0x88D6; - public static final int MATRIX23_ARB = 0x88D7; - public static final int MATRIX24_ARB = 0x88D8; - public static final int MATRIX25_ARB = 0x88D9; - public static final int MATRIX26_ARB = 0x88DA; - public static final int MATRIX27_ARB = 0x88DB; - public static final int MATRIX28_ARB = 0x88DC; - public static final int MATRIX29_ARB = 0x88DD; - public static final int MATRIX30_ARB = 0x88DE; - public static final int MATRIX31_ARB = 0x88DF; + public static final int GL_VERTEX_PROGRAM_ARB = 0x8620; + public static final int GL_VERTEX_PROGRAM_POINT_SIZE_ARB = 0x8642; + public static final int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643; + public static final int GL_COLOR_SUM_ARB = 0x8458; + public static final int GL_PROGRAM_FORMAT_ASCII_ARB = 0x8875; + public static final int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622; + public static final int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623; + public static final int GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB = 0x8624; + public static final int GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB = 0x8625; + public static final int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB = 0x886A; + public static final int GL_CURRENT_VERTEX_ATTRIB_ARB = 0x8626; + public static final int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645; + public static final int GL_PROGRAM_LENGTH_ARB = 0x8627; + public static final int GL_PROGRAM_FORMAT_ARB = 0x8876; + public static final int GL_PROGRAM_BINDING_ARB = 0x8677; + public static final int GL_PROGRAM_INSTRUCTIONS_ARB = 0x88A0; + public static final int GL_MAX_PROGRAM_INSTRUCTIONS_ARB = 0x88A1; + public static final int GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB = 0x88A2; + public static final int GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB = 0x88A3; + public static final int GL_PROGRAM_TEMPORARIES_ARB = 0x88A4; + public static final int GL_MAX_PROGRAM_TEMPORARIES_ARB = 0x88A5; + public static final int GL_PROGRAM_NATIVE_TEMPORARIES_ARB = 0x88A6; + public static final int GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB = 0x88A7; + public static final int GL_PROGRAM_PARAMETERS_ARB = 0x88A8; + public static final int GL_MAX_PROGRAM_PARAMETERS_ARB = 0x88A9; + public static final int GL_PROGRAM_NATIVE_PARAMETERS_ARB = 0x88AA; + public static final int GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB = 0x88AB; + public static final int GL_PROGRAM_ATTRIBS_ARB = 0x88AC; + public static final int GL_MAX_PROGRAM_ATTRIBS_ARB = 0x88AD; + public static final int GL_PROGRAM_NATIVE_ATTRIBS_ARB = 0x88AE; + public static final int GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB = 0x88AF; + public static final int GL_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B0; + public static final int GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B1; + public static final int GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B2; + public static final int GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B3; + public static final int GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB = 0x88B4; + public static final int GL_MAX_PROGRAM_ENV_PARAMETERS_ARB = 0x88B5; + public static final int GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB = 0x88B6; + public static final int GL_PROGRAM_STRING_ARB = 0x8628; + public static final int GL_PROGRAM_ERROR_POSITION_ARB = 0x864B; + public static final int GL_CURRENT_MATRIX_ARB = 0x8641; + public static final int GL_TRANSPOSE_CURRENT_MATRIX_ARB = 0x88B7; + public static final int GL_CURRENT_MATRIX_STACK_DEPTH_ARB = 0x8640; + public static final int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869; + public static final int GL_MAX_PROGRAM_MATRICES_ARB = 0x862F; + public static final int GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB = 0x862E; + public static final int GL_PROGRAM_ERROR_STRING_ARB = 0x8874; + public static final int GL_MATRIX0_ARB = 0x88C0; + public static final int GL_MATRIX1_ARB = 0x88C1; + public static final int GL_MATRIX2_ARB = 0x88C2; + public static final int GL_MATRIX3_ARB = 0x88C3; + public static final int GL_MATRIX4_ARB = 0x88C4; + public static final int GL_MATRIX5_ARB = 0x88C5; + public static final int GL_MATRIX6_ARB = 0x88C6; + public static final int GL_MATRIX7_ARB = 0x88C7; + public static final int GL_MATRIX8_ARB = 0x88C8; + public static final int GL_MATRIX9_ARB = 0x88C9; + public static final int GL_MATRIX10_ARB = 0x88CA; + public static final int GL_MATRIX11_ARB = 0x88CB; + public static final int GL_MATRIX12_ARB = 0x88CC; + public static final int GL_MATRIX13_ARB = 0x88CD; + public static final int GL_MATRIX14_ARB = 0x88CE; + public static final int GL_MATRIX15_ARB = 0x88CF; + public static final int GL_MATRIX16_ARB = 0x88D0; + public static final int GL_MATRIX17_ARB = 0x88D1; + public static final int GL_MATRIX18_ARB = 0x88D2; + public static final int GL_MATRIX19_ARB = 0x88D3; + public static final int GL_MATRIX20_ARB = 0x88D4; + public static final int GL_MATRIX21_ARB = 0x88D5; + public static final int GL_MATRIX22_ARB = 0x88D6; + public static final int GL_MATRIX23_ARB = 0x88D7; + public static final int GL_MATRIX24_ARB = 0x88D8; + public static final int GL_MATRIX25_ARB = 0x88D9; + public static final int GL_MATRIX26_ARB = 0x88DA; + public static final int GL_MATRIX27_ARB = 0x88DB; + public static final int GL_MATRIX28_ARB = 0x88DC; + public static final int GL_MATRIX29_ARB = 0x88DD; + public static final int GL_MATRIX30_ARB = 0x88DE; + public static final int GL_MATRIX31_ARB = 0x88DF; } |
|
From: Elias N. <eli...@us...> - 2003-06-24 12:24:59
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/native/common/callbacks Modified Files: GLUQuadricCallbacks.cpp GLUQuadricCallbacks.h Log Message: Ported OpenGL to Buffers Index: GLUQuadricCallbacks.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/GLUQuadricCallbacks.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks/GLUQuadricCallbacks.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- GLUQuadricCallbacks.cpp 30 Nov 2002 03:28:30 -0000 1.3 +++ GLUQuadricCallbacks.cpp 24 Jun 2003 12:24:55 -0000 1.4 @@ -33,7 +33,7 @@ typedef void (GLAPIENTRY *callback_t)(); -void GLUQuadricCallbacks::set(jint globj, JavaMethod* cb, jint type) +void GLUQuadricCallbacks::set(GLUquadricObj *globj, JavaMethod* cb, jint type) { switch (type) { case GLU_ERROR: @@ -42,13 +42,13 @@ delete errorCallback; } if (cb == NULL) { - gluQuadricCallback((GLUquadricObj *) globj, + gluQuadricCallback(globj, (GLenum) type, NULL); } else { errorCallback = cb; - gluQuadricCallback((GLUquadricObj *) globj, + gluQuadricCallback(globj, (GLenum) type, (callback_t) GLUQuadricCallbacks::gluError); } Index: GLUQuadricCallbacks.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/GLUQuadricCallbacks.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks/GLUQuadricCallbacks.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- GLUQuadricCallbacks.h 11 Dec 2002 07:16:31 -0000 1.4 +++ GLUQuadricCallbacks.h 24 Jun 2003 12:24:55 -0000 1.5 @@ -25,7 +25,7 @@ ~GLUQuadricCallbacks(); static void CALLBACK gluError(GLenum); - static void set(jint, JavaMethod*, jint); + static void set(GLUquadricObj *, JavaMethod*, jint); static void clear(); protected: |
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/java/org/lwjgl/opengl/nv Modified Files: NVCopyDepthToColor.java NVDepthClamp.java NVEvaluators.java NVFence.java NVFogDistance.java NVLightMaxExponent.java NVOcclusionQuery.java NVPackedDepthStencil.java NVPointSprite.java NVRegisterCombiners.java NVRegisterCombiners2.java NVTexgenReflection.java NVTextureEnvCombine4.java NVTextureRectangle.java NVTextureShader.java NVTextureShader2.java NVTextureShader3.java NVVertexArrayRange.java NVVertexArrayRange2.java NVVertexProgram.java Log Message: Ported OpenGL to Buffers Index: NVCopyDepthToColor.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVCopyDepthToColor.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVCopyDepthToColor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVCopyDepthToColor.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVCopyDepthToColor.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,6 +41,6 @@ public interface NVCopyDepthToColor { - public static final int DEPTH_STENCIL_TO_RGBA_NV = 0x886E; - public static final int DEPTH_STENCIL_TO_BGRA_NV = 0x886F; + public static final int GL_DEPTH_STENCIL_TO_RGBA_NV = 0x886E; + public static final int GL_DEPTH_STENCIL_TO_BGRA_NV = 0x886F; } Index: NVDepthClamp.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVDepthClamp.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVDepthClamp.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVDepthClamp.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVDepthClamp.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,5 +41,5 @@ public interface NVDepthClamp { - public static final int DEPTH_CLAMP_NV = 0x864F; + public static final int GL_DEPTH_CLAMP_NV = 0x864F; } Index: NVEvaluators.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVEvaluators.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVEvaluators.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVEvaluators.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVEvaluators.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,28 +41,28 @@ public interface NVEvaluators { - public static final int EVAL_2D_NV = 0x86C0; - public static final int EVAL_TRIANGULAR_2D_NV = 0x86C1; - public static final int MAP_TESSELLATION_NV = 0x86C2; - public static final int MAP_ATTRIB_U_ORDER_NV = 0x86C3; - public static final int MAP_ATTRIB_V_ORDER_NV = 0x86C4; - public static final int EVAL_FRACTIONAL_TESSELLATION_NV = 0x86C5; - public static final int EVAL_VERTEX_ATTRIB0_NV = 0x86C6; - public static final int EVAL_VERTEX_ATTRIB1_NV = 0x86C7; - public static final int EVAL_VERTEX_ATTRIB2_NV = 0x86C8; - public static final int EVAL_VERTEX_ATTRIB3_NV = 0x86C9; - public static final int EVAL_VERTEX_ATTRIB4_NV = 0x86CA; - public static final int EVAL_VERTEX_ATTRIB5_NV = 0x86CB; - public static final int EVAL_VERTEX_ATTRIB6_NV = 0x86CC; - public static final int EVAL_VERTEX_ATTRIB7_NV = 0x86CD; - public static final int EVAL_VERTEX_ATTRIB8_NV = 0x86CE; - public static final int EVAL_VERTEX_ATTRIB9_NV = 0x86CF; - public static final int EVAL_VERTEX_ATTRIB10_NV = 0x86D0; - public static final int EVAL_VERTEX_ATTRIB11_NV = 0x86D1; - public static final int EVAL_VERTEX_ATTRIB12_NV = 0x86D2; - public static final int EVAL_VERTEX_ATTRIB13_NV = 0x86D3; - public static final int EVAL_VERTEX_ATTRIB14_NV = 0x86D4; - public static final int EVAL_VERTEX_ATTRIB15_NV = 0x86D5; - public static final int MAX_MAP_TESSELLATION_NV = 0x86D6; - public static final int MAX_RATIONAL_EVAL_ORDER_NV = 0x86D7; + public static final int GL_EVAL_2D_NV = 0x86C0; + public static final int GL_EVAL_TRIANGULAR_2D_NV = 0x86C1; + public static final int GL_MAP_TESSELLATION_NV = 0x86C2; + public static final int GL_MAP_ATTRIB_U_ORDER_NV = 0x86C3; + public static final int GL_MAP_ATTRIB_V_ORDER_NV = 0x86C4; + public static final int GL_EVAL_FRACTIONAL_TESSELLATION_NV = 0x86C5; + public static final int GL_EVAL_VERTEX_ATTRIB0_NV = 0x86C6; + public static final int GL_EVAL_VERTEX_ATTRIB1_NV = 0x86C7; + public static final int GL_EVAL_VERTEX_ATTRIB2_NV = 0x86C8; + public static final int GL_EVAL_VERTEX_ATTRIB3_NV = 0x86C9; + public static final int GL_EVAL_VERTEX_ATTRIB4_NV = 0x86CA; + public static final int GL_EVAL_VERTEX_ATTRIB5_NV = 0x86CB; + public static final int GL_EVAL_VERTEX_ATTRIB6_NV = 0x86CC; + public static final int GL_EVAL_VERTEX_ATTRIB7_NV = 0x86CD; + public static final int GL_EVAL_VERTEX_ATTRIB8_NV = 0x86CE; + public static final int GL_EVAL_VERTEX_ATTRIB9_NV = 0x86CF; + public static final int GL_EVAL_VERTEX_ATTRIB10_NV = 0x86D0; + public static final int GL_EVAL_VERTEX_ATTRIB11_NV = 0x86D1; + public static final int GL_EVAL_VERTEX_ATTRIB12_NV = 0x86D2; + public static final int GL_EVAL_VERTEX_ATTRIB13_NV = 0x86D3; + public static final int GL_EVAL_VERTEX_ATTRIB14_NV = 0x86D4; + public static final int GL_EVAL_VERTEX_ATTRIB15_NV = 0x86D5; + public static final int GL_MAX_MAP_TESSELLATION_NV = 0x86D6; + public static final int GL_MAX_RATIONAL_EVAL_ORDER_NV = 0x86D7; } Index: NVFence.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVFence.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVFence.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVFence.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVFence.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,7 +41,7 @@ public interface NVFence { - public static final int ALL_COMPLETED_NV = 0x84F2; - public static final int FENCE_STATUS_NV = 0x84F3; - public static final int FENCE_CONDITION_NV = 0x84F4; + public static final int GL_ALL_COMPLETED_NV = 0x84F2; + public static final int GL_FENCE_STATUS_NV = 0x84F3; + public static final int GL_FENCE_CONDITION_NV = 0x84F4; } Index: NVFogDistance.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVFogDistance.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVFogDistance.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVFogDistance.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVFogDistance.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,7 +41,7 @@ public interface NVFogDistance { - public static final int FOG_DISTANCE_MODE_NV = 0x855A; - public static final int EYE_RADIAL_NV = 0x855B; - public static final int EYE_PLANE_ABSOLUTE_NV = 0x855C; + public static final int GL_FOG_DISTANCE_MODE_NV = 0x855A; + public static final int GL_EYE_RADIAL_NV = 0x855B; + public static final int GL_EYE_PLANE_ABSOLUTE_NV = 0x855C; } Index: NVLightMaxExponent.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVLightMaxExponent.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVLightMaxExponent.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVLightMaxExponent.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVLightMaxExponent.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,6 +41,6 @@ public interface NVLightMaxExponent { - public static final int MAX_SHININESS_NV = 0x8504; - public static final int MAX_SPOT_EXPONENT_NV = 0x8505; + public static final int GL_MAX_SHININESS_NV = 0x8504; + public static final int GL_MAX_SPOT_EXPONENT_NV = 0x8505; } Index: NVOcclusionQuery.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVOcclusionQuery.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVOcclusionQuery.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVOcclusionQuery.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVOcclusionQuery.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,11 +41,11 @@ public interface NVOcclusionQuery { - public static final int OCCLUSION_TEST_HP = 0x8165; - public static final int OCCLUSION_TEST_RESULT_HP = 0x8166; - /* HP_occlusion_test */ - public static final int PIXEL_COUNTER_BITS_NV = 0x8864; - public static final int CURRENT_OCCLUSION_QUERY_ID_NV = 0x8865; - public static final int PIXEL_COUNT_NV = 0x8866; - public static final int PIXEL_COUNT_AVAILABLE_NV = 0x8867; + public static final int GL_OCCLUSION_TEST_HP = 0x8165; + public static final int GL_OCCLUSION_TEST_RESULT_HP = 0x8166; + /* HP_occlusion_test */ + public static final int GL_PIXEL_COUNTER_BITS_NV = 0x8864; + public static final int GL_CURRENT_OCCLUSION_QUERY_ID_NV = 0x8865; + public static final int GL_PIXEL_COUNT_NV = 0x8866; + public static final int GL_PIXEL_COUNT_AVAILABLE_NV = 0x8867; } Index: NVPackedDepthStencil.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVPackedDepthStencil.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVPackedDepthStencil.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVPackedDepthStencil.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVPackedDepthStencil.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,6 +41,6 @@ public interface NVPackedDepthStencil { - public static final int DEPTH_STENCIL_NV = 0x84F9; - public static final int UNSIGNED_INT_24_8_NV = 0x84FA; + public static final int GL_DEPTH_STENCIL_NV = 0x84F9; + public static final int GL_UNSIGNED_INT_24_8_NV = 0x84FA; } Index: NVPointSprite.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVPointSprite.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVPointSprite.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVPointSprite.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVPointSprite.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,7 +41,7 @@ public interface NVPointSprite { - public static final int POINT_SPRITE_NV = 0x8861; - public static final int COORD_REPLACE_NV = 0x8862; - public static final int POINT_SPRITE_R_MODE_NV = 0x8863; + public static final int GL_POINT_SPRITE_NV = 0x8861; + public static final int GL_COORD_REPLACE_NV = 0x8862; + public static final int GL_POINT_SPRITE_R_MODE_NV = 0x8863; } Index: NVRegisterCombiners.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVRegisterCombiners.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVRegisterCombiners.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVRegisterCombiners.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVRegisterCombiners.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,55 +41,55 @@ public interface NVRegisterCombiners { - public static final int REGISTER_COMBINERS_NV = 0x8522; - public static final int COMBINER0_NV = 0x8550; - public static final int COMBINER1_NV = 0x8551; - public static final int COMBINER2_NV = 0x8552; - public static final int COMBINER3_NV = 0x8553; - public static final int COMBINER4_NV = 0x8554; - public static final int COMBINER5_NV = 0x8555; - public static final int COMBINER6_NV = 0x8556; - public static final int COMBINER7_NV = 0x8557; - public static final int VARIABLE_A_NV = 0x8523; - public static final int VARIABLE_B_NV = 0x8524; - public static final int VARIABLE_C_NV = 0x8525; - public static final int VARIABLE_D_NV = 0x8526; - public static final int VARIABLE_E_NV = 0x8527; - public static final int VARIABLE_F_NV = 0x8528; - public static final int VARIABLE_G_NV = 0x8529; - public static final int CONSTANT_COLOR0_NV = 0x852A; - public static final int CONSTANT_COLOR1_NV = 0x852B; - public static final int PRIMARY_COLOR_NV = 0x852C; - public static final int SECONDARY_COLOR_NV = 0x852D; - public static final int SPARE0_NV = 0x852E; - public static final int SPARE1_NV = 0x852F; - public static final int UNSIGNED_IDENTITY_NV = 0x8536; - public static final int UNSIGNED_INVERT_NV = 0x8537; - public static final int EXPAND_NORMAL_NV = 0x8538; - public static final int EXPAND_NEGATE_NV = 0x8539; - public static final int HALF_BIAS_NORMAL_NV = 0x853A; - public static final int HALF_BIAS_NEGATE_NV = 0x853B; - public static final int SIGNED_IDENTITY_NV = 0x853C; - public static final int SIGNED_NEGATE_NV = 0x853D; - public static final int E_TIMES_F_NV = 0x8531; - public static final int SPARE0_PLUS_SECONDARY_COLOR_NV = 0x8532; - public static final int SCALE_BY_TWO_NV = 0x853E; - public static final int SCALE_BY_FOUR_NV = 0x853F; - public static final int SCALE_BY_ONE_HALF_NV = 0x8540; - public static final int BIAS_BY_NEGATIVE_ONE_HALF_NV = 0x8541; - public static final int DISCARD_NV = 0x8530; - public static final int COMBINER_INPUT_NV = 0x8542; - public static final int COMBINER_MAPPING_NV = 0x8543; - public static final int COMBINER_COMPONENT_USAGE_NV = 0x8544; - public static final int COMBINER_AB_DOT_PRODUCT_NV = 0x8545; - public static final int COMBINER_CD_DOT_PRODUCT_NV = 0x8546; - public static final int COMBINER_MUX_SUM_NV = 0x8547; - public static final int COMBINER_SCALE_NV = 0x8548; - public static final int COMBINER_BIAS_NV = 0x8549; - public static final int COMBINER_AB_OUTPUT_NV = 0x854A; - public static final int COMBINER_CD_OUTPUT_NV = 0x854B; - public static final int COMBINER_SUM_OUTPUT_NV = 0x854C; - public static final int NUM_GENERAL_COMBINERS_NV = 0x854E; - public static final int COLOR_SUM_CLAMP_NV = 0x854F; - public static final int MAX_GENERAL_COMBINERS_NV = 0x854D; + public static final int GL_REGISTER_COMBINERS_NV = 0x8522; + public static final int GL_COMBINER0_NV = 0x8550; + public static final int GL_COMBINER1_NV = 0x8551; + public static final int GL_COMBINER2_NV = 0x8552; + public static final int GL_COMBINER3_NV = 0x8553; + public static final int GL_COMBINER4_NV = 0x8554; + public static final int GL_COMBINER5_NV = 0x8555; + public static final int GL_COMBINER6_NV = 0x8556; + public static final int GL_COMBINER7_NV = 0x8557; + public static final int GL_VARIABLE_A_NV = 0x8523; + public static final int GL_VARIABLE_B_NV = 0x8524; + public static final int GL_VARIABLE_C_NV = 0x8525; + public static final int GL_VARIABLE_D_NV = 0x8526; + public static final int GL_VARIABLE_E_NV = 0x8527; + public static final int GL_VARIABLE_F_NV = 0x8528; + public static final int GL_VARIABLE_G_NV = 0x8529; + public static final int GL_CONSTANT_COLOR0_NV = 0x852A; + public static final int GL_CONSTANT_COLOR1_NV = 0x852B; + public static final int GL_PRIMARY_COLOR_NV = 0x852C; + public static final int GL_SECONDARY_COLOR_NV = 0x852D; + public static final int GL_SPARE0_NV = 0x852E; + public static final int GL_SPARE1_NV = 0x852F; + public static final int GL_UNSIGNED_IDENTITY_NV = 0x8536; + public static final int GL_UNSIGNED_INVERT_NV = 0x8537; + public static final int GL_EXPAND_NORMAL_NV = 0x8538; + public static final int GL_EXPAND_NEGATE_NV = 0x8539; + public static final int GL_HALF_BIAS_NORMAL_NV = 0x853A; + public static final int GL_HALF_BIAS_NEGATE_NV = 0x853B; + public static final int GL_SIGNED_IDENTITY_NV = 0x853C; + public static final int GL_SIGNED_NEGATE_NV = 0x853D; + public static final int GL_E_TIMES_F_NV = 0x8531; + public static final int GL_SPARE0_PLUS_SECONDARY_COLOR_NV = 0x8532; + public static final int GL_SCALE_BY_TWO_NV = 0x853E; + public static final int GL_SCALE_BY_FOUR_NV = 0x853F; + public static final int GL_SCALE_BY_ONE_HALF_NV = 0x8540; + public static final int GL_BIAS_BY_NEGATIVE_ONE_HALF_NV = 0x8541; + public static final int GL_DISCARD_NV = 0x8530; + public static final int GL_COMBINER_INPUT_NV = 0x8542; + public static final int GL_COMBINER_MAPPING_NV = 0x8543; + public static final int GL_COMBINER_COMPONENT_USAGE_NV = 0x8544; + public static final int GL_COMBINER_AB_DOT_PRODUCT_NV = 0x8545; + public static final int GL_COMBINER_CD_DOT_PRODUCT_NV = 0x8546; + public static final int GL_COMBINER_MUX_SUM_NV = 0x8547; + public static final int GL_COMBINER_SCALE_NV = 0x8548; + public static final int GL_COMBINER_BIAS_NV = 0x8549; + public static final int GL_COMBINER_AB_OUTPUT_NV = 0x854A; + public static final int GL_COMBINER_CD_OUTPUT_NV = 0x854B; + public static final int GL_COMBINER_SUM_OUTPUT_NV = 0x854C; + public static final int GL_NUM_GENERAL_COMBINERS_NV = 0x854E; + public static final int GL_COLOR_SUM_CLAMP_NV = 0x854F; + public static final int GL_MAX_GENERAL_COMBINERS_NV = 0x854D; } Index: NVRegisterCombiners2.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVRegisterCombiners2.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVRegisterCombiners2.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVRegisterCombiners2.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVRegisterCombiners2.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,5 +41,5 @@ public interface NVRegisterCombiners2 { - public static final int PER_STAGE_CONSTANTS_NV = 0x8535; + public static final int GL_PER_STAGE_CONSTANTS_NV = 0x8535; } Index: NVTexgenReflection.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVTexgenReflection.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVTexgenReflection.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVTexgenReflection.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVTexgenReflection.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,6 +41,6 @@ public interface NVTexgenReflection { - public static final int NORMAL_MAP_NV = 0x8511; - public static final int REFLECTION_MAP_NV = 0x8512; + public static final int GL_NORMAL_MAP_NV = 0x8511; + public static final int GL_REFLECTION_MAP_NV = 0x8512; } Index: NVTextureEnvCombine4.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVTextureEnvCombine4.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVTextureEnvCombine4.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVTextureEnvCombine4.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVTextureEnvCombine4.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,9 +41,9 @@ public interface NVTextureEnvCombine4 { - public static final int COMBINE4_NV = 0x8503; - public static final int SOURCE3_RGB_NV = 0x8583; - public static final int SOURCE3_ALPHA_NV = 0x858B; - public static final int OPERAND3_RGB_NV = 0x8593; - public static final int OPERAND3_ALPHA_NV = 0x859B; + public static final int GL_COMBINE4_NV = 0x8503; + public static final int GL_SOURCE3_RGB_NV = 0x8583; + public static final int GL_SOURCE3_ALPHA_NV = 0x858B; + public static final int GL_OPERAND3_RGB_NV = 0x8593; + public static final int GL_OPERAND3_ALPHA_NV = 0x859B; } Index: NVTextureRectangle.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVTextureRectangle.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVTextureRectangle.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVTextureRectangle.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVTextureRectangle.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,8 +41,8 @@ public interface NVTextureRectangle { - public static final int TEXTURE_RECTANGLE_NV = 0x84F5; - public static final int TEXTURE_BINDING_RECTANGLE_NV = 0x84F6; - public static final int PROXY_TEXTURE_RECTANGLE_NV = 0x84F7; - public static final int MAX_RECTANGLE_TEXTURE_SIZE_NV = 0x84F8; + public static final int GL_TEXTURE_RECTANGLE_NV = 0x84F5; + public static final int GL_TEXTURE_BINDING_RECTANGLE_NV = 0x84F6; + public static final int GL_PROXY_TEXTURE_RECTANGLE_NV = 0x84F7; + public static final int GL_MAX_RECTANGLE_TEXTURE_SIZE_NV = 0x84F8; } Index: NVTextureShader.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVTextureShader.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVTextureShader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVTextureShader.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVTextureShader.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,74 +41,74 @@ public interface NVTextureShader { - public static final int TEXTURE_SHADER_NV = 0x86DE; - public static final int RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV = 0x86D9; - public static final int SHADER_OPERATION_NV = 0x86DF; - public static final int CULL_MODES_NV = 0x86E0; - public static final int OFFSET_TEXTURE_MATRIX_NV = 0x86E1; - public static final int OFFSET_TEXTURE_SCALE_NV = 0x86E2; - public static final int OFFSET_TEXTURE_BIAS_NV = 0x86E3; - public static final int PREVIOUS_TEXTURE_INPUT_NV = 0x86E4; - public static final int CONST_EYE_NV = 0x86E5; - public static final int SHADER_CONSISTENT_NV = 0x86DD; - public static final int PASS_THROUGH_NV = 0x86E6; - public static final int CULL_FRAGMENT_NV = 0x86E7; - public static final int OFFSET_TEXTURE_2D_NV = 0x86E8; - public static final int OFFSET_TEXTURE_RECTANGLE_NV = 0x864C; - public static final int OFFSET_TEXTURE_RECTANGLE_SCALE_NV = 0x864D; - public static final int DEPENDENT_AR_TEXTURE_2D_NV = 0x86E9; - public static final int DEPENDENT_GB_TEXTURE_2D_NV = 0x86EA; - public static final int DOT_PRODUCT_NV = 0x86EC; - public static final int DOT_PRODUCT_DEPTH_REPLACE_NV = 0x86ED; - public static final int DOT_PRODUCT_TEXTURE_2D_NV = 0x86EE; - public static final int DOT_PRODUCT_TEXTURE_RECTANGLE_NV = 0x864E; - public static final int DOT_PRODUCT_TEXTURE_CUBE_MAP_NV = 0x86F0; - public static final int DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV = 0x86F1; - public static final int DOT_PRODUCT_REFLECT_CUBE_MAP_NV = 0x86F2; - public static final int DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV = 0x86F3; - public static final int HILO_NV = 0x86F4; - public static final int DSDT_NV = 0x86F5; - public static final int DSDT_MAG_NV = 0x86F6; - public static final int DSDT_MAG_VIB_NV = 0x86F7; - public static final int UNSIGNED_INT_S8_S8_8_8_NV = 0x86DA; - public static final int UNSIGNED_INT_8_8_S8_S8_REV_NV = 0x86DB; - public static final int SIGNED_RGBA_NV = 0x86FB; - public static final int SIGNED_RGBA8_NV = 0x86FC; - public static final int SIGNED_RGB_NV = 0x86FE; - public static final int SIGNED_RGB8_NV = 0x86FF; - public static final int SIGNED_LUMINANCE_NV = 0x8701; - public static final int SIGNED_LUMINANCE8_NV = 0x8702; - public static final int SIGNED_LUMINANCE_ALPHA_NV = 0x8703; - public static final int SIGNED_LUMINANCE8_ALPHA8_NV = 0x8704; - public static final int SIGNED_ALPHA_NV = 0x8705; - public static final int SIGNED_ALPHA8_NV = 0x8706; - public static final int SIGNED_INTENSITY_NV = 0x8707; - public static final int SIGNED_INTENSITY8_NV = 0x8708; - public static final int SIGNED_RGB_UNSIGNED_ALPHA_NV = 0x870C; - public static final int SIGNED_RGB8_UNSIGNED_ALPHA8_NV = 0x870D; - public static final int HILO16_NV = 0x86F8; - public static final int SIGNED_HILO_NV = 0x86F9; - public static final int SIGNED_HILO16_NV = 0x86FA; - public static final int DSDT8_NV = 0x8709; - public static final int DSDT8_MAG8_NV = 0x870A; - public static final int DSDT_MAG_INTENSITY_NV = 0x86DC; - public static final int DSDT8_MAG8_INTENSITY8_NV = 0x870B; - public static final int HI_SCALE_NV = 0x870E; - public static final int LO_SCALE_NV = 0x870F; - public static final int DS_SCALE_NV = 0x8710; - public static final int DT_SCALE_NV = 0x8711; - public static final int MAGNITUDE_SCALE_NV = 0x8712; - public static final int VIBRANCE_SCALE_NV = 0x8713; - public static final int HI_BIAS_NV = 0x8714; - public static final int LO_BIAS_NV = 0x8715; - public static final int DS_BIAS_NV = 0x8716; - public static final int DT_BIAS_NV = 0x8717; - public static final int MAGNITUDE_BIAS_NV = 0x8718; - public static final int VIBRANCE_BIAS_NV = 0x8719; - public static final int TEXTURE_BORDER_VALUES_NV = 0x871A; - public static final int TEXTURE_HI_SIZE_NV = 0x871B; - public static final int TEXTURE_LO_SIZE_NV = 0x871C; - public static final int TEXTURE_DS_SIZE_NV = 0x871D; - public static final int TEXTURE_DT_SIZE_NV = 0x871E; - public static final int TEXTURE_MAG_SIZE_NV = 0x871F; + public static final int GL_TEXTURE_SHADER_NV = 0x86DE; + public static final int GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV = 0x86D9; + public static final int GL_SHADER_OPERATION_NV = 0x86DF; + public static final int GL_CULL_MODES_NV = 0x86E0; + public static final int GL_OFFSET_TEXTURE_MATRIX_NV = 0x86E1; + public static final int GL_OFFSET_TEXTURE_SCALE_NV = 0x86E2; + public static final int GL_OFFSET_TEXTURE_BIAS_NV = 0x86E3; + public static final int GL_PREVIOUS_TEXTURE_INPUT_NV = 0x86E4; + public static final int GL_CONST_EYE_NV = 0x86E5; + public static final int GL_SHADER_CONSISTENT_NV = 0x86DD; + public static final int GL_PASS_THROUGH_NV = 0x86E6; + public static final int GL_CULL_FRAGMENT_NV = 0x86E7; + public static final int GL_OFFSET_TEXTURE_2D_NV = 0x86E8; + public static final int GL_OFFSET_TEXTURE_RECTANGLE_NV = 0x864C; + public static final int GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV = 0x864D; + public static final int GL_DEPENDENT_AR_TEXTURE_2D_NV = 0x86E9; + public static final int GL_DEPENDENT_GB_TEXTURE_2D_NV = 0x86EA; + public static final int GL_DOT_PRODUCT_NV = 0x86EC; + public static final int GL_DOT_PRODUCT_DEPTH_REPLACE_NV = 0x86ED; + public static final int GL_DOT_PRODUCT_TEXTURE_2D_NV = 0x86EE; + public static final int GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV = 0x864E; + public static final int GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV = 0x86F0; + public static final int GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV = 0x86F1; + public static final int GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV = 0x86F2; + public static final int GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV = 0x86F3; + public static final int GL_HILO_NV = 0x86F4; + public static final int GL_DSDT_NV = 0x86F5; + public static final int GL_DSDT_MAG_NV = 0x86F6; + public static final int GL_DSDT_MAG_VIB_NV = 0x86F7; + public static final int GL_UNSIGNED_INT_S8_S8_8_8_NV = 0x86DA; + public static final int GL_UNSIGNED_INT_8_8_S8_S8_REV_NV = 0x86DB; + public static final int GL_SIGNED_RGBA_NV = 0x86FB; + public static final int GL_SIGNED_RGBA8_NV = 0x86FC; + public static final int GL_SIGNED_RGB_NV = 0x86FE; + public static final int GL_SIGNED_RGB8_NV = 0x86FF; + public static final int GL_SIGNED_LUMINANCE_NV = 0x8701; + public static final int GL_SIGNED_LUMINANCE8_NV = 0x8702; + public static final int GL_SIGNED_LUMINANCE_ALPHA_NV = 0x8703; + public static final int GL_SIGNED_LUMINANCE8_ALPHA8_NV = 0x8704; + public static final int GL_SIGNED_ALPHA_NV = 0x8705; + public static final int GL_SIGNED_ALPHA8_NV = 0x8706; + public static final int GL_SIGNED_INTENSITY_NV = 0x8707; + public static final int GL_SIGNED_INTENSITY8_NV = 0x8708; + public static final int GL_SIGNED_RGB_UNSIGNED_ALPHA_NV = 0x870C; + public static final int GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV = 0x870D; + public static final int GL_HILO16_NV = 0x86F8; + public static final int GL_SIGNED_HILO_NV = 0x86F9; + public static final int GL_SIGNED_HILO16_NV = 0x86FA; + public static final int GL_DSDT8_NV = 0x8709; + public static final int GL_DSDT8_MAG8_NV = 0x870A; + public static final int GL_DSDT_MAG_INTENSITY_NV = 0x86DC; + public static final int GL_DSDT8_MAG8_INTENSITY8_NV = 0x870B; + public static final int GL_HI_SCALE_NV = 0x870E; + public static final int GL_LO_SCALE_NV = 0x870F; + public static final int GL_DS_SCALE_NV = 0x8710; + public static final int GL_DT_SCALE_NV = 0x8711; + public static final int GL_MAGNITUDE_SCALE_NV = 0x8712; + public static final int GL_VIBRANCE_SCALE_NV = 0x8713; + public static final int GL_HI_BIAS_NV = 0x8714; + public static final int GL_LO_BIAS_NV = 0x8715; + public static final int GL_DS_BIAS_NV = 0x8716; + public static final int GL_DT_BIAS_NV = 0x8717; + public static final int GL_MAGNITUDE_BIAS_NV = 0x8718; + public static final int GL_VIBRANCE_BIAS_NV = 0x8719; + public static final int GL_TEXTURE_BORDER_VALUES_NV = 0x871A; + public static final int GL_TEXTURE_HI_SIZE_NV = 0x871B; + public static final int GL_TEXTURE_LO_SIZE_NV = 0x871C; + public static final int GL_TEXTURE_DS_SIZE_NV = 0x871D; + public static final int GL_TEXTURE_DT_SIZE_NV = 0x871E; + public static final int GL_TEXTURE_MAG_SIZE_NV = 0x871F; } Index: NVTextureShader2.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVTextureShader2.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVTextureShader2.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVTextureShader2.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVTextureShader2.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,32 +41,32 @@ public interface NVTextureShader2 { - public static final int DOT_PRODUCT_TEXTURE_3D_NV = 0x86EF; - public static final int HILO_NV = 0x86F4; - public static final int DSDT_NV = 0x86F5; - public static final int DSDT_MAG_NV = 0x86F6; - public static final int DSDT_MAG_VIB_NV = 0x86F7; - public static final int UNSIGNED_INT_S8_S8_8_8_NV = 0x86DA; - public static final int UNSIGNED_INT_8_8_S8_S8_REV_NV = 0x86DB; - public static final int SIGNED_RGBA_NV = 0x86FB; - public static final int SIGNED_RGBA8_NV = 0x86FC; - public static final int SIGNED_RGB_NV = 0x86FE; - public static final int SIGNED_RGB8_NV = 0x86FF; - public static final int SIGNED_LUMINANCE_NV = 0x8701; - public static final int SIGNED_LUMINANCE8_NV = 0x8702; - public static final int SIGNED_LUMINANCE_ALPHA_NV = 0x8703; - public static final int SIGNED_LUMINANCE8_ALPHA8_NV = 0x8704; - public static final int SIGNED_ALPHA_NV = 0x8705; - public static final int SIGNED_ALPHA8_NV = 0x8706; - public static final int SIGNED_INTENSITY_NV = 0x8707; - public static final int SIGNED_INTENSITY8_NV = 0x8708; - public static final int SIGNED_RGB_UNSIGNED_ALPHA_NV = 0x870C; - public static final int SIGNED_RGB8_UNSIGNED_ALPHA8_NV = 0x870D; - public static final int HILO16_NV = 0x86F8; - public static final int SIGNED_HILO_NV = 0x86F9; - public static final int SIGNED_HILO16_NV = 0x86FA; - public static final int DSDT8_NV = 0x8709; - public static final int DSDT8_MAG8_NV = 0x870A; - public static final int DSDT_MAG_INTENSITY_NV = 0x86DC; - public static final int DSDT8_MAG8_INTENSITY8_NV = 0x870B; + public static final int GL_DOT_PRODUCT_TEXTURE_3D_NV = 0x86EF; + public static final int GL_HILO_NV = 0x86F4; + public static final int GL_DSDT_NV = 0x86F5; + public static final int GL_DSDT_MAG_NV = 0x86F6; + public static final int GL_DSDT_MAG_VIB_NV = 0x86F7; + public static final int GL_UNSIGNED_INT_S8_S8_8_8_NV = 0x86DA; + public static final int GL_UNSIGNED_INT_8_8_S8_S8_REV_NV = 0x86DB; + public static final int GL_SIGNED_RGBA_NV = 0x86FB; + public static final int GL_SIGNED_RGBA8_NV = 0x86FC; + public static final int GL_SIGNED_RGB_NV = 0x86FE; + public static final int GL_SIGNED_RGB8_NV = 0x86FF; + public static final int GL_SIGNED_LUMINANCE_NV = 0x8701; + public static final int GL_SIGNED_LUMINANCE8_NV = 0x8702; + public static final int GL_SIGNED_LUMINANCE_ALPHA_NV = 0x8703; + public static final int GL_SIGNED_LUMINANCE8_ALPHA8_NV = 0x8704; + public static final int GL_SIGNED_ALPHA_NV = 0x8705; + public static final int GL_SIGNED_ALPHA8_NV = 0x8706; + public static final int GL_SIGNED_INTENSITY_NV = 0x8707; + public static final int GL_SIGNED_INTENSITY8_NV = 0x8708; + public static final int GL_SIGNED_RGB_UNSIGNED_ALPHA_NV = 0x870C; + public static final int GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV = 0x870D; + public static final int GL_HILO16_NV = 0x86F8; + public static final int GL_SIGNED_HILO_NV = 0x86F9; + public static final int GL_SIGNED_HILO16_NV = 0x86FA; + public static final int GL_DSDT8_NV = 0x8709; + public static final int GL_DSDT8_MAG8_NV = 0x870A; + public static final int GL_DSDT_MAG_INTENSITY_NV = 0x86DC; + public static final int GL_DSDT8_MAG8_INTENSITY8_NV = 0x870B; } Index: NVTextureShader3.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVTextureShader3.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVTextureShader3.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVTextureShader3.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVTextureShader3.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,21 +41,21 @@ public interface NVTextureShader3 { - public static final int OFFSET_PROJECTIVE_TEXTURE_2D_NV = 0x8850; - public static final int OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV = 0x8851; - public static final int OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8852; - public static final int OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV = 0x8853; - public static final int OFFSET_HILO_TEXTURE_2D_NV = 0x8854; - public static final int OFFSET_HILO_TEXTURE_RECTANGLE_NV = 0x8855; - public static final int OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV = 0x8856; - public static final int OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8857; - public static final int DEPENDENT_HILO_TEXTURE_2D_NV = 0x8858; - public static final int DEPENDENT_RGB_TEXTURE_3D_NV = 0x8859; - public static final int DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV = 0x885A; - public static final int DOT_PRODUCT_PASS_THROUGH_NV = 0x885B; - public static final int DOT_PRODUCT_TEXTURE_1D_NV = 0x885C; - public static final int DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV = 0x885D; - public static final int HILO8_NV = 0x885E; - public static final int SIGNED_HILO8_NV = 0x885F; - public static final int FORCE_BLUE_TO_ONE_NV = 0x8860; + public static final int GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV = 0x8850; + public static final int GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV = 0x8851; + public static final int GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8852; + public static final int GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV = 0x8853; + public static final int GL_OFFSET_HILO_TEXTURE_2D_NV = 0x8854; + public static final int GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV = 0x8855; + public static final int GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV = 0x8856; + public static final int GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8857; + public static final int GL_DEPENDENT_HILO_TEXTURE_2D_NV = 0x8858; + public static final int GL_DEPENDENT_RGB_TEXTURE_3D_NV = 0x8859; + public static final int GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV = 0x885A; + public static final int GL_DOT_PRODUCT_PASS_THROUGH_NV = 0x885B; + public static final int GL_DOT_PRODUCT_TEXTURE_1D_NV = 0x885C; + public static final int GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV = 0x885D; + public static final int GL_HILO8_NV = 0x885E; + public static final int GL_SIGNED_HILO8_NV = 0x885F; + public static final int GL_FORCE_BLUE_TO_ONE_NV = 0x8860; } Index: NVVertexArrayRange.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVVertexArrayRange.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVVertexArrayRange.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVVertexArrayRange.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVVertexArrayRange.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,9 +41,9 @@ public interface NVVertexArrayRange { - public static final int VERTEX_ARRAY_RANGE_NV = 0x851D; - public static final int VERTEX_ARRAY_RANGE_LENGTH_NV = 0x851E; - public static final int VERTEX_ARRAY_RANGE_VALID_NV = 0x851F; - public static final int MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV = 0x8520; - public static final int VERTEX_ARRAY_RANGE_POINTER_NV = 0x8521; + public static final int GL_VERTEX_ARRAY_RANGE_NV = 0x851D; + public static final int GL_VERTEX_ARRAY_RANGE_LENGTH_NV = 0x851E; + public static final int GL_VERTEX_ARRAY_RANGE_VALID_NV = 0x851F; + public static final int GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV = 0x8520; + public static final int GL_VERTEX_ARRAY_RANGE_POINTER_NV = 0x8521; } Index: NVVertexArrayRange2.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVVertexArrayRange2.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVVertexArrayRange2.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVVertexArrayRange2.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVVertexArrayRange2.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,5 +41,5 @@ public interface NVVertexArrayRange2 { - public static final int VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV = 0x8533; + public static final int GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV = 0x8533; } Index: NVVertexProgram.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVVertexProgram.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/nv/NVVertexProgram.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVVertexProgram.java 21 Dec 2002 12:37:20 -0000 1.2 +++ NVVertexProgram.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,87 +41,87 @@ public interface NVVertexProgram { - public static final int VERTEX_PROGRAM_NV = 0x8620; - public static final int VERTEX_PROGRAM_POINT_SIZE_NV = 0x8642; - public static final int VERTEX_PROGRAM_TWO_SIDE_NV = 0x8643; - public static final int VERTEX_STATE_PROGRAM_NV = 0x8621; - public static final int ATTRIB_ARRAY_SIZE_NV = 0x8623; - public static final int ATTRIB_ARRAY_STRIDE_NV = 0x8624; - public static final int ATTRIB_ARRAY_TYPE_NV = 0x8625; - public static final int CURRENT_ATTRIB_NV = 0x8626; - public static final int PROGRAM_PARAMETER_NV = 0x8644; - public static final int ATTRIB_ARRAY_POINTER_NV = 0x8645; - public static final int PROGRAM_TARGET_NV = 0x8646; - public static final int PROGRAM_LENGTH_NV = 0x8627; - public static final int PROGRAM_RESIDENT_NV = 0x8647; - public static final int PROGRAM_STRING_NV = 0x8628; - public static final int TRACK_MATRIX_NV = 0x8648; - public static final int TRACK_MATRIX_TRANSFORM_NV = 0x8649; - public static final int MAX_TRACK_MATRIX_STACK_DEPTH_NV = 0x862E; - public static final int MAX_TRACK_MATRICES_NV = 0x862F; - public static final int CURRENT_MATRIX_STACK_DEPTH_NV = 0x8640; - public static final int CURRENT_MATRIX_NV = 0x8641; - public static final int VERTEX_PROGRAM_BINDING_NV = 0x864A; - public static final int PROGRAM_ERROR_POSITION_NV = 0x864B; - public static final int MODELVIEW_PROJECTION_NV = 0x8629; - public static final int MATRIX0_NV = 0x8630; - public static final int MATRIX1_NV = 0x8631; - public static final int MATRIX2_NV = 0x8632; - public static final int MATRIX3_NV = 0x8633; - public static final int MATRIX4_NV = 0x8634; - public static final int MATRIX5_NV = 0x8635; - public static final int MATRIX6_NV = 0x8636; - public static final int MATRIX7_NV = 0x8637; - public static final int IDENTITY_NV = 0x862A; - public static final int INVERSE_NV = 0x862B; - public static final int TRANSPOSE_NV = 0x862C; - public static final int INVERSE_TRANSPOSE_NV = 0x862D; - public static final int VERTEX_ATTRIB_ARRAY0_NV = 0x8650; - public static final int VERTEX_ATTRIB_ARRAY1_NV = 0x8651; - public static final int VERTEX_ATTRIB_ARRAY2_NV = 0x8652; - public static final int VERTEX_ATTRIB_ARRAY3_NV = 0x8653; - public static final int VERTEX_ATTRIB_ARRAY4_NV = 0x8654; - public static final int VERTEX_ATTRIB_ARRAY5_NV = 0x8655; - public static final int VERTEX_ATTRIB_ARRAY6_NV = 0x8656; - public static final int VERTEX_ATTRIB_ARRAY7_NV = 0x8657; - public static final int VERTEX_ATTRIB_ARRAY8_NV = 0x8658; - public static final int VERTEX_ATTRIB_ARRAY9_NV = 0x8659; - public static final int VERTEX_ATTRIB_ARRAY10_NV = 0x865A; - public static final int VERTEX_ATTRIB_ARRAY11_NV = 0x865B; - public static final int VERTEX_ATTRIB_ARRAY12_NV = 0x865C; - public static final int VERTEX_ATTRIB_ARRAY13_NV = 0x865D; - public static final int VERTEX_ATTRIB_ARRAY14_NV = 0x865E; - public static final int VERTEX_ATTRIB_ARRAY15_NV = 0x865F; - public static final int MAP1_VERTEX_ATTRIB0_4_NV = 0x8660; - public static final int MAP1_VERTEX_ATTRIB1_4_NV = 0x8661; - public static final int MAP1_VERTEX_ATTRIB2_4_NV = 0x8662; - public static final int MAP1_VERTEX_ATTRIB3_4_NV = 0x8663; - public static final int MAP1_VERTEX_ATTRIB4_4_NV = 0x8664; - public static final int MAP1_VERTEX_ATTRIB5_4_NV = 0x8665; - public static final int MAP1_VERTEX_ATTRIB6_4_NV = 0x8666; - public static final int MAP1_VERTEX_ATTRIB7_4_NV = 0x8667; - public static final int MAP1_VERTEX_ATTRIB8_4_NV = 0x8668; - public static final int MAP1_VERTEX_ATTRIB9_4_NV = 0x8669; - public static final int MAP1_VERTEX_ATTRIB10_4_NV = 0x866A; - public static final int MAP1_VERTEX_ATTRIB11_4_NV = 0x866B; - public static final int MAP1_VERTEX_ATTRIB12_4_NV = 0x866C; - public static final int MAP1_VERTEX_ATTRIB13_4_NV = 0x866D; - public static final int MAP1_VERTEX_ATTRIB14_4_NV = 0x866E; - public static final int MAP1_VERTEX_ATTRIB15_4_NV = 0x866F; - public static final int MAP2_VERTEX_ATTRIB0_4_NV = 0x8670; - public static final int MAP2_VERTEX_ATTRIB1_4_NV = 0x8671; - public static final int MAP2_VERTEX_ATTRIB2_4_NV = 0x8672; - public static final int MAP2_VERTEX_ATTRIB3_4_NV = 0x8673; - public static final int MAP2_VERTEX_ATTRIB4_4_NV = 0x8674; - public static final int MAP2_VERTEX_ATTRIB5_4_NV = 0x8675; - public static final int MAP2_VERTEX_ATTRIB6_4_NV = 0x8676; - public static final int MAP2_VERTEX_ATTRIB7_4_NV = 0x8677; - public static final int MAP2... [truncated message content] |
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/native/linux Modified Files: org_lwjgl_Display.cpp org_lwjgl_Sys.cpp org_lwjgl_input_Cursor.cpp org_lwjgl_input_Keyboard.cpp org_lwjgl_input_Mouse.cpp Log Message: Ported OpenGL to Buffers Index: org_lwjgl_Display.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- org_lwjgl_Display.cpp 1 Jun 2003 17:20:03 -0000 1.36 +++ org_lwjgl_Display.cpp 24 Jun 2003 12:24:55 -0000 1.37 @@ -307,7 +307,7 @@ * Signature: (I)Z */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_Display_setGammaRamp - (JNIEnv *env, jclass clazz, jint gamma_ramp_address) + (JNIEnv *env, jclass clazz, jobject gamma_ramp_buffer) { if (gamma_ramp_length == 0) return JNI_FALSE; @@ -319,7 +319,7 @@ return JNI_FALSE; } int screen = DefaultScreen(disp); - float *gamma_ramp = (float *)gamma_ramp_address; + const float *gamma_ramp = (const float *)env->GetDirectBufferAddress(gamma_ramp_buffer); unsigned short *ramp; ramp = (unsigned short *)malloc(sizeof(unsigned short)*gamma_ramp_length); for (int i = 0; i < gamma_ramp_length; i++) { Index: org_lwjgl_Sys.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Sys.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Sys.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- org_lwjgl_Sys.cpp 7 Apr 2003 17:30:41 -0000 1.7 +++ org_lwjgl_Sys.cpp 24 Jun 2003 12:24:55 -0000 1.8 @@ -53,34 +53,12 @@ * Method: nGetNULLValue * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_Sys_nGetNULLValue - (JNIEnv *, jclass) +JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_nGetNULLValue + (JNIEnv *env, jclass clazz) { - return (jint)NULL; + return env->NewDirectByteBuffer(NULL, 0); } -/* - * Class: org_lwjgl_Sys - * Method: getDirectBufferAddress - * Signature: (Ljava/nio/Buffer;)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_Sys_getDirectBufferAddress - (JNIEnv * env, jclass clazz, jobject buf) -{ - return (jint) env->GetDirectBufferAddress(buf); -} - -/* - * Class: org_lwjgl_Sys - * Method: createDirectBuffer - * Signature: (II)Ljava/nio/ByteBuffer; - */ -JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_createDirectBuffer - (JNIEnv * env, jclass clazz, jint address, jint length) -{ - return env->NewDirectByteBuffer((void *)address, length); -} - /* * Class: org_lwjgl_Sys * Method: getTimerResolution Index: org_lwjgl_input_Cursor.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Cursor.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Cursor.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_input_Cursor.cpp 20 May 2003 12:20:12 -0000 1.2 +++ org_lwjgl_input_Cursor.cpp 24 Jun 2003 12:24:55 -0000 1.3 @@ -8,10 +8,12 @@ * Signature: (IIIIIII)I */ JNIEXPORT jint JNICALL Java_org_lwjgl_input_Cursor_nCreateCursor - (JNIEnv *env, jclass clazz, jint width, jint height, jint x_hotspot, jint y_hotspot, jint num_images, jint image_addresses, jint delay_addresses) + (JNIEnv *env, jclass clazz, jint width, jint height, jint x_hotspot, jint y_hotspot, jint num_images, jobject image_buffer, jobject delay_buffer) { - XcursorPixel *pixels = (XcursorPixel *)image_addresses; - int *delays = (int *)delay_addresses; + const int *delays = NULL; + if (delay_buffer != NULL) + delays = (const int *)env->GetDirectBufferAddress(delay_buffer); + XcursorPixel *pixels = (XcursorPixel *)env->GetDirectBufferAddress(image_buffer); int stride = width*height; XcursorImages *cursor_images = XcursorImagesCreate(num_images); if (cursor_images == NULL) @@ -28,7 +30,7 @@ } Cursor cursor = XcursorImagesLoadCursor(getCurrentDisplay(), cursor_images); XcursorImagesDestroy(cursor_images); - return (jint)cursor; + return cursor; } /* Index: org_lwjgl_input_Keyboard.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- org_lwjgl_input_Keyboard.cpp 7 Jun 2003 13:56:05 -0000 1.24 +++ org_lwjgl_input_Keyboard.cpp 24 Jun 2003 12:24:55 -0000 1.25 @@ -264,9 +264,10 @@ * Signature: (I)V */ JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nPoll - (JNIEnv * env, jclass clazz, jint buf) + (JNIEnv * env, jclass clazz, jobject buffer) { - memcpy((unsigned char*)buf, key_buf, KEYBOARD_SIZE*sizeof(unsigned char)); + unsigned char *new_keyboard_buffer = (unsigned char *)env->GetDirectBufferAddress(buffer); + memcpy(new_keyboard_buffer, key_buf, KEYBOARD_SIZE*sizeof(unsigned char)); } /* Index: org_lwjgl_input_Mouse.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- org_lwjgl_input_Mouse.cpp 8 Jun 2003 14:32:30 -0000 1.28 +++ org_lwjgl_input_Mouse.cpp 24 Jun 2003 12:24:55 -0000 1.29 @@ -198,8 +198,8 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nSetNativeCursor (JNIEnv *env, jclass clazz, jint cursor_handle) { - Cursor cursor = (Cursor)cursor_handle; - if (cursor != None) { + if (cursor_handle != 0) { + Cursor cursor = (Cursor)cursor_handle; if (!native_cursor) { current_x = current_y = 0; XWarpPointer(getCurrentDisplay(), None, getCurrentWindow(), 0, 0, 0, 0, current_x, current_y); |
|
From: Elias N. <eli...@us...> - 2003-06-24 12:24:59
|
Update of /cvsroot/java-game-lib/LWJGL/src/native In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/native Modified Files: configure.in Log Message: Ported OpenGL to Buffers Index: configure.in CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/configure.in =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/configure.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- configure.in 7 Jun 2003 13:56:05 -0000 1.13 +++ configure.in 24 Jun 2003 12:24:55 -0000 1.14 @@ -51,8 +51,8 @@ else AC_MSG_RESULT($JAVA_HOME) JAVA_HOME="$JAVA_HOME" - CPPFLAGS="$CPPFLAGS -fno-rtti -fno-exceptions -pthread -D_X11 -Wall -I$JAVA_HOME/include -I$JAVA_HOME/include/linux" - CFLAGS="$CFLAGS -pthread -D_X11 -Wall -I$JAVA_HOME/include -I$JAVA_HOME/include/linux" + CPPFLAGS="$CPPFLAGS -fno-rtti -fno-exceptions -pthread -D_X11 -Wall -Wmissing-declarations -I$JAVA_HOME/include -I$JAVA_HOME/include/linux" + CFLAGS="$CFLAGS -pthread -D_X11 -Wall -Wmissing-declarations -I$JAVA_HOME/include -I$JAVA_HOME/include/linux" fi dnl Checks for libraries. |
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/wgl In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/java/org/lwjgl/opengl/wgl Modified Files: WGLBufferRegion.java WGLMakeCurrentRead.java WGLMultisample.java WGLPBuffer.java WGLPixelFormat.java WGLRenderTexture.java Log Message: Ported OpenGL to Buffers Index: WGLBufferRegion.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/wgl/WGLBufferRegion.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/wgl/WGLBufferRegion.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- WGLBufferRegion.java 21 Dec 2002 12:37:20 -0000 1.2 +++ WGLBufferRegion.java 24 Jun 2003 12:24:55 -0000 1.3 @@ -41,8 +41,8 @@ public interface WGLBufferRegion { - public static final int WFRONT_COLOR_BUFFER_BIT_ARB = 0x00000001; - public static final int WBACK_COLOR_BUFFER_BIT_ARB = 0x00000002; - public static final int WDEPTH_BUFFER_BIT_ARB = 0x00000004; - public static final int WSTENCIL_BUFFER_BIT_ARB = 0x00000008; + public static final int WGL_WFRONT_COLOR_BUFFER_BIT_ARB = 0x00000001; + public static final int WGL_WBACK_COLOR_BUFFER_BIT_ARB = 0x00000002; + public static final int WGL_WDEPTH_BUFFER_BIT_ARB = 0x00000004; + public static final int WGL_WSTENCIL_BUFFER_BIT_ARB = 0x00000008; } Index: WGLMakeCurrentRead.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/wgl/WGLMakeCurrentRead.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/wgl/WGLMakeCurrentRead.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- WGLMakeCurrentRead.java 21 Dec 2002 12:37:20 -0000 1.2 +++ WGLMakeCurrentRead.java 24 Jun 2003 12:24:55 -0000 1.3 @@ -41,6 +41,6 @@ public interface WGLMakeCurrentRead { - public static final int ERROR_INVALID_PIXEL_TYPE_ARB = 0x2043; - public static final int ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB = 0x2054; + public static final int WGL_ERROR_INVALID_PIXEL_TYPE_ARB = 0x2043; + public static final int WGL_ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB = 0x2054; } Index: WGLMultisample.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/wgl/WGLMultisample.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/wgl/WGLMultisample.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- WGLMultisample.java 21 Dec 2002 12:37:20 -0000 1.2 +++ WGLMultisample.java 24 Jun 2003 12:24:55 -0000 1.3 @@ -41,6 +41,6 @@ public interface WGLMultisample { - public static final int WSAMPLE_BUFFERS_ARB = 0x2041; - public static final int WSAMPLES_ARB = 0x2042; + public static final int WGL_WSAMPLE_BUFFERS_ARB = 0x2041; + public static final int WGL_WSAMPLES_ARB = 0x2042; } Index: WGLPBuffer.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/wgl/WGLPBuffer.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/wgl/WGLPBuffer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- WGLPBuffer.java 21 Dec 2002 12:37:20 -0000 1.2 +++ WGLPBuffer.java 24 Jun 2003 12:24:55 -0000 1.3 @@ -41,12 +41,12 @@ public interface WGLPBuffer { - public static final int WDRAW_TO_PBUFFER_ARB = 0x202D; - public static final int WMAX_PBUFFER_PIXELS_ARB = 0x202E; - public static final int WMAX_PBUFFER_WIDTH_ARB = 0x202F; - public static final int WMAX_PBUFFER_HEIGHT_ARB = 0x2030; - public static final int WPBUFFER_LARGEST_ARB = 0x2033; - public static final int WPBUFFER_WIDTH_ARB = 0x2034; - public static final int WPBUFFER_HEIGHT_ARB = 0x2035; - public static final int WPBUFFER_LOST_ARB = 0x2036; + public static final int WGL_WDRAW_TO_PBUFFER_ARB = 0x202D; + public static final int WGL_WMAX_PBUFFER_PIXELS_ARB = 0x202E; + public static final int WGL_WMAX_PBUFFER_WIDTH_ARB = 0x202F; + public static final int WGL_WMAX_PBUFFER_HEIGHT_ARB = 0x2030; + public static final int WGL_WPBUFFER_LARGEST_ARB = 0x2033; + public static final int WGL_WPBUFFER_WIDTH_ARB = 0x2034; + public static final int WGL_WPBUFFER_HEIGHT_ARB = 0x2035; + public static final int WGL_WPBUFFER_LOST_ARB = 0x2036; } Index: WGLPixelFormat.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/wgl/WGLPixelFormat.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/wgl/WGLPixelFormat.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- WGLPixelFormat.java 21 Dec 2002 12:37:20 -0000 1.2 +++ WGLPixelFormat.java 24 Jun 2003 12:24:55 -0000 1.3 @@ -41,53 +41,53 @@ public interface WGLPixelFormat { - public static final int WNUMBER_PIXEL_FORMATS_ARB = 0x2000; - public static final int WDRAW_TO_WINDOW_ARB = 0x2001; - public static final int WDRAW_TO_BITMAP_ARB = 0x2002; - public static final int WACCELERATION_ARB = 0x2003; - public static final int WNEED_PALETTE_ARB = 0x2004; - public static final int WNEED_SYSTEM_PALETTE_ARB = 0x2005; - public static final int WSWAP_LAYER_BUFFERS_ARB = 0x2006; - public static final int WSWAP_METHOD_ARB = 0x2007; - public static final int WNUMBER_OVERLAYS_ARB = 0x2008; - public static final int WNUMBER_UNDERLAYS_ARB = 0x2009; - public static final int WTRANSPARENT_ARB = 0x200A; - public static final int WTRANSPARENT_RED_VALUE_ARB = 0x2037; - public static final int WTRANSPARENT_GREEN_VALUE_ARB = 0x2038; - public static final int WTRANSPARENT_BLUE_VALUE_ARB = 0x2039; - public static final int WTRANSPARENT_ALPHA_VALUE_ARB = 0x203A; - public static final int WTRANSPARENT_INDEX_VALUE_ARB = 0x203B; - public static final int WSHARE_DEPTH_ARB = 0x200C; - public static final int WSHARE_STENCIL_ARB = 0x200D; - public static final int WSHARE_ACCUM_ARB = 0x200E; - public static final int WSUPPORT_GDI_ARB = 0x200F; - public static final int WSUPPORT_OPENARB = 0x2010; - public static final int WDOUBLE_BUFFER_ARB = 0x2011; - public static final int WSTEREO_ARB = 0x2012; - public static final int WPIXEL_TYPE_ARB = 0x2013; - public static final int WCOLOR_BITS_ARB = 0x2014; - public static final int WRED_BITS_ARB = 0x2015; - public static final int WRED_SHIFT_ARB = 0x2016; - public static final int WGREEN_BITS_ARB = 0x2017; - public static final int WGREEN_SHIFT_ARB = 0x2018; - public static final int WBLUE_BITS_ARB = 0x2019; - public static final int WBLUE_SHIFT_ARB = 0x201A; - public static final int WALPHA_BITS_ARB = 0x201B; - public static final int WALPHA_SHIFT_ARB = 0x201C; - public static final int WACCUM_BITS_ARB = 0x201D; - public static final int WACCUM_RED_BITS_ARB = 0x201E; - public static final int WACCUM_GREEN_BITS_ARB = 0x201F; - public static final int WACCUM_BLUE_BITS_ARB = 0x2020; - public static final int WACCUM_ALPHA_BITS_ARB = 0x2021; - public static final int WDEPTH_BITS_ARB = 0x2022; - public static final int WSTENCIL_BITS_ARB = 0x2023; - public static final int WAUX_BUFFERS_ARB = 0x2024; - public static final int WNO_ACCELERATION_ARB = 0x2025; - public static final int WGENERIC_ACCELERATION_ARB = 0x2026; - public static final int WFULL_ACCELERATION_ARB = 0x2027; - public static final int WSWAP_EXCHANGE_ARB = 0x2028; - public static final int WSWAP_COPY_ARB = 0x2029; - public static final int WSWAP_UNDEFINED_ARB = 0x202A; - public static final int WTYPE_RGBA_ARB = 0x202B; - public static final int WTYPE_COLORINDEX_ARB = 0x202C; + public static final int WGL_WNUMBER_PIXEL_FORMATS_ARB = 0x2000; + public static final int WGL_WDRAW_TO_WINDOW_ARB = 0x2001; + public static final int WGL_WDRAW_TO_BITMAP_ARB = 0x2002; + public static final int WGL_WACCELERATION_ARB = 0x2003; + public static final int WGL_WNEED_PALETTE_ARB = 0x2004; + public static final int WGL_WNEED_SYSTEM_PALETTE_ARB = 0x2005; + public static final int WGL_WSWAP_LAYER_BUFFERS_ARB = 0x2006; + public static final int WGL_WSWAP_METHOD_ARB = 0x2007; + public static final int WGL_WNUMBER_OVERLAYS_ARB = 0x2008; + public static final int WGL_WNUMBER_UNDERLAYS_ARB = 0x2009; + public static final int WGL_WTRANSPARENT_ARB = 0x200A; + public static final int WGL_WTRANSPARENT_RED_VALUE_ARB = 0x2037; + public static final int WGL_WTRANSPARENT_GREEN_VALUE_ARB = 0x2038; + public static final int WGL_WTRANSPARENT_BLUE_VALUE_ARB = 0x2039; + public static final int WGL_WTRANSPARENT_ALPHA_VALUE_ARB = 0x203A; + public static final int WGL_WTRANSPARENT_INDEX_VALUE_ARB = 0x203B; + public static final int WGL_WSHARE_DEPTH_ARB = 0x200C; + public static final int WGL_WSHARE_STENCIL_ARB = 0x200D; + public static final int WGL_WSHARE_ACCUM_ARB = 0x200E; + public static final int WGL_WSUPPORT_GDI_ARB = 0x200F; + public static final int WGL_WSUPPORT_OPENARB = 0x2010; + public static final int WGL_WDOUBLE_BUFFER_ARB = 0x2011; + public static final int WGL_WSTEREO_ARB = 0x2012; + public static final int WGL_WPIXEL_TYPE_ARB = 0x2013; + public static final int WGL_WCOLOR_BITS_ARB = 0x2014; + public static final int WGL_WRED_BITS_ARB = 0x2015; + public static final int WGL_WRED_SHIFT_ARB = 0x2016; + public static final int WGL_WGREEN_BITS_ARB = 0x2017; + public static final int WGL_WGREEN_SHIFT_ARB = 0x2018; + public static final int WGL_WBLUE_BITS_ARB = 0x2019; + public static final int WGL_WBLUE_SHIFT_ARB = 0x201A; + public static final int WGL_WALPHA_BITS_ARB = 0x201B; + public static final int WGL_WALPHA_SHIFT_ARB = 0x201C; + public static final int WGL_WACCUM_BITS_ARB = 0x201D; + public static final int WGL_WACCUM_RED_BITS_ARB = 0x201E; + public static final int WGL_WACCUM_GREEN_BITS_ARB = 0x201F; + public static final int WGL_WACCUM_BLUE_BITS_ARB = 0x2020; + public static final int WGL_WACCUM_ALPHA_BITS_ARB = 0x2021; + public static final int WGL_WDEPTH_BITS_ARB = 0x2022; + public static final int WGL_WSTENCIL_BITS_ARB = 0x2023; + public static final int WGL_WAUX_BUFFERS_ARB = 0x2024; + public static final int WGL_WNO_ACCELERATION_ARB = 0x2025; + public static final int WGL_WGENERIC_ACCELERATION_ARB = 0x2026; + public static final int WGL_WFULL_ACCELERATION_ARB = 0x2027; + public static final int WGL_WSWAP_EXCHANGE_ARB = 0x2028; + public static final int WGL_WSWAP_COPY_ARB = 0x2029; + public static final int WGL_WSWAP_UNDEFINED_ARB = 0x202A; + public static final int WGL_WTYPE_RGBA_ARB = 0x202B; + public static final int WGL_WTYPE_COLORINDEX_ARB = 0x202C; } Index: WGLRenderTexture.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/wgl/WGLRenderTexture.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/wgl/WGLRenderTexture.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- WGLRenderTexture.java 21 Dec 2002 12:37:20 -0000 1.2 +++ WGLRenderTexture.java 24 Jun 2003 12:24:55 -0000 1.3 @@ -41,38 +41,38 @@ public interface WGLRenderTexture { - public static final int WBIND_TO_TEXTURE_RGB_ARB = 0x2070; - public static final int WBIND_TO_TEXTURE_RGBA_ARB = 0x2071; - public static final int WTEXTURE_FORMAT_ARB = 0x2072; - public static final int WTEXTURE_TARGET_ARB = 0x2073; - public static final int WMIPMAP_TEXTURE_ARB = 0x2074; - public static final int WTEXTURE_RGB_ARB = 0x2075; - public static final int WTEXTURE_RGBA_ARB = 0x2076; - public static final int WNO_TEXTURE_ARB = 0x2077; - public static final int WTEXTURE_CUBE_MAP_ARB = 0x2078; - public static final int WTEXTURE_1D_ARB = 0x2079; - public static final int WTEXTURE_2D_ARB = 0x207A; - public static final int WMIPMAP_LEVEL_ARB = 0x207B; - public static final int WCUBE_MAP_FACE_ARB = 0x207C; - public static final int WTEXTURE_CUBE_MAP_POSITIVE_X_ARB = 0x207D; - public static final int WTEXTURE_CUBE_MAP_NEGATIVE_X_ARB = 0x207E; - public static final int WTEXTURE_CUBE_MAP_POSITIVE_Y_ARB = 0x207F; - public static final int WTEXTURE_CUBE_MAP_NEGATIVE_Y_ARB = 0x2080; - public static final int WTEXTURE_CUBE_MAP_POSITIVE_Z_ARB = 0x2081; - public static final int WTEXTURE_CUBE_MAP_NEGATIVE_Z_ARB = 0x2082; - public static final int WFRONT_LEFT_ARB = 0x2083; - public static final int WFRONT_RIGHT_ARB = 0x2084; - public static final int WBACK_LEFT_ARB = 0x2085; - public static final int WBACK_RIGHT_ARB = 0x2086; - public static final int WAUX0_ARB = 0x2087; - public static final int WAUX1_ARB = 0x2088; - public static final int WAUX2_ARB = 0x2089; - public static final int WAUX3_ARB = 0x208A; - public static final int WAUX4_ARB = 0x208B; - public static final int WAUX5_ARB = 0x208C; - public static final int WAUX6_ARB = 0x208D; - public static final int WAUX7_ARB = 0x208E; - public static final int WAUX8_ARB = 0x208F; - public static final int WAUX9_ARB = 0x2090; + public static final int WGL_WBIND_TO_TEXTURE_RGB_ARB = 0x2070; + public static final int WGL_WBIND_TO_TEXTURE_RGBA_ARB = 0x2071; + public static final int WGL_WTEXTURE_FORMAT_ARB = 0x2072; + public static final int WGL_WTEXTURE_TARGET_ARB = 0x2073; + public static final int WGL_WMIPMAP_TEXTURE_ARB = 0x2074; + public static final int WGL_WTEXTURE_RGB_ARB = 0x2075; + public static final int WGL_WTEXTURE_RGBA_ARB = 0x2076; + public static final int WGL_WNO_TEXTURE_ARB = 0x2077; + public static final int WGL_WTEXTURE_CUBE_MAP_ARB = 0x2078; + public static final int WGL_WTEXTURE_1D_ARB = 0x2079; + public static final int WGL_WTEXTURE_2D_ARB = 0x207A; + public static final int WGL_WMIPMAP_LEVEL_ARB = 0x207B; + public static final int WGL_WCUBE_MAP_FACE_ARB = 0x207C; + public static final int WGL_WTEXTURE_CUBE_MAP_POSITIVE_X_ARB = 0x207D; + public static final int WGL_WTEXTURE_CUBE_MAP_NEGATIVE_X_ARB = 0x207E; + public static final int WGL_WTEXTURE_CUBE_MAP_POSITIVE_Y_ARB = 0x207F; + public static final int WGL_WTEXTURE_CUBE_MAP_NEGATIVE_Y_ARB = 0x2080; + public static final int WGL_WTEXTURE_CUBE_MAP_POSITIVE_Z_ARB = 0x2081; + public static final int WGL_WTEXTURE_CUBE_MAP_NEGATIVE_Z_ARB = 0x2082; + public static final int WGL_WFRONT_LEFT_ARB = 0x2083; + public static final int WGL_WFRONT_RIGHT_ARB = 0x2084; + public static final int WGL_WBACK_LEFT_ARB = 0x2085; + public static final int WGL_WBACK_RIGHT_ARB = 0x2086; + public static final int WGL_WAUX0_ARB = 0x2087; + public static final int WGL_WAUX1_ARB = 0x2088; + public static final int WGL_WAUX2_ARB = 0x2089; + public static final int WGL_WAUX3_ARB = 0x208A; + public static final int WGL_WAUX4_ARB = 0x208B; + public static final int WGL_WAUX5_ARB = 0x208C; + public static final int WGL_WAUX6_ARB = 0x208D; + public static final int WGL_WAUX7_ARB = 0x208E; + public static final int WGL_WAUX8_ARB = 0x208F; + public static final int WGL_WAUX9_ARB = 0x2090; } |
|
From: Elias N. <eli...@us...> - 2003-06-24 12:24:58
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/java/org/lwjgl/opengl/ati Modified Files: ATIElementArray.java ATIEnvmapBumpmap.java ATIFragmentShader.java ATIPnTriangles.java ATITextureMirrorOnce.java ATIVertexArrayObject.java ATIVertexStreams.java Log Message: Ported OpenGL to Buffers Index: ATIElementArray.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATIElementArray.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATIElementArray.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ATIElementArray.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ATIElementArray.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,7 +41,7 @@ public interface ATIElementArray { - public static final int ELEMENT_ARRAY_ATI = 0x8768; - public static final int ELEMENT_ARRAY_TYPE_ATI = 0x8769; - public static final int ELEMENT_ARRAY_POINTER_ATI = 0x876A; + public static final int GL_ELEMENT_ARRAY_ATI = 0x8768; + public static final int GL_ELEMENT_ARRAY_TYPE_ATI = 0x8769; + public static final int GL_ELEMENT_ARRAY_POINTER_ATI = 0x876A; } Index: ATIEnvmapBumpmap.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATIEnvmapBumpmap.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATIEnvmapBumpmap.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ATIEnvmapBumpmap.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ATIEnvmapBumpmap.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,12 +41,12 @@ public interface ATIEnvmapBumpmap { - public static final int BUMP_ROT_MATRIX_ATI = 0x8775; - public static final int BUMP_ROT_MATRIX_SIZE_ATI = 0x8776; - public static final int BUMP_NUM_TEX_UNITS_ATI = 0x8777; - public static final int BUMP_TEX_UNITS_ATI = 0x8778; - public static final int DUDV_ATI = 0x8779; - public static final int DU8DV8_ATI = 0x877A; - public static final int BUMP_ENVMAP_ATI = 0x877B; - public static final int BUMP_TARGET_ATI = 0x877C; + public static final int GL_BUMP_ROT_MATRIX_ATI = 0x8775; + public static final int GL_BUMP_ROT_MATRIX_SIZE_ATI = 0x8776; + public static final int GL_BUMP_NUM_TEX_UNITS_ATI = 0x8777; + public static final int GL_BUMP_TEX_UNITS_ATI = 0x8778; + public static final int GL_DUDV_ATI = 0x8779; + public static final int GL_DU8DV8_ATI = 0x877A; + public static final int GL_BUMP_ENVMAP_ATI = 0x877B; + public static final int GL_BUMP_TARGET_ATI = 0x877C; } Index: ATIFragmentShader.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATIFragmentShader.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATIFragmentShader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ATIFragmentShader.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ATIFragmentShader.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -45,108 +45,108 @@ public interface ATIFragmentShader { - public static final int FRAGMENT_SHADER_ATI = 0x8920; - public static final int REG_0_ATI = 0x8921; - public static final int REG_1_ATI = 0x8922; - public static final int REG_2_ATI = 0x8923; - public static final int REG_3_ATI = 0x8924; - public static final int REG_4_ATI = 0x8925; - public static final int REG_5_ATI = 0x8926; - public static final int REG_6_ATI = 0x8927; - public static final int REG_7_ATI = 0x8928; - public static final int REG_8_ATI = 0x8929; - public static final int REG_9_ATI = 0x892A; - public static final int REG_10_ATI = 0x892B; - public static final int REG_11_ATI = 0x892C; - public static final int REG_12_ATI = 0x892D; - public static final int REG_13_ATI = 0x892E; - public static final int REG_14_ATI = 0x892F; - public static final int REG_15_ATI = 0x8930; - public static final int REG_16_ATI = 0x8931; - public static final int REG_17_ATI = 0x8932; - public static final int REG_18_ATI = 0x8933; - public static final int REG_19_ATI = 0x8934; - public static final int REG_20_ATI = 0x8935; - public static final int REG_21_ATI = 0x8936; - public static final int REG_22_ATI = 0x8937; - public static final int REG_23_ATI = 0x8938; - public static final int REG_24_ATI = 0x8939; - public static final int REG_25_ATI = 0x893A; - public static final int REG_26_ATI = 0x893B; - public static final int REG_27_ATI = 0x893C; - public static final int REG_28_ATI = 0x893D; - public static final int REG_29_ATI = 0x893E; - public static final int REG_30_ATI = 0x893F; - public static final int REG_31_ATI = 0x8940; - public static final int CON_0_ATI = 0x8941; - public static final int CON_1_ATI = 0x8942; - public static final int CON_2_ATI = 0x8943; - public static final int CON_3_ATI = 0x8944; - public static final int CON_4_ATI = 0x8945; - public static final int CON_5_ATI = 0x8946; - public static final int CON_6_ATI = 0x8947; - public static final int CON_7_ATI = 0x8948; - public static final int CON_8_ATI = 0x8949; - public static final int CON_9_ATI = 0x894A; - public static final int CON_10_ATI = 0x894B; - public static final int CON_11_ATI = 0x894C; - public static final int CON_12_ATI = 0x894D; - public static final int CON_13_ATI = 0x894E; - public static final int CON_14_ATI = 0x894F; - public static final int CON_15_ATI = 0x8950; - public static final int CON_16_ATI = 0x8951; - public static final int CON_17_ATI = 0x8952; - public static final int CON_18_ATI = 0x8953; - public static final int CON_19_ATI = 0x8954; - public static final int CON_20_ATI = 0x8955; - public static final int CON_21_ATI = 0x8956; - public static final int CON_22_ATI = 0x8957; - public static final int CON_23_ATI = 0x8958; - public static final int CON_24_ATI = 0x8959; - public static final int CON_25_ATI = 0x895A; - public static final int CON_26_ATI = 0x895B; - public static final int CON_27_ATI = 0x895C; - public static final int CON_28_ATI = 0x895D; - public static final int CON_29_ATI = 0x895E; - public static final int CON_30_ATI = 0x895F; - public static final int CON_31_ATI = 0x8960; - public static final int MOV_ATI = 0x8961; - public static final int ADD_ATI = 0x8963; - public static final int MUL_ATI = 0x8964; - public static final int SUB_ATI = 0x8965; - public static final int DOT3_ATI = 0x8966; - public static final int DOT4_ATI = 0x8967; - public static final int MAD_ATI = 0x8968; - public static final int LERP_ATI = 0x8969; - public static final int CND_ATI = 0x896A; - public static final int CND0_ATI = 0x896B; - public static final int DOT2_ADD_ATI = 0x896C; - public static final int SECONDARY_INTERPOLATOR_ATI = 0x896D; - public static final int NUM_FRAGMENT_REGISTERS_ATI = 0x896E; - public static final int NUM_FRAGMENT_CONSTANTS_ATI = 0x896F; - public static final int NUM_PASSES_ATI = 0x8970; - public static final int NUM_INSTRUCTIONS_PER_PASS_ATI = 0x8971; - public static final int NUM_INSTRUCTIONS_TOTAL_ATI = 0x8972; - public static final int NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI = 0x8973; - public static final int NUM_LOOPBACK_COMPONENTS_ATI = 0x8974; - public static final int COLOR_ALPHA_PAIRING_ATI = 0x8975; - public static final int SWIZZLE_STR_ATI = 0x8976; - public static final int SWIZZLE_STQ_ATI = 0x8977; - public static final int SWIZZLE_STR_DR_ATI = 0x8978; - public static final int SWIZZLE_STQ_DQ_ATI = 0x8979; - public static final int SWIZZLE_STRQ_ATI = 0x897A; - public static final int SWIZZLE_STRQ_DQ_ATI = 0x897B; - public static final int RED_BIT_ATI = 0x00000001; - public static final int GREEN_BIT_ATI = 0x00000002; - public static final int BLUE_BIT_ATI = 0x00000004; - public static final int X2_BIT_ATI = 0x00000001; - public static final int X4_BIT_ATI = 0x00000002; - public static final int X8_BIT_ATI = 0x00000004; - public static final int HALF_BIT_ATI = 0x00000008; - public static final int QUARTER_BIT_ATI = 0x00000010; - public static final int EIGHTH_BIT_ATI = 0x00000020; - public static final int SATURATE_BIT_ATI = 0x00000040; - public static final int COMP_BIT_ATI = 0x00000002; - public static final int NEGATE_BIT_ATI = 0x00000004; - public static final int BIAS_BIT_ATI = 0x00000008; + public static final int GL_FRAGMENT_SHADER_ATI = 0x8920; + public static final int GL_REG_0_ATI = 0x8921; + public static final int GL_REG_1_ATI = 0x8922; + public static final int GL_REG_2_ATI = 0x8923; + public static final int GL_REG_3_ATI = 0x8924; + public static final int GL_REG_4_ATI = 0x8925; + public static final int GL_REG_5_ATI = 0x8926; + public static final int GL_REG_6_ATI = 0x8927; + public static final int GL_REG_7_ATI = 0x8928; + public static final int GL_REG_8_ATI = 0x8929; + public static final int GL_REG_9_ATI = 0x892A; + public static final int GL_REG_10_ATI = 0x892B; + public static final int GL_REG_11_ATI = 0x892C; + public static final int GL_REG_12_ATI = 0x892D; + public static final int GL_REG_13_ATI = 0x892E; + public static final int GL_REG_14_ATI = 0x892F; + public static final int GL_REG_15_ATI = 0x8930; + public static final int GL_REG_16_ATI = 0x8931; + public static final int GL_REG_17_ATI = 0x8932; + public static final int GL_REG_18_ATI = 0x8933; + public static final int GL_REG_19_ATI = 0x8934; + public static final int GL_REG_20_ATI = 0x8935; + public static final int GL_REG_21_ATI = 0x8936; + public static final int GL_REG_22_ATI = 0x8937; + public static final int GL_REG_23_ATI = 0x8938; + public static final int GL_REG_24_ATI = 0x8939; + public static final int GL_REG_25_ATI = 0x893A; + public static final int GL_REG_26_ATI = 0x893B; + public static final int GL_REG_27_ATI = 0x893C; + public static final int GL_REG_28_ATI = 0x893D; + public static final int GL_REG_29_ATI = 0x893E; + public static final int GL_REG_30_ATI = 0x893F; + public static final int GL_REG_31_ATI = 0x8940; + public static final int GL_CON_0_ATI = 0x8941; + public static final int GL_CON_1_ATI = 0x8942; + public static final int GL_CON_2_ATI = 0x8943; + public static final int GL_CON_3_ATI = 0x8944; + public static final int GL_CON_4_ATI = 0x8945; + public static final int GL_CON_5_ATI = 0x8946; + public static final int GL_CON_6_ATI = 0x8947; + public static final int GL_CON_7_ATI = 0x8948; + public static final int GL_CON_8_ATI = 0x8949; + public static final int GL_CON_9_ATI = 0x894A; + public static final int GL_CON_10_ATI = 0x894B; + public static final int GL_CON_11_ATI = 0x894C; + public static final int GL_CON_12_ATI = 0x894D; + public static final int GL_CON_13_ATI = 0x894E; + public static final int GL_CON_14_ATI = 0x894F; + public static final int GL_CON_15_ATI = 0x8950; + public static final int GL_CON_16_ATI = 0x8951; + public static final int GL_CON_17_ATI = 0x8952; + public static final int GL_CON_18_ATI = 0x8953; + public static final int GL_CON_19_ATI = 0x8954; + public static final int GL_CON_20_ATI = 0x8955; + public static final int GL_CON_21_ATI = 0x8956; + public static final int GL_CON_22_ATI = 0x8957; + public static final int GL_CON_23_ATI = 0x8958; + public static final int GL_CON_24_ATI = 0x8959; + public static final int GL_CON_25_ATI = 0x895A; + public static final int GL_CON_26_ATI = 0x895B; + public static final int GL_CON_27_ATI = 0x895C; + public static final int GL_CON_28_ATI = 0x895D; + public static final int GL_CON_29_ATI = 0x895E; + public static final int GL_CON_30_ATI = 0x895F; + public static final int GL_CON_31_ATI = 0x8960; + public static final int GL_MOV_ATI = 0x8961; + public static final int GL_ADD_ATI = 0x8963; + public static final int GL_MUL_ATI = 0x8964; + public static final int GL_SUB_ATI = 0x8965; + public static final int GL_DOT3_ATI = 0x8966; + public static final int GL_DOT4_ATI = 0x8967; + public static final int GL_MAD_ATI = 0x8968; + public static final int GL_LERP_ATI = 0x8969; + public static final int GL_CND_ATI = 0x896A; + public static final int GL_CND0_ATI = 0x896B; + public static final int GL_DOT2_ADD_ATI = 0x896C; + public static final int GL_SECONDARY_INTERPOLATOR_ATI = 0x896D; + public static final int GL_NUM_FRAGMENT_REGISTERS_ATI = 0x896E; + public static final int GL_NUM_FRAGMENT_CONSTANTS_ATI = 0x896F; + public static final int GL_NUM_PASSES_ATI = 0x8970; + public static final int GL_NUM_INSTRUCTIONS_PER_PASS_ATI = 0x8971; + public static final int GL_NUM_INSTRUCTIONS_TOTAL_ATI = 0x8972; + public static final int GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI = 0x8973; + public static final int GL_NUM_LOOPBACK_COMPONENTS_ATI = 0x8974; + public static final int GL_COLOR_ALPHA_PAIRING_ATI = 0x8975; + public static final int GL_SWIZZLE_STR_ATI = 0x8976; + public static final int GL_SWIZZLE_STQ_ATI = 0x8977; + public static final int GL_SWIZZLE_STR_DR_ATI = 0x8978; + public static final int GL_SWIZZLE_STQ_DQ_ATI = 0x8979; + public static final int GL_SWIZZLE_STRQ_ATI = 0x897A; + public static final int GL_SWIZZLE_STRQ_DQ_ATI = 0x897B; + public static final int GL_RED_BIT_ATI = 0x00000001; + public static final int GL_GREEN_BIT_ATI = 0x00000002; + public static final int GL_BLUE_BIT_ATI = 0x00000004; + public static final int GL_X2_BIT_ATI = 0x00000001; + public static final int GL_X4_BIT_ATI = 0x00000002; + public static final int GL_X8_BIT_ATI = 0x00000004; + public static final int GL_HALF_BIT_ATI = 0x00000008; + public static final int GL_QUARTER_BIT_ATI = 0x00000010; + public static final int GL_EIGHTH_BIT_ATI = 0x00000020; + public static final int GL_SATURATE_BIT_ATI = 0x00000040; + public static final int GL_COMP_BIT_ATI = 0x00000002; + public static final int GL_NEGATE_BIT_ATI = 0x00000004; + public static final int GL_BIAS_BIT_ATI = 0x00000008; } Index: ATIPnTriangles.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATIPnTriangles.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATIPnTriangles.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ATIPnTriangles.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ATIPnTriangles.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,13 +41,13 @@ public interface ATIPnTriangles { - public static final int PN_TRIANGLES_ATI = 0x87F0; - public static final int MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F1; - public static final int PN_TRIANGLES_POINT_MODE_ATI = 0x87F2; - public static final int PN_TRIANGLES_NORMAL_MODE_ATI = 0x87F3; - public static final int PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F4; - public static final int PN_TRIANGLES_POINT_MODE_LINEAR_ATI = 0x87F5; - public static final int PN_TRIANGLES_POINT_MODE_CUBIC_ATI = 0x87F6; - public static final int PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI = 0x87F7; - public static final int PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI = 0x87F8; + public static final int GL_PN_TRIANGLES_ATI = 0x87F0; + public static final int GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F1; + public static final int GL_PN_TRIANGLES_POINT_MODE_ATI = 0x87F2; + public static final int GL_PN_TRIANGLES_NORMAL_MODE_ATI = 0x87F3; + public static final int GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F4; + public static final int GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI = 0x87F5; + public static final int GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI = 0x87F6; + public static final int GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI = 0x87F7; + public static final int GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI = 0x87F8; } Index: ATITextureMirrorOnce.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATITextureMirrorOnce.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATITextureMirrorOnce.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ATITextureMirrorOnce.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ATITextureMirrorOnce.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,6 +41,6 @@ public interface ATITextureMirrorOnce { - public static final int MIRROR_CLAMP_ATI = 0x8742; - public static final int MIRROR_CLAMP_TO_EDGE_ATI = 0x8743; + public static final int GL_MIRROR_CLAMP_ATI = 0x8742; + public static final int GL_MIRROR_CLAMP_TO_EDGE_ATI = 0x8743; } Index: ATIVertexArrayObject.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATIVertexArrayObject.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATIVertexArrayObject.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ATIVertexArrayObject.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ATIVertexArrayObject.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,12 +41,12 @@ public interface ATIVertexArrayObject { - public static final int STATIC_ATI = 0x8760; - public static final int DYNAMIC_ATI = 0x8761; - public static final int PRESERVE_ATI = 0x8762; - public static final int DISCARD_ATI = 0x8763; - public static final int OBJECT_BUFFER_SIZE_ATI = 0x8764; - public static final int OBJECT_BUFFER_USAGE_ATI = 0x8765; - public static final int ARRAY_OBJECT_BUFFER_ATI = 0x8766; - public static final int ARRAY_OBJECT_OFFSET_ATI = 0x8767; + public static final int GL_STATIC_ATI = 0x8760; + public static final int GL_DYNAMIC_ATI = 0x8761; + public static final int GL_PRESERVE_ATI = 0x8762; + public static final int GL_DISCARD_ATI = 0x8763; + public static final int GL_OBJECT_BUFFER_SIZE_ATI = 0x8764; + public static final int GL_OBJECT_BUFFER_USAGE_ATI = 0x8765; + public static final int GL_ARRAY_OBJECT_BUFFER_ATI = 0x8766; + public static final int GL_ARRAY_OBJECT_OFFSET_ATI = 0x8767; } Index: ATIVertexStreams.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATIVertexStreams.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATIVertexStreams.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ATIVertexStreams.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ATIVertexStreams.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,14 +41,14 @@ public interface ATIVertexStreams { - public static final int MAX_VERTEX_STREAMS_ATI = 0x876B; - public static final int VERTEX_SOURCE_ATI = 0x876C; - public static final int VERTEX_STREAM0_ATI = 0x876D; - public static final int VERTEX_STREAM1_ATI = 0x876E; - public static final int VERTEX_STREAM2_ATI = 0x876F; - public static final int VERTEX_STREAM3_ATI = 0x8770; - public static final int VERTEX_STREAM4_ATI = 0x8771; - public static final int VERTEX_STREAM5_ATI = 0x8772; - public static final int VERTEX_STREAM6_ATI = 0x8773; - public static final int VERTEX_STREAM7_ATI = 0x8774; + public static final int GL_MAX_VERTEX_STREAMS_ATI = 0x876B; + public static final int GL_VERTEX_SOURCE_ATI = 0x876C; + public static final int GL_VERTEX_STREAM0_ATI = 0x876D; + public static final int GL_VERTEX_STREAM1_ATI = 0x876E; + public static final int GL_VERTEX_STREAM2_ATI = 0x876F; + public static final int GL_VERTEX_STREAM3_ATI = 0x8770; + public static final int GL_VERTEX_STREAM4_ATI = 0x8771; + public static final int GL_VERTEX_STREAM5_ATI = 0x8772; + public static final int GL_VERTEX_STREAM6_ATI = 0x8773; + public static final int GL_VERTEX_STREAM7_ATI = 0x8774; } |
|
From: Elias N. <eli...@us...> - 2003-06-24 12:24:58
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/sgis In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/java/org/lwjgl/opengl/sgis Modified Files: SGISGenerateMipmap.java Log Message: Ported OpenGL to Buffers Index: SGISGenerateMipmap.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/sgis/SGISGenerateMipmap.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/sgis/SGISGenerateMipmap.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SGISGenerateMipmap.java 21 Dec 2002 12:37:20 -0000 1.2 +++ SGISGenerateMipmap.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,6 +41,6 @@ public interface SGISGenerateMipmap { - public static final int GENERATE_MIPMAP_SGIS = 0x8191; - public static final int GENERATE_MIPMAP_HINT_SGIS = 0x8192; + public static final int GL_GENERATE_MIPMAP_SGIS = 0x8191; + public static final int GL_GENERATE_MIPMAP_HINT_SGIS = 0x8192; } |
|
From: Elias N. <eli...@us...> - 2003-06-24 12:24:58
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/sgix In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/java/org/lwjgl/opengl/sgix Modified Files: SGIXDepthTexture.java SGIXShadow.java Log Message: Ported OpenGL to Buffers Index: SGIXDepthTexture.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/sgix/SGIXDepthTexture.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/sgix/SGIXDepthTexture.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SGIXDepthTexture.java 21 Dec 2002 12:37:20 -0000 1.2 +++ SGIXDepthTexture.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,8 +41,8 @@ public interface SGIXDepthTexture { - public static final int DEPTH_COMPONENT16_SGIX = 0x81A5; - public static final int DEPTH_COMPONENT24_SGIX = 0x81A6; - public static final int DEPTH_COMPONENT32_SGIX = 0x81A7; + public static final int GL_DEPTH_COMPONENT16_SGIX = 0x81A5; + public static final int GL_DEPTH_COMPONENT24_SGIX = 0x81A6; + public static final int GL_DEPTH_COMPONENT32_SGIX = 0x81A7; } Index: SGIXShadow.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/sgix/SGIXShadow.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/sgix/SGIXShadow.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SGIXShadow.java 21 Dec 2002 12:37:20 -0000 1.2 +++ SGIXShadow.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,8 +41,8 @@ public interface SGIXShadow { - public static final int TEXTURE_COMPARE_SGIX = 0x819A; - public static final int TEXTURE_COMPARE_OPERATOR_SGIX = 0x819B; - public static final int TEXTURE_LEQUAL_R_SGIX = 0x819C; - public static final int TEXTURE_GEQUAL_R_SGIX = 0x819D; + public static final int GL_TEXTURE_COMPARE_SGIX = 0x819A; + public static final int GL_TEXTURE_COMPARE_OPERATOR_SGIX = 0x819B; + public static final int GL_TEXTURE_LEQUAL_R_SGIX = 0x819C; + public static final int GL_TEXTURE_GEQUAL_R_SGIX = 0x819D; } |
|
From: Elias N. <eli...@us...> - 2003-06-24 12:24:57
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/atix In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/java/org/lwjgl/opengl/atix Modified Files: ATIXPointSprites.java ATIXTextureEnvRoute.java Log Message: Ported OpenGL to Buffers Index: ATIXPointSprites.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/atix/ATIXPointSprites.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/atix/ATIXPointSprites.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ATIXPointSprites.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ATIXPointSprites.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,10 +41,10 @@ public interface ATIXPointSprites { - public static final int TEXTURE_POINT_MODE_ATIX = 0x60b0; - public static final int TEXTURE_POINT_ONE_COORD_ATIX = 0x60b1; - public static final int TEXTURE_POINT_SPRITE_ATIX = 0x60b2; - public static final int POINT_SPRITE_CULL_MODE_ATIX = 0x60b3; - public static final int POINT_SPRITE_CULL_CENTER_ATIX = 0x60b4; - public static final int POINT_SPRITE_CULL_CLIP_ATIX = 0x60b5; + public static final int GL_TEXTURE_POINT_MODE_ATIX = 0x60b0; + public static final int GL_TEXTURE_POINT_ONE_COORD_ATIX = 0x60b1; + public static final int GL_TEXTURE_POINT_SPRITE_ATIX = 0x60b2; + public static final int GL_POINT_SPRITE_CULL_MODE_ATIX = 0x60b3; + public static final int GL_POINT_SPRITE_CULL_CENTER_ATIX = 0x60b4; + public static final int GL_POINT_SPRITE_CULL_CLIP_ATIX = 0x60b5; } Index: ATIXTextureEnvRoute.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/atix/ATIXTextureEnvRoute.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/atix/ATIXTextureEnvRoute.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ATIXTextureEnvRoute.java 21 Dec 2002 12:37:19 -0000 1.2 +++ ATIXTextureEnvRoute.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,7 +41,7 @@ public interface ATIXTextureEnvRoute { - public static final int SECONDARY_COLOR_ATIX = 0x8747; - public static final int TEXTURE_OUTPUT_RGB_ATIX = 0x8748; - public static final int TEXTURE_OUTPUT_ALPHA_ATIX = 0x8749; + public static final int GL_SECONDARY_COLOR_ATIX = 0x8747; + public static final int GL_TEXTURE_OUTPUT_RGB_ATIX = 0x8748; + public static final int GL_TEXTURE_OUTPUT_ALPHA_ATIX = 0x8749; } |
|
From: Elias N. <eli...@us...> - 2003-06-24 12:24:57
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/java/org/lwjgl/opengl Modified Files: CoreGL.java CoreGLConstants.java GL.java GLU.java GLUConstants.java Log Message: Ported OpenGL to Buffers Index: CoreGL.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- CoreGL.java 16 Jun 2003 17:07:35 -0000 1.15 +++ CoreGL.java 24 Jun 2003 12:24:54 -0000 1.16 @@ -32,6 +32,13 @@ package org.lwjgl.opengl; +import java.nio.ByteBuffer; +import java.nio.CharBuffer; +import java.nio.IntBuffer; +import java.nio.FloatBuffer; +import java.nio.DoubleBuffer; +import java.nio.Buffer; + /** * $Id$ * @@ -41,8 +48,6 @@ * @version $Revision$ */ public class CoreGL extends BaseGL implements CoreGLConstants { - - /** * @param title * @param x @@ -69,464 +74,471 @@ super(title, bpp, alpha, depth, stencil); } - public native void accum(int op, float value); - public native void alphaFunc(int func, float ref); - public native void colorTable( + public static native void glAccum(int op, float value); + public static native void glAlphaFunc(int func, float ref); + public static native void glColorTable( int target, int internalFormat, int width, int format, int type, - int data); + Buffer data); - public native void colorSubTable( + public static native void glColorSubTable( int target, int start, int count, int format, int type, - int data); + Buffer data); - public native void getColorTable( + public static native void glGetColorTable( int target, int format, int type, - int data); + Buffer data); - public native void getColorTableParameteriv( + public static native void glGetColorTableParameteriv( int target, int pname, - int params); + IntBuffer params); - public native void getColorTableParameterfv( + public static native void glGetColorTableParameterfv( int target, int pname, - int params); + FloatBuffer params); - public native void clearColor(float red, float green, float blue, float alpha); - public native void clearAccum(float red, float green, float blue, float alpha); - public native void clear(int mask); - public native void callLists(int n, int type, int lists); - public native void callList(int list); - public native void blendFunc(int sfactor, int dfactor); - public native void blendColor(float red, float green, float blue, float alpha); - public native void bitmap(int width, int height, float xorig, float yorig, float xmove, float ymove, int bitmap); - public native void bindTexture(int target, int texture); - public native void begin(int mode); - public native void end(); - public native void arrayElement(int i); - public native boolean areTexturesResident(int n, int textureNames, int residences); - public native void clearDepth(double depth); - public native void deleteLists(int list, int range); - public native void deleteTextures(int n, int textures); - public native void cullFace(int mode); - public native void copyTexSubImage2D(int target, int level, int xoffset, int yoffset, int x, int y, int width, int height); - public native void copyTexSubImage1D(int target, int level, int xoffset, int x, int y, int width); - public native void copyTexImage2D(int target, int level, int internalFormat, int x, int y, int width, int height, int border); - public native void copyTexImage1D(int target, int level, int internalFormat, int x, int y, int width, int border); + public static native void glClearColor(float red, float green, float blue, float alpha); + public static native void glClearAccum(float red, float green, float blue, float alpha); + public static native void glClear(int mask); + public static native void glCallLists(int n, int type, Buffer lists); + public static native void glCallList(int list); + public static native void glBlendFunc(int sfactor, int dfactor); + public static native void glBlendColor(float red, float green, float blue, float alpha); + public static native void glBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove, ByteBuffer bitmap); + public static native void glBindTexture(int target, int texture); + public static native void glBegin(int mode); + public static native void glEnd(); + public static native void glArrayElement(int i); + public static native boolean glAreTexturesResident(int n, IntBuffer textureNames, ByteBuffer residences); + public static native void glClearDepth(double depth); + public static native void glDeleteLists(int list, int range); + public static native void glDeleteTextures(int n, IntBuffer textures); + public static native void glCullFace(int mode); + public static native void glCopyTexSubImage2D(int target, int level, int xoffset, int yoffset, int x, int y, int width, int height); + public static native void glCopyTexSubImage1D(int target, int level, int xoffset, int x, int y, int width); + public static native void glCopyTexImage2D(int target, int level, int internalFormat, int x, int y, int width, int height, int border); + public static native void glCopyTexImage1D(int target, int level, int internalFormat, int x, int y, int width, int border); /* OpenGL 1.2 functions */ - public native void colorTableParameteriv(int target, int pname, int params); - public native void colorTableParameterfv(int target, int pname, int params); - public native void copyColorSubTable(int target, int start, int x, int y, int width); - public native void copyColorTable(int target, int internalformat, int x, int y, int width); - public native void blendEquation(int mode); - public native void histogram(int target, int width, int internalformat, boolean sink); - public native void resetHistogram(int target); - public native void getHistogram(int target, boolean reset, int format, int type, int values); - public native void getHistogramParameterfv(int target, int pname, int params); - public native void getHistogramParameteriv(int target, int pname, int params); - public native void minmax(int target, int internalformat, boolean sink); - public native void resetMinmax(int target); - public native void getMinmax(int target, boolean reset, int format, int types, int values); - public native void getMinmaxParameterfv(int target, int pname, int params); - public native void getMinmaxParameteriv(int target, int pname, int params); - public native void convolutionFilter1D(int target, int internalformat, int width, int format, int type, int image); - public native void convolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, int image); - public native void convolutionParameterf(int target, int pname, float params); - public native void convolutionParameterfv(int target, int pname, int params); - public native void convolutionParameteri(int target, int pname, int params); - public native void convolutionParameteriv(int target, int pname, int params); - public native void copyConvolutionFilter1D(int target, int internalformat, int x, int y, int width); - public native void copyConvolutionFilter2D(int target, int internalformat, int x, int y, int width, int height); - public native void getConvolutionFilter(int target, int format, int type, int image); - public native void getConvolutionParameterfv(int target, int pname, int params); - public native void getConvolutionParameteriv(int target, int pname, int params); - public native void separableFilter2D(int target, int internalformat, int width, int height, int format, int type, int row, int column); - public native void getSeparableFilter(int target, int format, int type, int row, int column, int span); - public native void drawRangeElements(int mode, int start, int end, int count, int type, int indices); - public native void texImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, int pixels); - public native void texSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, int pixels); - public native void copyTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height); + public static native void glColorTableParameteriv(int target, int pname, int params); + public static native void glColorTableParameterfv(int target, int pname, int params); + public static native void glCopyColorSubTable(int target, int start, int x, int y, int width); + public static native void glCopyColorTable(int target, int internalformat, int x, int y, int width); + public static native void glBlendEquation(int mode); + public static native void glHistogram(int target, int width, int internalformat, boolean sink); + public static native void glResetHistogram(int target); + public static native void glGetHistogram(int target, boolean reset, int format, int type, Buffer values); + public static native void glGetHistogramParameterfv(int target, int pname, FloatBuffer params); + public static native void glGetHistogramParameteriv(int target, int pname, IntBuffer params); + public static native void glMinmax(int target, int internalformat, boolean sink); + public static native void glResetMinmax(int target); + public static native void glGetMinmax(int target, boolean reset, int format, int types, Buffer values); + public static native void glGetMinmaxParameterfv(int target, int pname, FloatBuffer params); + public static native void glGetMinmaxParameteriv(int target, int pname, IntBuffer params); + public static native void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, Buffer image); + public static native void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer image); + public static native void glConvolutionParameterf(int target, int pname, float params); + public static native void glConvolutionParameterfv(int target, int pname, FloatBuffer params); + public static native void glConvolutionParameteri(int target, int pname, int params); + public static native void glConvolutionParameteriv(int target, int pname, IntBuffer params); + public static native void glCopyConvolutionFilter1D(int target, int internalformat, int x, int y, int width); + public static native void glCopyConvolutionFilter2D(int target, int internalformat, int x, int y, int width, int height); + public static native void glGetConvolutionFilter(int target, int format, int type, Buffer image); + public static native void glGetConvolutionParameterfv(int target, int pname, FloatBuffer params); + public static native void glGetConvolutionParameteriv(int target, int pname, IntBuffer params); + public static native void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer row, Buffer column); + public static native void glGetSeparableFilter(int target, int format, int type, Buffer row, Buffer column, Buffer span); + public static native void glDrawRangeElements(int mode, int start, int end, int count, int type, Buffer indices); + public static native void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, Buffer pixels); + public static native void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, Buffer pixels); + public static native void glCopyTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height); /* OpenGL 1.3 funstions */ - public native void activeTexture(int texture); - public native void clientActiveTexture(int texture); - public native void compressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, int data); - public native void compressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, int data); - public native void compressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, int data); - public native void compressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, int data); - public native void compressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, int data); - public native void compressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, int data); - public native void getCompressedTexImage(int target, int lod, int img); - public native void multiTexCoord1d(int target, double s); - public native void multiTexCoord1dv(int target, int v); - public native void multiTexCoord1f(int target, float s); - public native void multiTexCoord1fv(int target, int v); - public native void multiTexCoord1i(int target, int s); - public native void multiTexCoord1iv(int target, int v); - public native void multiTexCoord1s(int target, short s); - public native void multiTexCoord1sv(int target, int v); - public native void multiTexCoord2d(int target, double s, double t); - public native void multiTexCoord2dv(int target, int v); - public native void multiTexCoord2f(int target, float s, float t); - public native void multiTexCoord2fv(int target, int v); - public native void multiTexCoord2i(int target, int s, int t); - public native void multiTexCoord2iv(int target, int v); - public native void multiTexCoord2s(int target, short s, short t); - public native void multiTexCoord2sv(int target, int v); - public native void multiTexCoord3d(int target, double s, double t, double r); - public native void multiTexCoord3dv(int target, int v); - public native void multiTexCoord3f(int target, float s, float t, float r); - public native void multiTexCoord3fv(int target, int v); - public native void multiTexCoord3i(int target, int s, int t, int r); - public native void multiTexCoord3iv(int target, int v); - public native void multiTexCoord3s(int target, short s, short t, short r); - public native void multiTexCoord3sv(int target, int v); - public native void multiTexCoord4d(int target, double s, double t, double r, double q); - public native void multiTexCoord4dv(int target, int v); - public native void multiTexCoord4f(int target, float s, float t, float r, float q); - public native void multiTexCoord4fv(int target, int v); - public native void multiTexCoord4i(int target, int s, int t, int r, int q); - public native void multiTexCoord4iv(int target, int v); - public native void multiTexCoord4s(int target, short s, short t, short r, short q); - public native void multiTexCoord4sv(int target, int v); - public native void loadTransposeMatrixd(int m); - public native void loadTransposeMatrixf(int m); - public native void multTransposeMatrixd(int m); - public native void multTransposeMatrixf(int m); - public native void sampleCoverage(float value, boolean invert); - public native void copyPixels(int x, int y, int width, int height, int type); - public native void colorPointer(int size, int type, int stride, int pointer); - public native void colorMaterial(int face, int mode); - public native void colorMask(boolean red, boolean green, boolean blue, boolean alpha); - public native void color3b(byte red, byte green, byte blue); - public native void color3d(double red, double green, double blue); - public native void color3f(float red, float green, float blue); - public native void color3i(int red, int green, int blue); - public native void color3s(short red, short green, short blue); - public native void color3ub(byte red, byte green, byte blue); - public native void color3ui(int red, int green, int blue); - public native void color3us(short red, short green, short blue); - public native void color4b(byte red, byte green, byte blue, byte alpha); - public native void color4d(double red, double green, double blue, double alpha); - public native void color4f(float red, float green, float blue, float alpha); - public native void color4i(int red, int green, int blue, int alpha); - public native void color4s(short red, short green, short blue, short alpha); - public native void color4ub(byte red, byte green, byte blue, byte alpha); - public native void color4ui(int red, int green, int blue, int alpha); - public native void color4us(short red, short green, short blue, short alpha); - public native void color3bv(int v); - public native void color3dv(int v); - public native void color3fv(int v); - public native void color3iv(int v); - public native void color3sv(int v); - public native void color3ubv(int v); - public native void color3uiv(int v); - public native void color3usv(int v); - public native void color4bv(int v); - public native void color4dv(int v); - public native void color4fv(int v); - public native void color4iv(int v); - public native void color4sv(int v); - public native void color4ubv(int v); - public native void color4uiv(int v); - public native void clipPlane(int plane, int equation); - public native void clearStencil(int s); - public native void clearIndex(float c); - public native void evalPoint1(int i); - public native void evalPoint2(int i, int j); - public native void evalMesh1(int mode, int i1, int i2); - public native void evalMesh2(int mode, int i1, int i2, int j1, int j2); - public native void evalCoord1d(double u); - public native void evalCoord1f(float u); - public native void evalCoord2d(double u, double v); - public native void evalCoord2f(float u, float v); - public native void evalCoord1dv(int u); - public native void evalCoord1fv(int u); - public native void evalCoord2dv(int u); - public native void evalCoord2fv(int u); - public native void enableClientState(int cap); - public native void disableClientState(int cap); - public native void enable(int cap); - public native void disable(int cap); - public native void edgeFlagPointer(int stride, int pointer); - public native void edgeFlag(boolean flag); - public native void edgeFlagv(int flag); - public native void drawPixels(int width, int height, int format, int type, int pixels); - public native void drawElements(int mode, int count, int type, int indices); - public native void drawBuffer(int mode); - public native void drawArrays(int mode, int first, int count); - public native void depthRange(double zNear, double zFar); - public native void depthMask(boolean flag); - public native void depthFunc(int func); - public native void feedbackBuffer(int size, int type, int buffer); - public native void getPixelMapfv(int map, int values); - public native void getPixelMapuiv(int map, int values); - public native void getPixelMapusv(int map, int values); - public native void getMaterialfv(int face, int pname, int params); - public native void getMaterialiv(int face, int pname, int params); - public native void getMapdv(int target, int query, int v); - public native void getMapfv(int target, int query, int v); - public native void getMapiv(int target, int query, int v); - public native void getLightfv(int light, int pname, int params); - public native void getLightiv(int light, int pname, int params); - public native int getError(); - public native void getClipPlane(int plane, int equation); - public native void getBooleanv(int pname, int params); - public native void getDoublev(int pname, int params); - public native void getFloatv(int pname, int params); - public native void getIntegerv(int pname, int params); - public native void genTextures(int n, int textures); - public native int genLists(int range); - public native void frustum(double left, double right, double bottom, double top, double zNear, double zFar); - public native void frontFace(int mode); - public native void fogf(int pname, float param); - public native void fogi(int pname, int param); - public native void fogfv(int pname, int params); - public native void fogiv(int pname, int params); - public native void flush(); - public native void finish(); - public native void getPointerv(int pname, int params); - public native boolean isEnabled(int cap); - public native void interleavedArrays(int format, int stride, int pointer); - public native void initNames(); - public native void indexPointer(int type, int stride, int pointer); - public native void indexMask(int mask); - public native void indexd(double c); - public native void indexf(float c); - public native void indexi(int c); - public native void indexs(short c); - public native void indexub(byte c); - public native void indexdv(int c); - public native void indexfv(int c); - public native void indexiv(int c); - public native void indexsv(int c); - public native void indexubv(int c); - public native void hint(int target, int mode); - public native void getTexParameterfv(int target, int pname, int params); - public native void getTexParameteriv(int target, int pname, int params); - public native void getTexLevelParameterfv(int target, int level, int pname, int params); - public native void getTexLevelParameteriv(int target, int level, int pname, int params); - public native void getTexImage(int target, int level, int format, int type, int pixels); - public native void getTexGendv(int coord, int pname, int params); - public native void getTexGenfv(int coord, int pname, int params); - public native void getTexGeniv(int coord, int pname, int params); - public native void getTexEnvfv(int target, int pname, int params); - public native void getTexEnviv(int target, int pname, int params); - public native String getString(int name); - public native void getPolygonStipple(int mask); - public native boolean isList(int list); - public native void materialf(int face, int pname, float param); - public native void materiali(int face, int pname, int param); - public native void materialfv(int face, int pname, int params); - public native void materialiv(int face, int pname, int params); - public native void mapGrid1d(int un, double u1, double u2); - public native void mapGrid1f(int un, float u1, float u2); - public native void mapGrid2d(int un, double u1, double u2, int vn, double v1, double v2); - public native void mapGrid2f(int un, float u1, float u2, int vn, float v1, float v2); - public native void map2d(int target, double u1, double u2, int ustride, int uorder, double v1, double v2, int vstride, int vorder, int points); - public native void map2f(int target, float u1, float u2, int ustride, int uorder, float v1, float v2, int vstride, int vorder, int points); - public native void map1d(int target, double u1, double u2, int stride, int order, int points); - public native void map1f(int target, float u1, float u2, int stride, int order, int points); - public native void logicOp(int opcode); - public native void loadName(int name); - public native void loadMatrixd(int m); - public native void loadMatrixf(int m); - public native void loadIdentity(); - public native void listBase(int base); - public native void lineWidth(float width); - public native void lineStipple(int factor, short pattern); - public native void lightModelf(int pname, float param); - public native void lightModeli(int pname, int param); - public native void lightModelfv(int pname, int params); - public native void lightModeliv(int pname, int params); - public native void lightf(int light, int pname, float param); - public native void lighti(int light, int pname, int param); - public native void lightfv(int light, int pname, int params); - public native void lightiv(int light, int pname, int params); - public native boolean isTexture(int texture); - public native void matrixMode(int mode); - public native void polygonStipple(int mask); - public native void polygonOffset(float factor, float units); - public native void polygonMode(int face, int mode); - public native void pointSize(float size); - public native void pixelZoom(float xfactor, float yfactor); - public native void pixelTransferf(int pname, float param); - public native void pixelTransferi(int pname, int param); - public native void pixelStoref(int pname, float param); - public native void pixelStorei(int pname, int param); - public native void pixelMapfv(int map, int mapsize, int values); - public native void pixelMapuiv(int map, int mapsize, int values); - public native void pixelMapusv(int map, int mapsize, int values); - public native void passThrough(float token); - public native void ortho(double left, double right, double bottom, double top, double zNear, double zFar); - public native void normalPointer(int type, int stride, int pointer); - public native void normal3b(byte nx, byte ny, byte nz); - public native void normal3d(double nx, double ny, double nz); - public native void normal3f(float nx, float ny, float nz); - public native void normal3i(int nx, int ny, int nz); - public native void normal3s(short nx, short ny, short nz); - public native void normal3bv(int v); - public native void normal3dv(int v); - public native void normal3fv(int v); - public native void normal3iv(int v); - public native void normal3sv(int v); - public native void newList(int list, int mode); - public native void endList(); - public native void multMatrixd(int m); - public native void multMatrixf(int m); - public native void prioritizeTextures(int n, int textureNames, int priorities); - public native void shadeModel(int mode); - public native void selectBuffer(int size, int buffer); - public native void scissor(int x, int y, int width, int height); - public native void scaled(double x, double y, double z); - public native void scalef(float x, float y, float z); - public native void rotated(double angle, double x, double y, double z); - public native void rotatef(float angle, float x, float y, float z); - public native int renderMode(int mode); - public native void rectd(double x1, double y1, double x2, double y2); - public native void rectf(float x1, float y1, float x2, float y2); - public native void recti(int x1, int y1, int x2, int y2); - public native void rects(short x1, short y1, short x2, short y2); - public native void rectdv(int v1, int v2); - public native void rectfv(int v1, int v2); - public native void rectiv(int v1, int v2); - public native void rectsv(int v1, int v2); - public native void readPixels(int x, int y, int width, int height, int format, int type, int pixels); - public native void readBuffer(int mode); - public native void rasterPos2d(double x, double y); - public native void rasterPos2f(float x, float y); - public native void rasterPos2i(int x, int y); - public native void rasterPos2s(short x, short y); - public native void rasterPos3d(double x, double y, double z); - public native void rasterPos3f(float x, float y, float z); - public native void rasterPos3i(int x, int y, int z); - public native void rasterPos3s(short x, short y, short z); - public native void rasterPos4d(double x, double y, double z, double w); - public native void rasterPos4f(float x, float y, float z, float w); - public native void rasterPos4i(int x, int y, int z, int w); - public native void rasterPos4s(short x, short y, short z, short w); - public native void rasterPos2dv(int v); - public native void rasterPos2fv(int v); - public native void rasterPos2iv(int v); - public native void rasterPos2sv(int v); - public native void rasterPos3dv(int v); - public native void rasterPos3fv(int v); - public native void rasterPos3iv(int v); - public native void rasterPos3sv(int v); - public native void rasterPos4dv(int v); - public native void rasterPos4fv(int v); - public native void rasterPos4iv(int v); - public native void rasterPos4sv(int v); - public native void pushName(int name); - public native void popName(); - public native void pushMatrix(); - public native void popMatrix(); - public native void pushClientAttrib(int mask); - public native void popClientAttrib(); - public native void pushAttrib(int mask); - public native void popAttrib(); - public native void stencilFunc(int func, int ref, int mask); - public native void vertexPointer(int size, int type, int stride, int pointer); - public native void vertex2d(double x, double y); - public native void vertex2f(float x, float y); - public native void vertex2i(int x, int y); - public native void vertex2s(short x, short y); - public native void vertex3d(double x, double y, double z); - public native void vertex3f(float x, float y, float z); - public native void vertex3i(int x, int y, int z); - public native void vertex3s(short x, short y, short z); - public native void vertex4d(double x, double y, double z, double w); - public native void vertex4f(float x, float y, float z, float w); - public native void vertex4i(int x, int y, int z, int w); - public native void vertex4s(short x, short y, short z, short w); - public native void vertex2dv(int v); - public native void vertex2fv(int v); - public native void vertex2iv(int v); - public native void vertex2sv(int v); - public native void vertex3dv(int v); - public native void vertex3fv(int v); - public native void vertex3iv(int v); - public native void vertex3sv(int v); - public native void vertex4dv(int v); - public native void vertex4fv(int v); - public native void vertex4iv(int v); - public native void vertex4sv(int v); - public native void translated(double x, double y, double z); - public native void translatef(float x, float y, float z); - public native void texSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, int pixels); - public native void texSubImage1D(int target, int level, int xoffset, int width, int format, int type, int pixels); - public native void texParameterf(int target, int pname, float param); - public native void texParameteri(int target, int pname, int param); - public native void texImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, int pixels); - public native void texImage1D(int target, int level, int internalformat, int width, int border, int format, int type, int pixels); - public native void texGend(int coord, int pname, double param); - public native void texGenf(int coord, int pname, float param); - public native void texGeni(int coord, int pname, int param); - public native void texGendv(int coord, int pname, int params); - public native void texGenfv(int coord, int pname, int params); - public native void texGeniv(int coord, int pname, int params); - public native void texEnvf(int target, int pname, float param); - public native void texEnvi(int target, int pname, int param); - public native void texEnvfv(int target, int pname, int params); - public native void texEnviv(int target, int pname, int params); - public native void texCoordPointer(int size, int type, int stride, int pointer); - public native void texCoord1d(double s); - public native void texCoord1f(float s); - public native void texCoord1i(int s); - public native void texCoord1s(short s); - public native void texCoord2d(double s, double t); - public native void texCoord2f(float s, float t); - public native void texCoord2i(int s, int t); - public native void texCoord2s(short s, short t); - public native void texCoord3d(double s, double t, double r); - public native void texCoord3f(float s, float t, float r); - public native void texCoord3i(int s, int t, int r); - public native void texCoord3s(short s, short t, short r); - public native void texCoord4d(double s, double t, double r, double q); - public native void texCoord4f(float s, float t, float r, float q); - public native void texCoord4i(int s, int t, int r, int q); - public native void texCoord4s(short s, short t, short r, short q); - public native void texCoord1dv(int v); - public native void texCoord1fv(int v); - public native void texCoord1iv(int v); - public native void texCoord1sv(int v); - public native void texCoord2dv(int v); - public native void texCoord2fv(int v); - public native void texCoord2iv(int v); - public native void texCoord2sv(int v); - public native void texCoord3dv(int v); - public native void texCoord3fv(int v); - public native void texCoord3iv(int v); - public native void texCoord3sv(int v); - public native void texCoord4dv(int v); - public native void texCoord4fv(int v); - public native void texCoord4iv(int v); - public native void texCoord4sv(int v); - public native void stencilOp(int fail, int zfail, int zpass); - public native void stencilMask(int mask); - public native void viewport(int x, int y, int width, int height); - public native void multiDrawArrays( + public static native void glActiveTexture(int texture); + public static native void glClientActiveTexture(int texture); + public static native void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, Buffer data); + public static native void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, Buffer data); + public static native void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, Buffer data); + public static native void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, Buffer data); + public static native void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, Buffer data); + public static native void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, Buffer data); + public static native void glGetCompressedTexImage(int target, int lod, Buffer img); + public static native void glMultiTexCoord1d(int target, double s); + public static native void glMultiTexCoord1dv(int target, int v); + public static native void glMultiTexCoord1f(int target, float s); + public static native void glMultiTexCoord1fv(int target, int v); + public static native void glMultiTexCoord1i(int target, int s); + public static native void glMultiTexCoord1iv(int target, int v); + public static native void glMultiTexCoord1s(int target, short s); + public static native void glMultiTexCoord1sv(int target, int v); + public static native void glMultiTexCoord2d(int target, double s, double t); + public static native void glMultiTexCoord2dv(int target, int v); + public static native void glMultiTexCoord2f(int target, float s, float t); + public static native void glMultiTexCoord2fv(int target, int v); + public static native void glMultiTexCoord2i(int target, int s, int t); + public static native void glMultiTexCoord2iv(int target, int v); + public static native void glMultiTexCoord2s(int target, short s, short t); + public static native void glMultiTexCoord2sv(int target, int v); + public static native void glMultiTexCoord3d(int target, double s, double t, double r); + public static native void glMultiTexCoord3dv(int target, int v); + public static native void glMultiTexCoord3f(int target, float s, float t, float r); + public static native void glMultiTexCoord3fv(int target, int v); + public static native void glMultiTexCoord3i(int target, int s, int t, int r); + public static native void glMultiTexCoord3iv(int target, int v); + public static native void glMultiTexCoord3s(int target, short s, short t, short r); + public static native void glMultiTexCoord3sv(int target, int v); + public static native void glMultiTexCoord4d(int target, double s, double t, double r, double q); + public static native void glMultiTexCoord4dv(int target, int v); + public static native void glMultiTexCoord4f(int target, float s, float t, float r, float q); + public static native void glMultiTexCoord4fv(int target, int v); + public static native void glMultiTexCoord4i(int target, int s, int t, int r, int q); + public static native void glMultiTexCoord4iv(int target, int v); + public static native void glMultiTexCoord4s(int target, short s, short t, short r, short q); + public static native void glMultiTexCoord4sv(int target, int v); + public static native void glLoadTransposeMatrixd(int m); + public static native void glLoadTransposeMatrixf(int m); + public static native void glMultTransposeMatrixd(int m); + public static native void glMultTransposeMatrixf(int m); + public static native void glSampleCoverage(float value, boolean invert); + public static native void glCopyPixels(int x, int y, int width, int height, int type); + public static native void glColorPointer(int size, int type, int stride, Buffer pointer); + public static native void glColorMaterial(int face, int mode); + public static native void glColorMask(boolean red, boolean green, boolean blue, boolean alpha); + public static native void glColor3b(byte red, byte green, byte blue); + public static native void glColor3d(double red, double green, double blue); + public static native void glColor3f(float red, float green, float blue); + public static native void glColor3i(int red, int green, int blue); + public static native void glColor3s(short red, short green, short blue); + public static native void glColor3ub(byte red, byte green, byte blue); + public static native void glColor3ui(int red, int green, int blue); + public static native void glColor3us(short red, short green, short blue); + public static native void glColor4b(byte red, byte green, byte blue, byte alpha); + public static native void glColor4d(double red, double green, double blue, double alpha); + public static native void glColor4f(float red, float green, float blue, float alpha); + public static native void glColor4i(int red, int green, int blue, int alpha); + public static native void glColor4s(short red, short green, short blue, short alpha); + public static native void glColor4ub(byte red, byte green, byte blue, byte alpha); + public static native void glColor4ui(int red, int green, int blue, int alpha); + public static native void glColor4us(short red, short green, short blue, short alpha); + public static native void glColor3bv(ByteBuffer v); + public static native void glColor3dv(DoubleBuffer v); + public static native void glColor3fv(FloatBuffer v); + public static native void glColor3iv(IntBuffer v); + public static native void glColor3sv(CharBuffer v); + public static native void glColor3ubv(ByteBuffer v); + public static native void glColor3uiv(IntBuffer v); + public static native void glColor3usv(CharBuffer v); + public static native void glColor4bv(ByteBuffer v); + public static native void glColor4dv(DoubleBuffer v); + public static native void glColor4fv(FloatBuffer v); + public static native void glColor4iv(IntBuffer v); + public static native void glColor4sv(CharBuffer v); + public static native void glColor4ubv(ByteBuffer v); + public static native void glColor4uiv(IntBuffer v); + public static native void glClipPlane(int plane, DoubleBuffer equation); + public static native void glClearStencil(int s); + public static native void glClearIndex(float c); + public static native void glEvalPoint1(int i); + public static native void glEvalPoint2(int i, int j); + public static native void glEvalMesh1(int mode, int i1, int i2); + public static native void glEvalMesh2(int mode, int i1, int i2, int j1, int j2); + public static native void glEvalCoord1d(double u); + public static native void glEvalCoord1f(float u); + public static native void glEvalCoord2d(double u, double v); + public static native void glEvalCoord2f(float u, float v); + public static native void glEvalCoord1dv(DoubleBuffer u); + public static native void glEvalCoord1fv(FloatBuffer u); + public static native void glEvalCoord2dv(DoubleBuffer u); + public static native void glEvalCoord2fv(FloatBuffer u); + public static native void glEnableClientState(int cap); + public static native void glDisableClientState(int cap); + public static native void glEnable(int cap); + public static native void glDisable(int cap); + public static native void glEdgeFlagPointer(int stride, Buffer pointer); + public static native void glEdgeFlag(boolean flag); + public static native void glEdgeFlagv(ByteBuffer flag); + public static native void glDrawPixels(int width, int height, int format, int type, Buffer pixels); + public static native void glDrawElements(int mode, int count, int type, Buffer indices); + public static native void glDrawBuffer(int mode); + public static native void glDrawArrays(int mode, int first, int count); + public static native void glDepthRange(double zNear, double zFar); + public static native void glDepthMask(boolean flag); + public static native void glDepthFunc(int func); + public static native void glFeedbackBuffer(int size, int type, FloatBuffer buffer); + public static native void glGetPixelMapfv(int map, FloatBuffer values); + public static native void glGetPixelMapuiv(int map, IntBuffer values); + public static native void glGetPixelMapusv(int map, CharBuffer values); + public static native void glGetMaterialfv(int face, int pname, FloatBuffer params); + public static native void glGetMaterialiv(int face, int pname, IntBuffer params); + public static native void glGetMapdv(int target, int query, DoubleBuffer v); + public static native void glGetMapfv(int target, int query, FloatBuffer v); + public static native void glGetMapiv(int target, int query, IntBuffer v); + public static native void glGetLightfv(int light, int pname, FloatBuffer params); + public static native void glGetLightiv(int light, int pname, IntBuffer params); + public static native int glGetError(); + public static native void glGetClipPlane(int plane, int equation); + public static native void glGetBooleanv(int pname, ByteBuffer params); + public static native void glGetDoublev(int pname, DoubleBuffer params); + public static native void glGetFloatv(int pname, FloatBuffer params); + public static native void glGetIntegerv(int pname, IntBuffer params); + public static native void glGenTextures(int n, IntBuffer textures); + public static native int glGenLists(int range); + public static native void glFrustum(double left, double right, double bottom, double top, double zNear, double zFar); + public static native void glFrontFace(int mode); + public static native void glFogf(int pname, float param); + public static native void glFogi(int pname, int param); + public static native void glFogfv(int pname, FloatBuffer params); + public static native void glFogiv(int pname, IntBuffer params); + public static native void glFlush(); + public static native void glFinish(); + /** + * Fetch a pointer from OpenGL. Will return a ByteBuffer representing the pointer, where + * the size argument specifies the buffer size in bytes. + * + * @param size The size of the memory area pointed to. This is the size of the returned ByteBuffer. + * @return The ByteBuffer of the specified size pointing to the returned address. + */ + public static native ByteBuffer glGetPointerv(int pname, int size); + public static native boolean glIsEnabled(int cap); + public static native void glInterleavedArrays(int format, int stride, Buffer pointer); + public static native void glInitNames(); + public static native void glIndexPointer(int type, int stride, Buffer pointer); + public static native void glIndexMask(int mask); + public static native void glIndexd(double c); + public static native void glIndexf(float c); + public static native void glIndexi(int c); + public static native void glIndexs(short c); + public static native void glIndexub(byte c); + public static native void glIndexdv(DoubleBuffer c); + public static native void glIndexfv(FloatBuffer c); + public static native void glIndexiv(IntBuffer c); + public static native void glIndexsv(CharBuffer c); + public static native void glIndexubv(ByteBuffer c); + public static native void glHint(int target, int mode); + public static native void glGetTexParameterfv(int target, int pname, FloatBuffer params); + public static native void glGetTexParameteriv(int target, int pname, IntBuffer params); + public static native void glGetTexLevelParameterfv(int target, int level, int pname, FloatBuffer params); + public static native void glGetTexLevelParameteriv(int target, int level, int pname, IntBuffer params); + public static native void glGetTexImage(int target, int level, int format, int type, Buffer pixels); + public static native void glGetTexGendv(int coord, int pname, DoubleBuffer params); + public static native void glGetTexGenfv(int coord, int pname, FloatBuffer params); + public static native void glGetTexGeniv(int coord, int pname, IntBuffer params); + public static native void glGetTexEnvfv(int target, int pname, FloatBuffer params); + public static native void glGetTexEnviv(int target, int pname, IntBuffer params); + public static native String glGetString(int name); + public static native void glGetPolygonStipple(ByteBuffer mask); + public static native boolean glIsList(int list); + public static native void glMaterialf(int face, int pname, float param); + public static native void glMateriali(int face, int pname, int param); + public static native void glMaterialfv(int face, int pname, FloatBuffer params); + public static native void glMaterialiv(int face, int pname, IntBuffer params); + public static native void glMapGrid1d(int un, double u1, double u2); + public static native void glMapGrid1f(int un, float u1, float u2); + public static native void glMapGrid2d(int un, double u1, double u2, int vn, double v1, double v2); + public static native void glMapGrid2f(int un, float u1, float u2, int vn, float v1, float v2); + public static native void glMap2d(int target, double u1, double u2, int ustride, int uorder, double v1, double v2, int vstride, int vorder, DoubleBuffer points); + public static native void glMap2f(int target, float u1, float u2, int ustride, int uorder, float v1, float v2, int vstride, int vorder, FloatBuffer points); + public static native void glMap1d(int target, double u1, double u2, int stride, int order, DoubleBuffer points); + public static native void glMap1f(int target, float u1, float u2, int stride, int order, FloatBuffer points); + public static native void glLogicOp(int opcode); + public static native void glLoadName(int name); + public static native void glLoadMatrixd(DoubleBuffer m); + public static native void glLoadMatrixf(FloatBuffer m); + public static native void glLoadIdentity(); + public static native void glListBase(int base); + public static native void glLineWidth(float width); + public static native void glLineStipple(int factor, short pattern); + public static native void glLightModelf(int pname, float param); + public static native void glLightModeli(int pname, int param); + public static native void glLightModelfv(int pname, FloatBuffer params); + public static native void glLightModeliv(int pname, IntBuffer params); + public static native void glLightf(int light, int pname, float param); + public static native void glLighti(int light, int pname, int param); + public static native void glLightfv(int light, int pname, FloatBuffer params); + public static native void glLightiv(int light, int pname, IntBuffer params); + public static native boolean glIsTexture(int texture); + public static native void glMatrixMode(int mode); + public static native void glPolygonStipple(ByteBuffer mask); + public static native void glPolygonOffset(float factor, float units); + public static native void glPolygonMode(int face, int mode); + public static native void glPointSize(float size); + public static native void glPixelZoom(float xfactor, float yfactor); + public static native void glPixelTransferf(int pname, float param); + public static native void glPixelTransferi(int pname, int param); + public static native void glPixelStoref(int pname, float param); + public static native void glPixelStorei(int pname, int param); + public static native void glPixelMapfv(int map, int mapsize, FloatBuffer values); + public static native void glPixelMapuiv(int map, int mapsize, IntBuffer values); + public static native void glPixelMapusv(int map, int mapsize, CharBuffer values); + public static native void glPassThrough(float token); + public static native void glOrtho(double left, double right, double bottom, double top, double zNear, double zFar); + public static native void glNormalPointer(int type, int stride, Buffer pointer); + public static native void glNormal3b(byte nx, byte ny, byte nz); + public static native void glNormal3d(double nx, double ny, double nz); + public static native void glNormal3f(float nx, float ny, float nz); + public static native void glNormal3i(int nx, int ny, int nz); + public static native void glNormal3s(short nx, short ny, short nz); + public static native void glNormal3bv(ByteBuffer v); + public static native void glNormal3dv(DoubleBuffer v); + public static native void glNormal3fv(FloatBuffer v); + public static native void glNormal3iv(IntBuffer v); + public static native void glNormal3sv(CharBuffer v); + public static native void glNewList(int list, int mode); + public static native void glEndList(); + public static native void glMultMatrixd(DoubleBuffer m); + public static native void glMultMatrixf(FloatBuffer m); + public static native void glPrioritizeTextures(int n, IntBuffer textureNames, FloatBuffer priorities); + public static native void glShadeModel(int mode); + public static native void glSelectBuffer(int size, IntBuffer buffer); + public static native void glScissor(int x, int y, int width, int height); + public static native void glScaled(double x, double y, double z); + public static native void glScalef(float x, float y, float z); + public static native void glRotated(double angle, double x, double y, double z); + public static native void glRotatef(float angle, float x, float y, float z); + public static native int glRenderMode(int mode); + public static native void glRectd(double x1, double y1, double x2, double y2); + public static native void glRectf(float x1, float y1, float x2, float y2); + public static native void glRecti(int x1, int y1, int x2, int y2); + public static native void glRects(short x1, short y1, short x2, short y2); + public static native void glRectdv(DoubleBuffer v1, DoubleBuffer v2); + public static native void glRectfv(FloatBuffer v1, FloatBuffer v2); + public static native void glRectiv(IntBuffer v1, IntBuffer v2); + public static native void glRectsv(CharBuffer v1, CharBuffer v2); + public static native void glReadPixels(int x, int y, int width, int height, int format, int type, Buffer pixels); + public static native void glReadBuffer(int mode); + public static native void glRasterPos2d(double x, double y); + public static native void glRasterPos2f(float x, float y); + public static native void glRasterPos2i(int x, int y); + public static native void glRasterPos2s(short x, short y); + public static native void glRasterPos3d(double x, double y, double z); + public static native void glRasterPos3f(float x, float y, float z); + public static native void glRasterPos3i(int x, int y, int z); + public static native void glRasterPos3s(short x, short y, short z); + public static native void glRasterPos4d(double x, double y, double z, double w); + public static native void glRasterPos4f(float x, float y, float z, float w); + public static native void glRasterPos4i(int x, int y, int z, int w); + public static native void glRasterPos4s(short x, short y, short z, short w); + public static native void glRasterPos2dv(DoubleBuffer v); + public static native void glRasterPos2fv(FloatBuffer v); + public static native void glRasterPos2iv(IntBuffer v); + public static native void glRasterPos2sv(CharBuffer v); + public static native void glRasterPos3dv(DoubleBuffer v); + public static native void glRasterPos3fv(FloatBuffer v); + public static native void glRasterPos3iv(IntBuffer v); + public static native void glRasterPos3sv(CharBuffer v); + public static native void glRasterPos4dv(DoubleBuffer v); + public static native void glRasterPos4fv(FloatBuffer v); + public static native void glRasterPos4iv(IntBuffer v); + public static native void glRasterPos4sv(CharBuffer v); + public static native void glPushName(int name); + public static native void glPopName(); + public static native void glPushMatrix(); + public static native void glPopMatrix(); + public static native void glPushClientAttrib(int mask); + public static native void glPopClientAttrib(); + public static native void glPushAttrib(int mask); + public static native void glPopAttrib(); + public static native void glStencilFunc(int func, int ref, int mask); + public static native void glVertexPointer(int size, int type, int stride, Buffer pointer); + public static native void glVertex2d(double x, double y); + public static native void glVertex2f(float x, float y); + public static native void glVertex2i(int x, int y); + public static native void glVertex2s(short x, short y); + public static native void glVertex3d(double x, double y, double z); + public static native void glVertex3f(float x, float y, float z); + public static native void glVertex3i(int x, int y, int z); + public static native void glVertex3s(short x, short y, short z); + public static native void glVertex4d(double x, double y, double z, double w); + public static native void glVertex4f(float x, float y, float z, float w); + public static native void glVertex4i(int x, int y, int z, int w); + public static native void glVertex4s(short x, short y, short z, short w); + public static native void glVertex2dv(DoubleBuffer v); + public static native void glVertex2fv(FloatBuffer v); + public static native void glVertex2iv(IntBuffer v); + public static native void glVertex2sv(CharBuffer v); + public static native void glVertex3dv(DoubleBuffer v); + public static native void glVertex3fv(FloatBuffer v); + public static native void glVertex3iv(IntBuffer v); + public static native void glVertex3sv(CharBuffer v); + public static native void glVertex4dv(DoubleBuffer v); + public static native void glVertex4fv(FloatBuffer v); + public static native void glVertex4iv(IntBuffer v); + public static native void glVertex4sv(CharBuffer v); + public static native void glTranslated(double x, double y, double z); + public static native void glTranslatef(float x, float y, float z); + public static native void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, Buffer pixels); + public static native void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, Buffer pixels); + public static native void glTexParameterf(int target, int pname, float param); + public static native void glTexParameteri(int target, int pname, int param); + public static native void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, Buffer pixels); + public static native void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, Buffer pixels); + public static native void glTexGend(int coord, int pname, double param); + public static native void glTexGenf(int coord, int pname, float param); + public static native void glTexGeni(int coord, int pname, int param); + public static native void glTexGendv(int coord, int pname, DoubleBuffer params); + public static native void glTexGenfv(int coord, int pname, FloatBuffer params); + public static native void glTexGeniv(int coord, int pname, IntBuffer params); + public static native void glTexEnvf(int target, int pname, float param); + public static native void glTexEnvi(int target, int pname, int param); + public static native void glTexEnvfv(int target, int pname, FloatBuffer params); + public static native void glTexEnviv(int target, int pname, IntBuffer params); + public static native void glTexCoordPointer(int size, int type, int stride, Buffer pointer); + public static native void glTexCoord1d(double s); + public static native void glTexCoord1f(float s); + public static native void glTexCoord1i(int s); + public static native void glTexCoord1s(short s); + public static native void glTexCoord2d(double s, double t); + public static native void glTexCoord2f(float s, float t); + public static native void glTexCoord2i(int s, int t); + public static native void glTexCoord2s(short s, short t); + public static native void glTexCoord3d(double s, double t, double r); + public static native void glTexCoord3f(float s, float t, float r); + public static native void glTexCoord3i(int s, int t, int r); + public static native void glTexCoord3s(short s, short t, short r); + public static native void glTexCoord4d(double s, double t, double r, double q); + public static native void glTexCoord4f(float s, float t, float r, float q); + public static native void glTexCoord4i(int s, int t, int r, int q); + public static native void glTexCoord4s(short s, short t, short r, short q); + public static native void glTexCoord1dv(DoubleBuffer v); + public static native void glTexCoord1fv(FloatBuffer v); + public static native void glTexCoord1iv(IntBuffer v); + public static native void glTexCoord1sv(CharBuffer v); + public static native void glTexCoord2dv(DoubleBuffer v); + public static native void glTexCoord2fv(FloatBuffer v); + public static native void glTexCoord2iv(IntBuffer v); + public static native void glTexCoord2sv(CharBuffer v); + public static native void glTexCoord3dv(DoubleBuffer v); + public static native void glTexCoord3fv(FloatBuffer v); + public static native void glTexCoord3iv(IntBuffer v); + public static native void glTexCoord3sv(CharBuffer v); + public static native void glTexCoord4dv(DoubleBuffer v); + public static native void glTexCoord4fv(FloatBuffer v); + public static native void glTexCoord4iv(IntBuffer v); + public static native void glTexCoord4sv(CharBuffer v); + public static native void glStencilOp(int fail, int zfail, int zpass); + public static native void glStencilMask(int mask); + public static native void glViewport(int x, int y, int width, int height); + public static native void glMultiDrawArrays( int mode, - int piFirst, - int piCount, + ByteBuffer piFirst, + ByteBuffer piCount, int primcount); - public native void multiDrawElements( +/* public static native void glMultiDrawElements( int mode, int piCount, int type, int pIndices, - int primcount); + int primcount);*/ } Index: CoreGLConstants.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGLConstants.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGLConstants.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- CoreGLConstants.java 28 Apr 2003 16:41:39 -0000 1.6 +++ CoreGLConstants.java 24 Jun 2003 12:24:54 -0000 1.7 @@ -42,81 +42,81 @@ */ public interface CoreGLConstants { /* AccumOp */ - public static final int ACCUM = 0x0100; - public static final int LOAD = 0x0101; - public static final int RETURN = 0x0102; - public static final int MULT = 0x0103; - public static final int ADD = 0x0104; + public static final int GL_ACCUM = 0x0100; + public static final int GL_LOAD = 0x0101; + public static final int GL_RETURN = 0x0102; [...1799 lines suppressed...] - public static final int MAX_ELEMENTS_INDICES_WIN = 0x80E9; + public static final int GL_MAX_ELEMENTS_VERTICES_WIN = 0x80E8; + public static final int GL_MAX_ELEMENTS_INDICES_WIN = 0x80E9; /* WIN_phong_shading */ - public static final int PHONG_WIN = 0x80EA ; - public static final int PHONG_HINT_WIN = 0x80EB ; + public static final int GL_PHONG_WIN = 0x80EA ; + public static final int GL_PHONG_HINT_... [truncated message content] |
|
From: Elias N. <eli...@us...> - 2003-06-24 12:24:57
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/hp In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/java/org/lwjgl/opengl/hp Modified Files: HPOcclusionTest.java Log Message: Ported OpenGL to Buffers Index: HPOcclusionTest.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/hp/HPOcclusionTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/hp/HPOcclusionTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- HPOcclusionTest.java 21 Dec 2002 12:37:19 -0000 1.2 +++ HPOcclusionTest.java 24 Jun 2003 12:24:54 -0000 1.3 @@ -41,6 +41,6 @@ public interface HPOcclusionTest { - public static final int OCCLUSION_TEST_HP = 0x8165; - public static final int OCCLUSION_TEST_RESULT_HP = 0x8166; + public static final int GL_OCCLUSION_TEST_HP = 0x8165; + public static final int GL_OCCLUSION_TEST_RESULT_HP = 0x8166; } |
|
From: Elias N. <eli...@us...> - 2003-06-24 12:24:56
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/java/org/lwjgl Modified Files: Display.java Sys.java Log Message: Ported OpenGL to Buffers Index: Display.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/Display.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/Display.java,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- Display.java 1 Jun 2003 17:26:02 -0000 1.29 +++ Display.java 24 Jun 2003 12:24:54 -0000 1.30 @@ -234,7 +234,7 @@ rampEntry = 0.0f; gammaRamp.put(i, rampEntry); } - if (!setGammaRamp(Sys.getDirectBufferAddress(gammaRamp))) + if (!setGammaRamp(gammaRamp)) return false; if (Sys.DEBUG) { System.out.println("Gamma set, gamma = " + gamma + ", brightness = " + brightness + ", contrast = " + contrast); @@ -253,5 +253,5 @@ /** * Native method to set the gamma ramp. */ - private static native boolean setGammaRamp(int gammaRampAddress); + private static native boolean setGammaRamp(FloatBuffer gammaRamp); } Index: Sys.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/Sys.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/Sys.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Sys.java 12 Jun 2003 14:07:36 -0000 1.19 +++ Sys.java 24 Jun 2003 12:24:54 -0000 1.20 @@ -84,9 +84,9 @@ public static final boolean DEBUG; /** - * The integer equivalent of the native NULL constant + * The ByteBuffer equivalent of the native NULL constant */ - public static final int NULL; + public static final ByteBuffer NULL; private static boolean _debug; @@ -133,29 +133,7 @@ /** * Gets the native NULL constant value */ - private static native int nGetNULLValue(); - - /** - * Gets the address of a buffer. If the address cannot be obtained for any reason - * then this method returns 0. - * - * @param buffer The buffer for which you want the - * @return the address of the direct buffer passed in - */ - public static native int getDirectBufferAddress(Buffer buffer); - - /** - * Create a direct byte buffer at the specified address with the specified - * capacity. Note that no actual memory allocation is performed. The returned - * direct byte buffer is in native endian order. - * - * @param address The address of the buffer - * @param length The length in bytes that the buffer should have - * @return a direct ByteBuffer - * @throws IllegalArgumentException if address <1 or length <1 - */ - public static native ByteBuffer createDirectBuffer(int address, int length) - throws IllegalArgumentException; + private static native ByteBuffer nGetNULLValue(); /** * Obtains the number of ticks that the hires timer does in a second. |
|
From: Elias N. <eli...@us...> - 2003-06-24 12:24:56
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input In directory sc8-pr-cvs1:/tmp/cvs-serv25896/src/java/org/lwjgl/input Modified Files: Cursor.java Keyboard.java Mouse.java Log Message: Ported OpenGL to Buffers Index: Cursor.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Cursor.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Cursor.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Cursor.java 7 Jun 2003 11:53:17 -0000 1.5 +++ Cursor.java 24 Jun 2003 12:24:54 -0000 1.6 @@ -34,6 +34,8 @@ import org.lwjgl.Sys; +import java.nio.IntBuffer; + /** * $Id$ * @@ -66,13 +68,13 @@ * @param xHotspot the x coordinate of the cursor hotspot * @param yHotspot the y coordinate of the cursor hotspot * @param numImages number of cursor images specified. Must be 1 if animations are not supported. - * @param cursorAddress the address of an int array containing the cursor image - * @param delayAddresses the address of animation frame delays, if numImages is greater than 1, else Sys.NULL + * @param images A buffer containing the images + * @param delays An int buffer of animation frame delays, if numImages is greater than 1, else null * @throws Exception if the cursor could not be created for any reason */ - public Cursor(int width, int height, int xHotspot, int yHotspot, int numImages, int imageAddress, int delayAddresses) throws Exception { + public Cursor(int width, int height, int xHotspot, int yHotspot, int numImages, IntBuffer images, IntBuffer delays) throws Exception { assert Mouse.isCreated(); - nativeHandle = nCreateCursor(width, height, xHotspot, yHotspot, numImages, imageAddress, delayAddresses); + nativeHandle = nCreateCursor(width, height, xHotspot, yHotspot, numImages, images, delays); } /** @@ -92,7 +94,7 @@ /** * Native method to create a native cursor */ - private static native int nCreateCursor(int width, int height, int xHotspot, int yHotspot, int numImages, int imageAddresses, int delayAddresses); + private static native int nCreateCursor(int width, int height, int xHotspot, int yHotspot, int numImages, IntBuffer images, IntBuffer delays); /** * Native method to destroy a native cursor Index: Keyboard.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Keyboard.java 7 Jun 2003 12:47:08 -0000 1.22 +++ Keyboard.java 24 Jun 2003 12:24:54 -0000 1.23 @@ -214,9 +214,6 @@ /** The keys status from the last poll */ private static final ByteBuffer keyDownBuffer = ByteBuffer.allocateDirect(256); - /** Address of the keyDown buffer */ - private static final int keyDownAddress = Sys.getDirectBufferAddress(keyDownBuffer); - /** * The key events from the last read: a sequence of pairs of key number, * followed by state. If translation is enabled, the state is followed by @@ -310,7 +307,7 @@ */ public static void poll() { assert created : "The keyboard has not been created."; - nPoll(keyDownAddress); + nPoll(keyDownBuffer); } /** @@ -319,7 +316,7 @@ * @param keyDownBufferAddress the address of a 256-byte buffer to place * key states in. */ - private static native void nPoll(int keyDownBufferAddress); + private static native void nPoll(ByteBuffer keyDownBuffer); /** * Reads the keyboard buffer. @@ -427,4 +424,4 @@ } else return false; } -} \ No newline at end of file +} Index: Mouse.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Mouse.java 20 May 2003 12:20:11 -0000 1.20 +++ Mouse.java 24 Jun 2003 12:24:54 -0000 1.21 @@ -133,7 +133,7 @@ if (currentCursor != null) { nSetNativeCursor(currentCursor.getHandle()); } else { - nSetNativeCursor(Sys.NULL); + nSetNativeCursor(0); } return oldCursor; } |
|
From: Brian M. <ma...@us...> - 2003-06-17 23:00:33
|
Update of /cvsroot/java-game-lib/LWJGL/website/documents In directory sc8-pr-cvs1:/tmp/cvs-serv8226 Modified Files: links.html Log Message: added AF link Index: links.html CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/website/documents/links.html =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/website/documents/links.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- links.html 11 Jan 2003 13:56:51 -0000 1.2 +++ links.html 17 Jun 2003 23:00:30 -0000 1.3 @@ -31,6 +31,10 @@ Site related to Java gamming <br> <br> + - <a href="http://www.puppygames.net/" target="blank">http://www.puppygames.net/</a><br> + First commercial game using LWJGL! + <br> + <br> - <a href="http://sourceforge.net/projects/spgl/" target="blank">http://sourceforge.net/projects/spgl/</a><br> Game library building on top of lwjgl <br> |
|
From: Brian M. <ma...@us...> - 2003-06-17 23:00:17
|
Update of /cvsroot/java-game-lib/LWJGL/website In directory sc8-pr-cvs1:/tmp/cvs-serv8105 Modified Files: index.html Log Message: now linking to puppygames forum Index: index.html CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/website/index.html =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/website/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html 20 Dec 2002 21:23:30 -0000 1.1 +++ index.html 17 Jun 2003 23:00:06 -0000 1.2 @@ -97,7 +97,7 @@ </a> </td> <td valign="top" width="25%" align="center"> - <a href="http://sourceforge.net/forum/?group_id=58488" onmouseover="mouseOver('discussion', 9, 'Continue to the sourceforge discussion forum');" onmouseout="mouseOut('discussion', 8);"> + <a href="http://www.puppygames.net/forums/viewforum.php?f=3" onmouseover="mouseOver('discussion', 9, 'Continue to the lwjgl discussion forum');" onmouseout="mouseOut('discussion', 8);"> <img name="discussion" border="0" src="images/discussion.png" width="117" height="35" alt="discussions link"> </a> </td> |
|
From: Brian M. <ma...@us...> - 2003-06-17 21:24:50
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl In directory sc8-pr-cvs1:/tmp/cvs-serv23878 Modified Files: Grass.java Log Message: old resource loading was buggy? Index: Grass.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/Grass.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/Grass.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Grass.java 28 Mar 2003 22:12:45 -0000 1.11 +++ Grass.java 17 Jun 2003 21:24:48 -0000 1.12 @@ -45,7 +45,6 @@ import org.lwjgl.opengl.*; import org.lwjgl.*; -import java.net.*; import java.io.*; import java.nio.*; import java.util.*; @@ -115,9 +114,8 @@ int next; java.util.Vector bytes = new java.util.Vector(); try { - ClassLoader loader = ClassLoader.getSystemClassLoader(); - URL url = loader.getResource(file); - InputStream stream = new BufferedInputStream(url.openStream()); + ClassLoader loader = Grass.class.getClassLoader(); + InputStream stream = new BufferedInputStream(loader.getResourceAsStream(file)); while ((next = (stream.read())) != -1) bytes.add(new Byte((byte) next)); stream.close(); |
|
From: Brian M. <ma...@us...> - 2003-06-17 21:23:08
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal In directory sc8-pr-cvs1:/tmp/cvs-serv23589 Modified Files: WaveData.java Log Message: old resource loading was buggy? Index: WaveData.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/WaveData.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/WaveData.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- WaveData.java 12 Jan 2003 22:22:12 -0000 1.5 +++ WaveData.java 17 Jun 2003 21:23:06 -0000 1.6 @@ -91,7 +91,7 @@ try { return create( AudioSystem.getAudioInputStream( - new BufferedInputStream(ClassLoader.getSystemClassLoader().getResourceAsStream(filepath)))); + new BufferedInputStream(WaveData.class.getClassLoader().getResourceAsStream(filepath)))); } catch (Exception e) { e.printStackTrace(); return null; |
|
From: Brian M. <ma...@us...> - 2003-06-17 21:22:19
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal In directory sc8-pr-cvs1:/tmp/cvs-serv23491 Modified Files: PlayTest.java MovingSoundTest.java Log Message: using default file on no argument (allows easier JWS interaction) Index: PlayTest.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/PlayTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/PlayTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- PlayTest.java 27 Apr 2003 18:37:38 -0000 1.5 +++ PlayTest.java 17 Jun 2003 21:22:16 -0000 1.6 @@ -59,8 +59,8 @@ */ protected void execute(String[] args) { if(args.length < 1) { - System.out.println("please specify filename to play"); - return; + System.out.println("no argument supplied, assuming Footsteps.wav"); + args = new String[] {"Footsteps.wav"}; } int lastError; Index: MovingSoundTest.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/MovingSoundTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/MovingSoundTest.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- MovingSoundTest.java 27 Apr 2003 18:37:38 -0000 1.9 +++ MovingSoundTest.java 17 Jun 2003 21:22:16 -0000 1.10 @@ -65,8 +65,8 @@ */ protected void execute(String[] args) { if (args.length < 1) { - System.out.println("please specify filename to play"); - return; + System.out.println("no argument supplied, assuming Footsteps.wav"); + args = new String[] {"Footsteps.wav"}; } try { |
|
From: Brian M. <ma...@us...> - 2003-06-17 21:21:14
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal In directory sc8-pr-cvs1:/tmp/cvs-serv23296 Modified Files: PlayTestMemory.java Log Message: using classloader to load files Index: PlayTestMemory.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/PlayTestMemory.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/PlayTestMemory.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- PlayTestMemory.java 27 Apr 2003 18:37:38 -0000 1.5 +++ PlayTestMemory.java 17 Jun 2003 21:21:11 -0000 1.6 @@ -36,8 +36,6 @@ import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; -import java.net.MalformedURLException; -import java.net.URL; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.IntBuffer; @@ -65,8 +63,8 @@ */ protected void execute(String[] args) { if(args.length < 1) { - System.out.println("please specify filename to play"); - return; + System.out.println("no argument supplied, assuming Footsteps.wav"); + args = new String[] {"Footsteps.wav"}; } int lastError; @@ -161,20 +159,10 @@ protected ByteBuffer getData(String filename) { ByteBuffer buffer = null; - URL url = null; - - String cwd = System.getProperty("user.dir"); - - try { - url = new URL("file:///" + cwd + "/" + filename); - } catch (MalformedURLException mue) { - mue.printStackTrace(); - } - - System.out.println("Attempting to load: " + url); + System.out.println("Attempting to load: " + filename); try { - BufferedInputStream bis = new BufferedInputStream(url.openStream()); + BufferedInputStream bis = new BufferedInputStream(WaveData.class.getClassLoader().getResourceAsStream(filename)); ByteArrayOutputStream baos = new ByteArrayOutputStream(); int bufferLength = 4096; |
|
From: Brian M. <ma...@us...> - 2003-06-17 21:20:01
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input In directory sc8-pr-cvs1:/tmp/cvs-serv23004 Modified Files: ControllerCreationTest.java MouseCreationTest.java Log Message: reset displaymode when done Index: ControllerCreationTest.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/ControllerCreationTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/ControllerCreationTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ControllerCreationTest.java 28 Mar 2003 23:58:54 -0000 1.5 +++ ControllerCreationTest.java 17 Jun 2003 21:19:59 -0000 1.6 @@ -137,6 +137,7 @@ System.out.println("Test completed successfully!"); System.out.print("Shutting down..."); + Display.resetDisplayMode(); Controller.destroy(); gl.destroy(); System.out.println("shutdown complete"); Index: MouseCreationTest.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/MouseCreationTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/MouseCreationTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- MouseCreationTest.java 28 Mar 2003 23:47:20 -0000 1.8 +++ MouseCreationTest.java 17 Jun 2003 21:19:59 -0000 1.9 @@ -143,6 +143,7 @@ System.out.println("Test completed successfully!"); System.out.print("Shutting down..."); + Display.resetDisplayMode(); Mouse.destroy(); gl.destroy(); System.out.println("shutdown complete"); |
|
From: Brian M. <ma...@us...> - 2003-06-17 21:18:47
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input In directory sc8-pr-cvs1:/tmp/cvs-serv22829 Added Files: KeyboardTest.java Log Message: add simple keyboard test - for completeness sake - needs to be made better --- NEW FILE: KeyboardTest.java --- CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java /* * Copyright (c) 2002 Lightweight Java Game Library Project * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * * Neither the name of 'Lightweight Java Game Library' nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.test.input; import org.lwjgl.DisplayMode; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GLU; import org.lwjgl.vector.Vector2f; /** * $Id: KeyboardTest.java,v 1.1 2003/06/17 21:18:44 matzon Exp $ * <br> * Keyboard test * * @author Brian Matzon <br...@ma...> * @version $Revision: 1.1 $ */ public class KeyboardTest { /** OpenGL instance */ private GL gl; /** GLU instance */ private GLU glu; /** position of quad to draw */ private Vector2f position = new Vector2f(320.0f, 240.0f); /** Display mode selected */ private DisplayMode displayMode; private boolean bufferedKeyboard; private boolean translatedKeyboard; private int bufferSize; /** Creates a new instance of MouseTest */ public KeyboardTest() { } private void initialize() { // create display and opengl setupDisplay(false); try { Keyboard.create(); } catch (Exception e) { e.printStackTrace(); System.exit(-1); } } private void setupDisplay(boolean fullscreen) { try { gl = new GL("KeyboardTest", 50, 50, 640, 480, 16, 0, 0, 0); gl.create(); glu = new GLU(gl); } catch (Exception e) { e.printStackTrace(); System.exit(-1); } initializeOpenGL(); } private void initializeOpenGL() { gl.clearColor(0.0f, 0.0f, 0.0f, 0.0f); glu.ortho2D(0.0, 640, 0, 480); } public void executeTest() { initialize(); createKeyboard(); wiggleKeyboard(); Keyboard.destroy(); gl.destroy(); } private void createKeyboard() { try { Keyboard.create(); } catch (Exception e) { e.printStackTrace(); System.exit(-1); } } private void wiggleKeyboard() { Keyboard.enableBuffer(); Keyboard.enableTranslation(); while (!gl.isCloseRequested()) { gl.tick(); if(gl.isMinimized()) { try { Thread.sleep(100); } catch (InterruptedException inte) { inte.printStackTrace(); } continue; } //check keys, buffered Keyboard.read(); int count = Keyboard.getNumKeyboardEvents(); System.out.println("Read " + count + " events"); while(Keyboard.next()) { System.out.println("Checking key:" + Keyboard.getKeyName(Keyboard.key)); if(Keyboard.key == Keyboard.KEY_ESCAPE) { return; } if (Keyboard.isKeyDown(Keyboard.KEY_RIGHT)) { position.x += 1; } if (Keyboard.key == Keyboard.KEY_RIGHT) { position.x += 1; } if (Keyboard.isKeyDown(Keyboard.KEY_LEFT)) { position.x -= 1; } if (Keyboard.isKeyDown(Keyboard.KEY_UP)) { position.y += 1; } if (Keyboard.isKeyDown(Keyboard.KEY_DOWN)) { position.y -= 1; } } if (count > 0) { System.out.println(); } if(position.x<0) { position.x = 0; } else if (position.x>640-60) { position.x = 640-60; } if(position.y < 0) { position.y = 0; } else if (position.y>480-30) { position.y = 480-30; } render(); gl.paint(); try { Thread.sleep(0); } catch (Exception e) { } } } private void render() { gl.clear(GL.COLOR_BUFFER_BIT); gl.begin(GL.POLYGON); { float color = 1.0f; int buttonDown = 0; gl.color3f(color, color, color); gl.vertex2f(position.x + 0.0f, position.y + 0.0f); gl.vertex2f(position.x + 0.0f, position.y + 30.0f); gl.vertex2f(position.x + 40.0f, position.y + 30.0f); gl.vertex2f(position.x + 60.0f, position.y + 15.f); gl.vertex2f(position.x + 40.0f, position.y + 0.0f); } gl.end(); } /** * @param args the command line arguments */ public static void main(String[] args) { KeyboardTest kt = new KeyboardTest(); kt.executeTest(); } } |