Menu
▾
▴
java-game-lib-cvs — Commits to the repository will be send to this list.
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
|
2
|
3
|
4
(21) |
5
(8) |
6
|
7
(1) |
|
8
(24) |
9
|
10
(2) |
11
(1) |
12
(2) |
13
|
14
|
|
15
(25) |
16
(1) |
17
(8) |
18
(7) |
19
(2) |
20
|
21
|
|
22
|
23
(7) |
24
(6) |
25
(3) |
26
(8) |
27
(2) |
28
(1) |
|
29
(3) |
|
|
|
|
|
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3417/src/native/common Modified Files: Makefile.am checkGLerror.h extgl.cpp extgl.h Removed Files: org_lwjgl_opengl_GLU.cpp org_lwjgl_opengl_GLU.h Log Message: Removed native GLU Index: Makefile.am =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Makefile.am 20 Jan 2004 11:19:13 -0000 1.16 +++ Makefile.am 5 Feb 2004 17:14:50 -0000 1.17 @@ -40,7 +40,5 @@ org_lwjgl_opengl_GL12.h \ org_lwjgl_opengl_GL13.cpp \ org_lwjgl_opengl_GL13.h \ - org_lwjgl_opengl_GL14.cpp \ - org_lwjgl_opengl_GLU.cpp \ - org_lwjgl_opengl_GLU.h + org_lwjgl_opengl_GL14.cpp Index: checkGLerror.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/checkGLerror.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- checkGLerror.h 20 Dec 2003 22:03:24 -0000 1.10 +++ checkGLerror.h 5 Feb 2004 17:14:50 -0000 1.11 @@ -20,7 +20,9 @@ int err = glGetError(); \ if (err != GL_NO_ERROR) { \ jclass cls = env->FindClass("org/lwjgl/opengl/OpenGLException"); \ - env->ThrowNew(cls, (const char *)gluErrorString(err)); \ + jmethodID ctor = env->GetMethodID(cls, "<init>", "(I)V"); \ + jthrowable exception = (jthrowable)env->NewObject(cls, ctor, err); \ + env->Throw(exception); \ env->DeleteLocalRef(cls); \ } \ } \ Index: extgl.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- extgl.cpp 30 Jan 2004 22:13:55 -0000 1.15 +++ extgl.cpp 5 Feb 2004 17:14:50 -0000 1.16 @@ -128,66 +128,6 @@ aglSurfaceTexturePROC aglSurfaceTexture = NULL; #endif -gluBeginCurvePROC gluBeginCurve = NULL; -gluBeginPolygonPROC gluBeginPolygon = NULL; -gluBeginSurfacePROC gluBeginSurface = NULL; -gluBeginTrimPROC gluBeginTrim = NULL; -gluBuild1DMipmapLevelsPROC gluBuild1DMipmapLevels = NULL; -gluBuild1DMipmapsPROC gluBuild1DMipmaps = NULL; -gluBuild2DMipmapLevelsPROC gluBuild2DMipmapLevels = NULL; -gluBuild2DMipmapsPROC gluBuild2DMipmaps = NULL; -gluBuild3DMipmapLevelsPROC gluBuild3DMipmapLevels = NULL; -gluBuild3DMipmapsPROC gluBuild3DMipmaps = NULL; -gluCheckExtensionPROC gluCheckExtension = NULL; -gluCylinderPROC gluCylinder = NULL; -gluDeleteNurbsRendererPROC gluDeleteNurbsRenderer = NULL; -gluDeleteQuadricPROC gluDeleteQuadric = NULL; -gluDeleteTessPROC gluDeleteTess = NULL; -gluDiskPROC gluDisk = NULL; -gluEndCurvePROC gluEndCurve = NULL; -gluEndPolygonPROC gluEndPolygon = NULL; -gluEndSurfacePROC gluEndSurface = NULL; -gluEndTrimPROC gluEndTrim = NULL; -gluErrorStringPROC gluErrorString = NULL; -gluGetNurbsPropertyPROC gluGetNurbsProperty = NULL; -gluGetStringPROC gluGetString = NULL; -gluGetTessPropertyPROC gluGetTessProperty = NULL; -gluLoadSamplingMatricesPROC gluLoadSamplingMatrices = NULL; -gluLookAtPROC gluLookAt = NULL; -gluNewNurbsRendererPROC gluNewNurbsRenderer = NULL; -gluNewQuadricPROC gluNewQuadric = NULL; -gluNewTessPROC gluNewTess = NULL; -gluNextContourPROC gluNextContour = NULL; -gluNurbsCallbackPROC gluNurbsCallback = NULL; -gluNurbsCallbackDataPROC gluNurbsCallbackData = NULL; -gluNurbsCallbackDataEXTPROC gluNurbsCallbackDataEXT = NULL; -gluNurbsCurvePROC gluNurbsCurve = NULL; -gluNurbsPropertyPROC gluNurbsProperty = NULL; -gluNurbsSurfacePROC gluNurbsSurface = NULL; -gluOrtho2DPROC gluOrtho2D = NULL; -gluPartialDiskPROC gluPartialDisk = NULL; -gluPerspectivePROC gluPerspective = NULL; -gluPickMatrixPROC gluPickMatrix = NULL; -gluProjectPROC gluProject = NULL; -gluPwlCurvePROC gluPwlCurve = NULL; -gluQuadricCallbackPROC gluQuadricCallback = NULL; -gluQuadricDrawStylePROC gluQuadricDrawStyle = NULL; -gluQuadricNormalsPROC gluQuadricNormals = NULL; -gluQuadricOrientationPROC gluQuadricOrientation = NULL; -gluQuadricTexturePROC gluQuadricTexture = NULL; -gluScaleImagePROC gluScaleImage = NULL; -gluSpherePROC gluSphere = NULL; -gluTessBeginContourPROC gluTessBeginContour = NULL; -gluTessBeginPolygonPROC gluTessBeginPolygon = NULL; -gluTessCallbackPROC gluTessCallback = NULL; -gluTessEndContourPROC gluTessEndContour = NULL; -gluTessEndPolygonPROC gluTessEndPolygon = NULL; -gluTessNormalPROC gluTessNormal = NULL; -gluTessPropertyPROC gluTessProperty = NULL; -gluTessVertexPROC gluTessVertex = NULL; -gluUnProjectPROC gluUnProject = NULL; -gluUnProject4PROC gluUnProject4 = NULL; - /* function variables */ /*glAccumPROC glAccum = NULL; @@ -643,12 +583,10 @@ #ifdef _WIN32 HMODULE lib_gl_handle = NULL; -HMODULE lib_glu_handle = NULL; #endif #ifdef _X11 void * lib_gl_handle = NULL; -void * lib_glu_handle = NULL; #endif #ifdef _AGL @@ -759,11 +697,8 @@ t = GetProcAddress(lib_gl_handle, name); if (t == NULL) { - t = GetProcAddress(lib_glu_handle, name); - if (t == NULL) { - printfDebug("Could not locate symbol %s\n", name); - extgl_error = true; - } + printfDebug("Could not locate symbol %s\n", name); + extgl_error = true; } } return t; @@ -776,11 +711,8 @@ t = dlsym(lib_gl_handle, name); if (t == NULL) { - t = dlsym(lib_glu_handle, name); - if (t == NULL) { - printfDebug("Could not locate symbol %s\n", name); - extgl_error = true; - } + printfDebug("Could not locate symbol %s\n", name); + extgl_error = true; } } return t; @@ -1050,12 +982,6 @@ #endif /** returns true if the extention is available */ -static bool GLUQueryExtension(JNIEnv *env, jobject ext_set, const char *name) -{ - return QueryExtension(env, ext_set, gluGetString(GLU_EXTENSIONS), name); -} - -/** returns true if the extention is available */ static bool GLQueryExtension(JNIEnv *env, jobject ext_set, const char *name) { return QueryExtension(env, ext_set, glGetString(GL_EXTENSIONS), name); @@ -1093,83 +1019,6 @@ } */ -static void extgl_InitGLU12(void) -{ - gluBeginCurve = (gluBeginCurvePROC) extgl_GetProcAddress("gluBeginCurve"); - gluBeginPolygon = (gluBeginPolygonPROC) extgl_GetProcAddress("gluBeginPolygon"); - gluBeginSurface = (gluBeginSurfacePROC) extgl_GetProcAddress("gluBeginSurface"); - gluBeginTrim = (gluBeginTrimPROC) extgl_GetProcAddress("gluBeginTrim"); - gluBuild1DMipmaps = (gluBuild1DMipmapsPROC) extgl_GetProcAddress("gluBuild1DMipmaps"); - gluBuild2DMipmaps = (gluBuild2DMipmapsPROC) extgl_GetProcAddress("gluBuild2DMipmaps"); - gluCylinder = (gluCylinderPROC) extgl_GetProcAddress("gluCylinder"); - gluDeleteNurbsRenderer = (gluDeleteNurbsRendererPROC) extgl_GetProcAddress("gluDeleteNurbsRenderer"); - gluDeleteQuadric = (gluDeleteQuadricPROC) extgl_GetProcAddress("gluDeleteQuadric"); - gluDeleteTess = (gluDeleteTessPROC) extgl_GetProcAddress("gluDeleteTess"); - gluDisk = (gluDiskPROC) extgl_GetProcAddress("gluDisk"); - gluEndCurve = (gluEndCurvePROC) extgl_GetProcAddress("gluEndCurve"); - gluEndPolygon = (gluEndPolygonPROC) extgl_GetProcAddress("gluEndPolygon"); - gluEndSurface = (gluEndSurfacePROC) extgl_GetProcAddress("gluEndSurface"); - gluEndTrim = (gluEndTrimPROC) extgl_GetProcAddress("gluEndTrim"); - gluErrorString = (gluErrorStringPROC) extgl_GetProcAddress("gluErrorString"); - gluGetNurbsProperty = (gluGetNurbsPropertyPROC) extgl_GetProcAddress("gluGetNurbsProperty"); - gluGetString = (gluGetStringPROC) extgl_GetProcAddress("gluGetString"); - gluGetTessProperty = (gluGetTessPropertyPROC) extgl_GetProcAddress("gluGetTessProperty"); - gluLoadSamplingMatrices = (gluLoadSamplingMatricesPROC) extgl_GetProcAddress("gluLoadSamplingMatrices"); - gluLookAt = (gluLookAtPROC) extgl_GetProcAddress("gluLookAt"); - gluNewNurbsRenderer = (gluNewNurbsRendererPROC) extgl_GetProcAddress("gluNewNurbsRenderer"); - gluNewQuadric = (gluNewQuadricPROC) extgl_GetProcAddress("gluNewQuadric"); - gluNewTess = (gluNewTessPROC) extgl_GetProcAddress("gluNewTess"); - gluNextContour = (gluNextContourPROC) extgl_GetProcAddress("gluNextContour"); - gluNurbsCallback = (gluNurbsCallbackPROC) extgl_GetProcAddress("gluNurbsCallback"); - gluNurbsCurve = (gluNurbsCurvePROC) extgl_GetProcAddress("gluNurbsCurve"); - gluNurbsProperty = (gluNurbsPropertyPROC) extgl_GetProcAddress("gluNurbsProperty"); - gluNurbsSurface = (gluNurbsSurfacePROC) extgl_GetProcAddress("gluNurbsSurface"); - gluOrtho2D = (gluOrtho2DPROC) extgl_GetProcAddress("gluOrtho2D"); - gluPartialDisk = (gluPartialDiskPROC) extgl_GetProcAddress("gluPartialDisk"); - gluPerspective = (gluPerspectivePROC) extgl_GetProcAddress("gluPerspective"); - gluPickMatrix = (gluPickMatrixPROC) extgl_GetProcAddress("gluPickMatrix"); - gluProject = (gluProjectPROC) extgl_GetProcAddress("gluProject"); - gluPwlCurve = (gluPwlCurvePROC) extgl_GetProcAddress("gluPwlCurve"); - gluQuadricCallback = (gluQuadricCallbackPROC) extgl_GetProcAddress("gluQuadricCallback"); - gluQuadricDrawStyle = (gluQuadricDrawStylePROC) extgl_GetProcAddress("gluQuadricDrawStyle"); - gluQuadricNormals = (gluQuadricNormalsPROC) extgl_GetProcAddress("gluQuadricNormals"); - gluQuadricOrientation = (gluQuadricOrientationPROC) extgl_GetProcAddress("gluQuadricOrientation"); - gluQuadricTexture = (gluQuadricTexturePROC) extgl_GetProcAddress("gluQuadricTexture"); - gluScaleImage = (gluScaleImagePROC) extgl_GetProcAddress("gluScaleImage"); - gluSphere = (gluSpherePROC) extgl_GetProcAddress("gluSphere"); - gluTessBeginContour = (gluTessBeginContourPROC) extgl_GetProcAddress("gluTessBeginContour"); - gluTessBeginPolygon = (gluTessBeginPolygonPROC) extgl_GetProcAddress("gluTessBeginPolygon"); - gluTessCallback = (gluTessCallbackPROC) extgl_GetProcAddress("gluTessCallback"); - gluTessEndContour = (gluTessEndContourPROC) extgl_GetProcAddress("gluTessEndContour"); - gluTessEndPolygon = (gluTessEndPolygonPROC) extgl_GetProcAddress("gluTessEndPolygon"); - gluTessNormal = (gluTessNormalPROC) extgl_GetProcAddress("gluTessNormal"); - gluTessProperty = (gluTessPropertyPROC) extgl_GetProcAddress("gluTessProperty"); - gluTessVertex = (gluTessVertexPROC) extgl_GetProcAddress("gluTessVertex"); - gluUnProject = (gluUnProjectPROC) extgl_GetProcAddress("gluUnProject"); -} - -static void extgl_InitGLU13(JNIEnv *env, jobject ext_set) -{ - if (extgl_Extensions.GLU13 != 1) - return; - gluUnProject4 = (gluUnProject4PROC) extgl_GetProcAddress("gluUnProject4"); - gluBuild1DMipmapLevels = (gluBuild1DMipmapLevelsPROC) extgl_GetProcAddress("gluBuild1DMipmapLevels"); - gluBuild2DMipmapLevels = (gluBuild2DMipmapLevelsPROC) extgl_GetProcAddress("gluBuild2DMipmapLevels"); - gluBuild3DMipmapLevels = (gluBuild3DMipmapLevelsPROC) extgl_GetProcAddress("gluBuild3DMipmapLevels"); - gluBuild3DMipmaps = (gluBuild3DMipmapsPROC) extgl_GetProcAddress("gluBuild3DMipmaps"); - gluNurbsCallbackData = (gluNurbsCallbackDataPROC) extgl_GetProcAddress("gluNurbsCallbackData"); - gluCheckExtension = (gluCheckExtensionPROC) extgl_GetProcAddress("gluCheckExtension"); - EXTGL_SANITY_CHECK(env, ext_set, GLU13) -} - -/*static void extgl_InitEXTNurbsTesselator(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GLU_EXT_nurbs_tessellator) - return; - gluNurbsCallbackDataEXT = (gluNurbsCallbackDataEXTPROC) extgl_GetProcAddress("gluNurbsCallbackDataEXT"); - EXTGL_SANITY_CHECK(env, ext_set, GLU_EXT_nurbs_tessellator) -} -*/ #ifdef _X11 static void extgl_InitGLX13(JNIEnv *env, jobject ext_set) { @@ -1258,30 +1107,6 @@ #endif -static void extgl_InitGLUSupportedExtensions(JNIEnv *env, jobject ext_set) -{ - const char *s = (const char *)gluGetString(GLU_VERSION); - if (!s) - return; - s = strstr(s, "1."); - extgl_Extensions.GLU12 = 0; - extgl_Extensions.GLU13 = 0; - if (s != NULL) - { - if( s[2] >= '3' ) - { - extgl_Extensions.GLU12 = 1; - extgl_Extensions.GLU13 = 1; - } - if( s[2] == '2' ) - { - extgl_Extensions.GLU12 = 1; - } - } - extgl_Extensions.GLU_EXT_nurbs_tessellator = GLUQueryExtension(env, ext_set, "GLU_EXT_nurbs_tessellator"); - extgl_Extensions.GLU_EXT_object_space_tess = GLUQueryExtension(env, ext_set, "GLU_EXT_object_space_tess"); -} - static void extgl_InitSupportedExtensions(JNIEnv *env, jobject ext_set) { char *s = (char*) glGetString(GL_VERSION); @@ -1471,11 +1296,9 @@ { extgl_error = false; extgl_InitOpenGL1_1(); - extgl_InitGLU12(); if (extgl_error) return false; - extgl_InitGLUSupportedExtensions(env, ext_set); extgl_InitSupportedExtensions(env, ext_set); //extgl_InitEXTNurbsTesselator(env, ext_set); @@ -1541,8 +1364,6 @@ extgl_InitOpenGL1_3(env, ext_set); extgl_InitOpenGL1_4(env, ext_set); - extgl_InitGLU13(env, ext_set); - #ifdef _WIN32 /* load WGL extensions */ extgl_InitializeWGL(env, ext_set); @@ -1572,12 +1393,6 @@ printfDebug("Error loading libGL.so.1: %s\n", dlerror()); return false; } - lib_glu_handle = dlopen("libGLU.so.1", RTLD_LAZY | RTLD_GLOBAL); - if (lib_glu_handle == NULL) { - printfDebug("Error loading libGLU.so.1: %s\n", dlerror()); - dlclose(lib_gl_handle); - return false; - } return true; } @@ -1591,11 +1406,6 @@ lib_gl_handle = LoadLibrary("opengl32.dll"); if (lib_gl_handle == NULL) return false; - lib_glu_handle = LoadLibrary("glu32.dll"); - if (lib_glu_handle == NULL) { - FreeLibrary(lib_gl_handle); - return false; - } return true; } #endif /* WIN32 */ @@ -1603,12 +1413,10 @@ void extgl_Close(void) { #ifdef _X11 - dlclose(lib_glu_handle); dlclose(lib_gl_handle); #endif #ifdef _WIN32 FreeLibrary(lib_gl_handle); - FreeLibrary(lib_glu_handle); #endif #ifdef _AGL aglUnloadFramework(opengl_bundle_ref); Index: extgl.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- extgl.h 30 Jan 2004 22:13:55 -0000 1.22 +++ extgl.h 5 Feb 2004 17:14:50 -0000 1.23 @@ -191,8 +191,6 @@ /* for mingw compatibility */ typedef void (*_GLfuncptr)(); -typedef void (*_GLUfuncptr)(); - #define GLAPI extern #define GLAPIENTRY @@ -817,349 +815,6 @@ #endif /* _AGL */ -/*************************************************************/ -/* GLU functions */ - - -/* Boolean */ -#define GLU_FALSE 0 -#define GLU_TRUE 1 - -/* Version */ -#define GLU_VERSION_1_1 1 -#define GLU_VERSION_1_2 1 -#define GLU_VERSION_1_3 1 - -/* StringName */ -#define GLU_VERSION 100800 -#define GLU_EXTENSIONS 100801 - -/* ErrorCode */ -#define GLU_INVALID_ENUM 100900 -#define GLU_INVALID_VALUE 100901 -#define GLU_OUT_OF_MEMORY 100902 -#define GLU_INVALID_OPERATION 100904 - -/* NurbsDisplay */ -/* GLU_FILL */ -#define GLU_OUTLINE_POLYGON 100240 -#define GLU_OUTLINE_PATCH 100241 - -/* NurbsCallback */ -#define GLU_NURBS_ERROR 100103 -#define GLU_ERROR 100103 -#define GLU_NURBS_BEGIN 100164 -#define GLU_NURBS_BEGIN_EXT 100164 -#define GLU_NURBS_VERTEX 100165 -#define GLU_NURBS_VERTEX_EXT 100165 -#define GLU_NURBS_NORMAL 100166 -#define GLU_NURBS_NORMAL_EXT 100166 -#define GLU_NURBS_COLOR 100167 -#define GLU_NURBS_COLOR_EXT 100167 -#define GLU_NURBS_TEXTURE_COORD 100168 -#define GLU_NURBS_TEX_COORD_EXT 100168 -#define GLU_NURBS_END 100169 -#define GLU_NURBS_END_EXT 100169 -#define GLU_NURBS_BEGIN_DATA 100170 -#define GLU_NURBS_BEGIN_DATA_EXT 100170 -#define GLU_NURBS_VERTEX_DATA 100171 -#define GLU_NURBS_VERTEX_DATA_EXT 100171 -#define GLU_NURBS_NORMAL_DATA 100172 -#define GLU_NURBS_NORMAL_DATA_EXT 100172 -#define GLU_NURBS_COLOR_DATA 100173 -#define GLU_NURBS_COLOR_DATA_EXT 100173 -#define GLU_NURBS_TEXTURE_COORD_DATA 100174 -#define GLU_NURBS_TEX_COORD_DATA_EXT 100174 -#define GLU_NURBS_END_DATA 100175 -#define GLU_NURBS_END_DATA_EXT 100175 - -/* NurbsError */ -#define GLU_NURBS_ERROR1 100251 -#define GLU_NURBS_ERROR2 100252 -#define GLU_NURBS_ERROR3 100253 -#define GLU_NURBS_ERROR4 100254 -#define GLU_NURBS_ERROR5 100255 -#define GLU_NURBS_ERROR6 100256 -#define GLU_NURBS_ERROR7 100257 -#define GLU_NURBS_ERROR8 100258 -#define GLU_NURBS_ERROR9 100259 -#define GLU_NURBS_ERROR10 100260 -#define GLU_NURBS_ERROR11 100261 -#define GLU_NURBS_ERROR12 100262 -#define GLU_NURBS_ERROR13 100263 -#define GLU_NURBS_ERROR14 100264 -#define GLU_NURBS_ERROR15 100265 -#define GLU_NURBS_ERROR16 100266 -#define GLU_NURBS_ERROR17 100267 -#define GLU_NURBS_ERROR18 100268 -#define GLU_NURBS_ERROR19 100269 -#define GLU_NURBS_ERROR20 100270 -#define GLU_NURBS_ERROR21 100271 -#define GLU_NURBS_ERROR22 100272 -#define GLU_NURBS_ERROR23 100273 -#define GLU_NURBS_ERROR24 100274 -#define GLU_NURBS_ERROR25 100275 -#define GLU_NURBS_ERROR26 100276 -#define GLU_NURBS_ERROR27 100277 -#define GLU_NURBS_ERROR28 100278 -#define GLU_NURBS_ERROR29 100279 -#define GLU_NURBS_ERROR30 100280 -#define GLU_NURBS_ERROR31 100281 -#define GLU_NURBS_ERROR32 100282 -#define GLU_NURBS_ERROR33 100283 -#define GLU_NURBS_ERROR34 100284 -#define GLU_NURBS_ERROR35 100285 -#define GLU_NURBS_ERROR36 100286 -#define GLU_NURBS_ERROR37 100287 - -/* NurbsProperty */ -#define GLU_AUTO_LOAD_MATRIX 100200 -#define GLU_CULLING 100201 -#define GLU_SAMPLING_TOLERANCE 100203 -#define GLU_DISPLAY_MODE 100204 -#define GLU_PARAMETRIC_TOLERANCE 100202 -#define GLU_SAMPLING_METHOD 100205 -#define GLU_U_STEP 100206 -#define GLU_V_STEP 100207 -#define GLU_NURBS_MODE 100160 -#define GLU_NURBS_MODE_EXT 100160 -#define GLU_NURBS_TESSELLATOR 100161 -#define GLU_NURBS_TESSELLATOR_EXT 100161 -#define GLU_NURBS_RENDERER 100162 -#define GLU_NURBS_RENDERER_EXT 100162 - -/* NurbsSampling */ -#define GLU_OBJECT_PARAMETRIC_ERROR 100208 -#define GLU_OBJECT_PARAMETRIC_ERROR_EXT 100208 -#define GLU_OBJECT_PATH_LENGTH 100209 -#define GLU_OBJECT_PATH_LENGTH_EXT 100209 -#define GLU_PATH_LENGTH 100215 -#define GLU_PARAMETRIC_ERROR 100216 -#define GLU_DOMAIN_DISTANCE 100217 - -/* NurbsTrim */ -#define GLU_MAP1_TRIM_2 100210 -#define GLU_MAP1_TRIM_3 100211 - -/* QuadricDrawStyle */ -#define GLU_POINT 100010 -#define GLU_LINE 100011 -#define GLU_FILL 100012 -#define GLU_SILHOUETTE 100013 - -/* QuadricCallback */ -/* GLU_ERROR */ - -/* QuadricNormal */ -#define GLU_SMOOTH 100000 -#define GLU_FLAT 100001 -#define GLU_NONE 100002 - -/* QuadricOrientation */ -#define GLU_OUTSIDE 100020 -#define GLU_INSIDE 100021 - -/* TessCallback */ -#define GLU_TESS_BEGIN 100100 -#define GLU_BEGIN 100100 -#define GLU_TESS_VERTEX 100101 -#define GLU_VERTEX 100101 -#define GLU_TESS_END 100102 -#define GLU_END 100102 -#define GLU_TESS_ERROR 100103 -#define GLU_TESS_EDGE_FLAG 100104 -#define GLU_EDGE_FLAG 100104 -#define GLU_TESS_COMBINE 100105 -#define GLU_TESS_BEGIN_DATA 100106 -#define GLU_TESS_VERTEX_DATA 100107 -#define GLU_TESS_END_DATA 100108 -#define GLU_TESS_ERROR_DATA 100109 -#define GLU_TESS_EDGE_FLAG_DATA 100110 -#define GLU_TESS_COMBINE_DATA 100111 - -/* TessContour */ -#define GLU_CW 100120 -#define GLU_CCW 100121 -#define GLU_INTERIOR 100122 -#define GLU_EXTERIOR 100123 -#define GLU_UNKNOWN 100124 - -/* TessProperty */ -#define GLU_TESS_WINDING_RULE 100140 -#define GLU_TESS_BOUNDARY_ONLY 100141 -#define GLU_TESS_TOLERANCE 100142 - -/* TessError */ -#define GLU_TESS_ERROR1 100151 -#define GLU_TESS_ERROR2 100152 -#define GLU_TESS_ERROR3 100153 -#define GLU_TESS_ERROR4 100154 -#define GLU_TESS_ERROR5 100155 -#define GLU_TESS_ERROR6 100156 -#define GLU_TESS_ERROR7 100157 -#define GLU_TESS_ERROR8 100158 -#define GLU_TESS_MISSING_BEGIN_POLYGON 100151 -#define GLU_TESS_MISSING_BEGIN_CONTOUR 100152 -#define GLU_TESS_MISSING_END_POLYGON 100153 -#define GLU_TESS_MISSING_END_CONTOUR 100154 -#define GLU_TESS_COORD_TOO_LARGE 100155 -#define GLU_TESS_NEED_COMBINE_CALLBACK 100156 - -/* TessWinding */ -#define GLU_TESS_WINDING_ODD 100130 -#define GLU_TESS_WINDING_NONZERO 100131 -#define GLU_TESS_WINDING_POSITIVE 100132 -#define GLU_TESS_WINDING_NEGATIVE 100133 -#define GLU_TESS_WINDING_ABS_GEQ_TWO 100134 - -/*************************************************************/ -#ifdef __cplusplus - -class GLUnurbs; -class GLUquadric; -class GLUtesselator; - -typedef class GLUnurbs GLUnurbsObj; -typedef class GLUquadric GLUquadricObj; -typedef class GLUtesselator GLUtesselatorObj; -typedef class GLUtesselator GLUtriangulatorObj; - -#else - -typedef struct GLUnurbs GLUnurbs; -typedef struct GLUquadric GLUquadric; -typedef struct GLUtesselator GLUtesselator; - -typedef struct GLUnurbs GLUnurbsObj; -typedef struct GLUquadric GLUquadricObj; -typedef struct GLUtesselator GLUtesselatorObj; -typedef struct GLUtesselator GLUtriangulatorObj; - -#endif - -#define GLU_TESS_MAX_COORD 1.0e150 - -typedef void (APIENTRY * gluBeginCurvePROC) (GLUnurbs* nurb); -typedef void (APIENTRY * gluBeginPolygonPROC) (GLUtesselator* tess); -typedef void (APIENTRY * gluBeginSurfacePROC) (GLUnurbs* nurb); -typedef void (APIENTRY * gluBeginTrimPROC) (GLUnurbs* nurb); -typedef GLint (APIENTRY * gluBuild1DMipmapLevelsPROC) (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data); -typedef GLint (APIENTRY * gluBuild1DMipmapsPROC) (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *data); -typedef GLint (APIENTRY * gluBuild2DMipmapLevelsPROC) (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data); -typedef GLint (APIENTRY * gluBuild2DMipmapsPROC) (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data); -typedef GLint (APIENTRY * gluBuild3DMipmapLevelsPROC) (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data); -typedef GLint (APIENTRY * gluBuild3DMipmapsPROC) (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data); -typedef GLboolean (APIENTRY * gluCheckExtensionPROC) (const GLubyte *extName, const GLubyte *extString); -typedef void (APIENTRY * gluCylinderPROC) (GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks); -typedef void (APIENTRY * gluDeleteNurbsRendererPROC) (GLUnurbs* nurb); -typedef void (APIENTRY * gluDeleteQuadricPROC) (GLUquadric* quad); -typedef void (APIENTRY * gluDeleteTessPROC) (GLUtesselator* tess); -typedef void (APIENTRY * gluDiskPROC) (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops); -typedef void (APIENTRY * gluEndCurvePROC) (GLUnurbs* nurb); -typedef void (APIENTRY * gluEndPolygonPROC) (GLUtesselator* tess); -typedef void (APIENTRY * gluEndSurfacePROC) (GLUnurbs* nurb); -typedef void (APIENTRY * gluEndTrimPROC) (GLUnurbs* nurb); -typedef const GLubyte * (APIENTRY * gluErrorStringPROC) (GLenum error); -typedef void (APIENTRY * gluGetNurbsPropertyPROC) (GLUnurbs* nurb, GLenum property, GLfloat* data); -typedef const GLubyte * (APIENTRY * gluGetStringPROC) (GLenum name); -typedef void (APIENTRY * gluGetTessPropertyPROC) (GLUtesselator* tess, GLenum which, GLdouble* data); -typedef void (APIENTRY * gluLoadSamplingMatricesPROC) (GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view); -typedef void (APIENTRY * gluLookAtPROC) (GLdouble eyeX, GLdouble eyeY, GLdouble eyeZ, GLdouble centerX, GLdouble centerY, GLdouble centerZ, GLdouble upX, GLdouble upY, GLdouble upZ); -typedef GLUnurbs * (APIENTRY * gluNewNurbsRendererPROC) (void); -typedef GLUquadric * (APIENTRY * gluNewQuadricPROC) (void); -typedef GLUtesselator * (APIENTRY * gluNewTessPROC) (void); -typedef void (APIENTRY * gluNextContourPROC) (GLUtesselator* tess, GLenum type); -typedef void (APIENTRY * gluNurbsCallbackPROC) (GLUnurbs* nurb, GLenum which, _GLUfuncptr CallBackFunc); -typedef void (APIENTRY * gluNurbsCallbackDataPROC) (GLUnurbs* nurb, GLvoid* userData); -typedef void (APIENTRY * gluNurbsCallbackDataEXTPROC) (GLUnurbs* nurb, GLvoid* userData); -typedef void (APIENTRY * gluNurbsCurvePROC) (GLUnurbs* nurb, GLint knotCount, GLfloat *knots, GLint stride, GLfloat *control, GLint order, GLenum type); -typedef void (APIENTRY * gluNurbsPropertyPROC) (GLUnurbs* nurb, GLenum property, GLfloat value); -typedef void (APIENTRY * gluNurbsSurfacePROC) (GLUnurbs* nurb, GLint sKnotCount, GLfloat* sKnots, GLint tKnotCount, GLfloat* tKnots, GLint sStride, GLint tStride, GLfloat* control, GLint sOrder, GLint tOrder, GLenum type); -typedef void (APIENTRY * gluOrtho2DPROC) (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top); -typedef void (APIENTRY * gluPartialDiskPROC) (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep); -typedef void (APIENTRY * gluPerspectivePROC) (GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar); -typedef void (APIENTRY * gluPickMatrixPROC) (GLdouble x, GLdouble y, GLdouble delX, GLdouble delY, GLint *viewport); -typedef GLint (APIENTRY * gluProjectPROC) (GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* winX, GLdouble* winY, GLdouble* winZ); -typedef void (APIENTRY * gluPwlCurvePROC) (GLUnurbs* nurb, GLint count, GLfloat* data, GLint stride, GLenum type); -typedef void (APIENTRY * gluQuadricCallbackPROC) (GLUquadric* quad, GLenum which, _GLUfuncptr CallBackFunc); -typedef void (APIENTRY * gluQuadricDrawStylePROC) (GLUquadric* quad, GLenum draw); -typedef void (APIENTRY * gluQuadricNormalsPROC) (GLUquadric* quad, GLenum normal); -typedef void (APIENTRY * gluQuadricOrientationPROC) (GLUquadric* quad, GLenum orientation); -typedef void (APIENTRY * gluQuadricTexturePROC) (GLUquadric* quad, GLboolean texture); -typedef GLint (APIENTRY * gluScaleImagePROC) (GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid* dataOut); -typedef void (APIENTRY * gluSpherePROC) (GLUquadric* quad, GLdouble radius, GLint slices, GLint stacks); -typedef void (APIENTRY * gluTessBeginContourPROC) (GLUtesselator* tess); -typedef void (APIENTRY * gluTessBeginPolygonPROC) (GLUtesselator* tess, GLvoid* data); -typedef void (APIENTRY * gluTessCallbackPROC) (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc); -typedef void (APIENTRY * gluTessEndContourPROC) (GLUtesselator* tess); -typedef void (APIENTRY * gluTessEndPolygonPROC) (GLUtesselator* tess); -typedef void (APIENTRY * gluTessNormalPROC) (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ); -typedef void (APIENTRY * gluTessPropertyPROC) (GLUtesselator* tess, GLenum which, GLdouble data); -typedef void (APIENTRY * gluTessVertexPROC) (GLUtesselator* tess, GLdouble *location, GLvoid* data); -typedef GLint (APIENTRY * gluUnProjectPROC) (GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* objX, GLdouble* objY, GLdouble* objZ); -typedef GLint (APIENTRY * gluUnProject4PROC) (GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble near, GLdouble far, GLdouble* objX, GLdouble* objY, GLdouble* objZ, GLdouble* objW); - -extern gluBeginCurvePROC gluBeginCurve; -extern gluBeginPolygonPROC gluBeginPolygon; -extern gluBeginSurfacePROC gluBeginSurface; -extern gluBeginTrimPROC gluBeginTrim; -extern gluBuild1DMipmapLevelsPROC gluBuild1DMipmapLevels; -extern gluBuild1DMipmapsPROC gluBuild1DMipmaps; -extern gluBuild2DMipmapLevelsPROC gluBuild2DMipmapLevels; -extern gluBuild2DMipmapsPROC gluBuild2DMipmaps; -extern gluBuild3DMipmapLevelsPROC gluBuild3DMipmapLevels; -extern gluBuild3DMipmapsPROC gluBuild3DMipmaps; -extern gluCheckExtensionPROC gluCheckExtension; -extern gluCylinderPROC gluCylinder; -extern gluDeleteNurbsRendererPROC gluDeleteNurbsRenderer; -extern gluDeleteQuadricPROC gluDeleteQuadric; -extern gluDeleteTessPROC gluDeleteTess; -extern gluDiskPROC gluDisk; -extern gluEndCurvePROC gluEndCurve; -extern gluEndPolygonPROC gluEndPolygon; -extern gluEndSurfacePROC gluEndSurface; -extern gluEndTrimPROC gluEndTrim; -extern gluErrorStringPROC gluErrorString; -extern gluGetNurbsPropertyPROC gluGetNurbsProperty; -extern gluGetStringPROC gluGetString; -extern gluGetTessPropertyPROC gluGetTessProperty; -extern gluLoadSamplingMatricesPROC gluLoadSamplingMatrices; -extern gluLookAtPROC gluLookAt; -extern gluNewNurbsRendererPROC gluNewNurbsRenderer; -extern gluNewQuadricPROC gluNewQuadric; -extern gluNewTessPROC gluNewTess; -extern gluNextContourPROC gluNextContour; -extern gluNurbsCallbackPROC gluNurbsCallback; -extern gluNurbsCallbackDataPROC gluNurbsCallbackData; -extern gluNurbsCallbackDataEXTPROC gluNurbsCallbackDataEXT; -extern gluNurbsCurvePROC gluNurbsCurve; -extern gluNurbsPropertyPROC gluNurbsProperty; -extern gluNurbsSurfacePROC gluNurbsSurface; -extern gluOrtho2DPROC gluOrtho2D; -extern gluPartialDiskPROC gluPartialDisk; -extern gluPerspectivePROC gluPerspective; -extern gluPickMatrixPROC gluPickMatrix; -extern gluProjectPROC gluProject; -extern gluPwlCurvePROC gluPwlCurve; -extern gluQuadricCallbackPROC gluQuadricCallback; -extern gluQuadricDrawStylePROC gluQuadricDrawStyle; -extern gluQuadricNormalsPROC gluQuadricNormals; -extern gluQuadricOrientationPROC gluQuadricOrientation; -extern gluQuadricTexturePROC gluQuadricTexture; -extern gluScaleImagePROC gluScaleImage; -extern gluSpherePROC gluSphere; -extern gluTessBeginContourPROC gluTessBeginContour; -extern gluTessBeginPolygonPROC gluTessBeginPolygon; -extern gluTessCallbackPROC gluTessCallback; -extern gluTessEndContourPROC gluTessEndContour; -extern gluTessEndPolygonPROC gluTessEndPolygon; -extern gluTessNormalPROC gluTessNormal; -extern gluTessPropertyPROC gluTessProperty; -extern gluTessVertexPROC gluTessVertex; -extern gluUnProjectPROC gluUnProject; -extern gluUnProject4PROC gluUnProject4; - - #define GL_VERSION_1_1 1 #define GL_ACCUM 0x0100 #define GL_LOAD 0x0101 @@ -3511,10 +3166,6 @@ bool OpenGL12; bool OpenGL13; bool OpenGL14; - bool GLU12; - bool GLU13; - bool GLU_EXT_nurbs_tessellator; - bool GLU_EXT_object_space_tess; bool GL_ARB_imaging; bool GL_ARB_depth_texture; --- org_lwjgl_opengl_GLU.cpp DELETED --- --- org_lwjgl_opengl_GLU.h DELETED --- |
|
From: <eli...@us...> - 2004-02-05 17:17:24
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3417/src/java/org/lwjgl/opengl Modified Files: OpenGLException.java Removed Files: GLU.java Log Message: Removed native GLU Index: OpenGLException.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/OpenGLException.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- OpenGLException.java 17 Aug 2003 16:38:55 -0000 1.5 +++ OpenGLException.java 5 Feb 2004 17:14:50 -0000 1.6 @@ -46,6 +46,13 @@ /** * Constructor for OpenGLException. */ + public OpenGLException(int gl_error_code) { + super("GL error code: " + gl_error_code); + } + + /** + * Constructor for OpenGLException. + */ public OpenGLException() { super(); } --- GLU.java DELETED --- |
|
From: <eli...@us...> - 2004-02-05 16:56:09
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/glu In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30678/src/java/org/lwjgl/opengl/glu Modified Files: GLU.java Project.java Log Message: Fix some inconsistencies in GLU Index: GLU.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- GLU.java 21 Jan 2004 16:17:15 -0000 1.3 +++ GLU.java 5 Feb 2004 16:53:30 -0000 1.4 @@ -112,9 +112,9 @@ FloatBuffer modelMatrix, FloatBuffer projMatrix, IntBuffer viewport, - FloatBuffer objx, FloatBuffer objy, FloatBuffer objz) + FloatBuffer obj_pos) { - return Project.gluUnProject(winx, winy, winz, modelMatrix, projMatrix, viewport, objx, objy, objz); + return Project.gluUnProject(winx, winy, winz, modelMatrix, projMatrix, viewport, obj_pos); } /** @@ -130,7 +130,7 @@ float y, float width, float height, - int viewport[]) { + IntBuffer viewport) { Project.gluPickMatrix(x, y, width, height, viewport); } Index: Project.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/glu/Project.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Project.java 21 Jan 2004 22:43:54 -0000 1.3 +++ Project.java 5 Feb 2004 16:53:30 -0000 1.4 @@ -302,7 +302,7 @@ FloatBuffer modelMatrix, FloatBuffer projMatrix, IntBuffer viewport, - FloatBuffer objx, FloatBuffer objy, FloatBuffer objz) + FloatBuffer obj_pos) { float[] in = new float[4]; float[] out = new float[4]; @@ -329,9 +329,9 @@ out[0] /= out[3]; out[1] /= out[3]; out[2] /= out[3]; - objx.put(0, out[0]); - objy.put(0, out[1]); - objz.put(0, out[2]); + obj_pos.put(0, out[0]); + obj_pos.put(1, out[1]); + obj_pos.put(2, out[2]); return true; } @@ -348,16 +348,16 @@ float y, float deltax, float deltay, - int[] viewport) { + IntBuffer viewport) { if (deltax <= 0 || deltay <= 0) { return; } /* Translate and scale the picked region to the entire window */ GL11.glTranslatef( - (viewport[2] - 2 * (x - viewport[0])) / deltax, - (viewport[3] - 2 * (y - viewport[1])) / deltay, + (viewport.get(2) - 2 * (x - viewport.get(0))) / deltax, + (viewport.get(3) - 2 * (y - viewport.get(1))) / deltay, 0); - GL11.glScalef(viewport[2] / deltax, viewport[3] / deltay, 1.0f); + GL11.glScalef(viewport.get(2) / deltax, viewport.get(3) / deltay, 1.0f); } } |
|
From: <eli...@us...> - 2004-02-05 16:41:11
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27003/src/java/org/lwjgl/opengl Modified Files: BufferChecks.java Log Message: Don't throw exception on unknown enum before they are all added Index: BufferChecks.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/BufferChecks.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- BufferChecks.java 4 Feb 2004 00:42:29 -0000 1.2 +++ BufferChecks.java 5 Feb 2004 16:38:29 -0000 1.3 @@ -93,7 +93,8 @@ scratchInt.value = enum; Util.IntValue ret = (Util.IntValue) getMap.get(scratchInt); if (ret == null) { - throw new OpenGLException("Unknown enum glGet* "+enum); + // TODO: add missing enums before re-enabling this anal check + //throw new OpenGLException("Unknown enum glGet* "+enum); } else if (buf.remaining() < ret.value) { throw new BufferOverflowException(); } |
|
From: <ma...@us...> - 2004-02-05 16:36:05
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25628 Modified Files: Mouse.java Keyboard.java Controller.java Log Message: assertion on Window.isCreated Index: Mouse.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- Mouse.java 4 Feb 2004 21:06:38 -0000 1.32 +++ Mouse.java 5 Feb 2004 16:33:31 -0000 1.33 @@ -234,6 +234,9 @@ * @throws Exception if the mouse could not be created for any reason */ public static void create() throws Exception { + + assert Window.isCreated() : "Window must be created prior to creating mouse"; + if (!initialized) { initialize(); } Index: Keyboard.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- Keyboard.java 5 Feb 2004 16:22:21 -0000 1.33 +++ Keyboard.java 5 Feb 2004 16:33:31 -0000 1.34 @@ -40,6 +40,7 @@ import java.util.Map; import org.lwjgl.Sys; +import org.lwjgl.opengl.Window; /** * $Id$ @@ -282,6 +283,7 @@ * @throws Exception if the keyboard could not be created for any reason */ public static void create() throws Exception { + assert Window.isCreated() : "Window must be created prior to creating keyboard"; if (!initialized) initialize(); if (created) Index: Controller.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Controller.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Controller.java 4 Feb 2004 20:39:39 -0000 1.10 +++ Controller.java 5 Feb 2004 16:33:31 -0000 1.11 @@ -36,6 +36,7 @@ import java.util.Map; import org.lwjgl.Sys; +import org.lwjgl.opengl.Window; /** * $Id$ @@ -163,6 +164,9 @@ * @throws Exception if the controller could not be created for any reason */ public static void create() throws Exception { + + assert Window.isCreated() : "Window must be created prior to creating controller"; + if (!initialized) { initialize(); } |
|
From: <eli...@us...> - 2004-02-05 16:29:55
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24068/src/java/org/lwjgl/opengl Modified Files: Window.java Log Message: Don't set create before the window is really created in case an exception is thrown Index: Window.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Window.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Window.java 4 Feb 2004 22:06:18 -0000 1.19 +++ Window.java 5 Feb 2004 16:27:22 -0000 1.20 @@ -320,8 +320,8 @@ HashSet extensions = new HashSet(); nCreate(title, x, y, width, height, fullscreen, color, alpha, depth, stencil, extensions); GLCaps.determineAvailableExtensions(extensions); - created = true; context = new Window(); + created = true; } /** |
|
From: <ma...@us...> - 2004-02-05 16:25:55
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23077 Modified Files: KeyboardTest.java Log Message: getCharacter -> getEventCharacter Index: KeyboardTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- KeyboardTest.java 4 Feb 2004 21:46:13 -0000 1.19 +++ KeyboardTest.java 5 Feb 2004 16:23:04 -0000 1.20 @@ -133,7 +133,7 @@ int count = Keyboard.getNumKeyboardEvents(); while (Keyboard.next()) { System.out.println("Checking key:" + Keyboard.getKeyName(Keyboard.getEventKey())); - System.out.println("Key character: " + Keyboard.getCharacter()); + System.out.println("Key character: " + Keyboard.getEventCharacter()); if (Keyboard.getEventKey() == Keyboard.KEY_ESCAPE) { return; |
|
From: <ma...@us...> - 2004-02-05 16:24:55
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22877 Modified Files: Keyboard.java Log Message: getCharacter -> getEventCharacter Index: Keyboard.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- Keyboard.java 4 Feb 2004 20:39:40 -0000 1.32 +++ Keyboard.java 5 Feb 2004 16:22:21 -0000 1.33 @@ -475,7 +475,7 @@ /** * @return The character from the current event */ - public static char getCharacter() { + public static char getEventCharacter() { return eventCharacter; } |
