java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv8821/win32

Modified Files:
	org_lwjgl_opengl_BaseGL.cpp 
Log Message:
Added ReleaseContext to win32

Index: org_lwjgl_opengl_BaseGL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_BaseGL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_BaseGL.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_opengl_BaseGL.cpp	11 Dec 2002 07:16:31 -0000	1.5
+++ org_lwjgl_opengl_BaseGL.cpp	11 Dec 2002 10:14:08 -0000	1.6
@@ -164,6 +164,18 @@
 
 /*
  * Class:     org_lwjgl_opengl_BaseGL
+ * Method:    nFreeContext
+ * Signature: ()V
+*/
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_BaseGL_nReleaseContext
+  (JNIEnv *env, jobject obj)
+{
+	wglMakeCurrent(hdc, NULL);
+}
+
+
+/*
+ * Class:     org_lwjgl_opengl_BaseGL
  * Method:    nMakeCurrent
  * Signature: ()V
  */

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv26193/linux

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
Minor fix to Display.cpp

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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- org_lwjgl_Display.cpp	11 Dec 2002 07:16:31 -0000	1.7
+++ org_lwjgl_Display.cpp	11 Dec 2002 07:26:49 -0000	1.8
@@ -142,7 +142,12 @@
 		return JNI_FALSE;
 	}
 	root_win = RootWindow(disp, screen);
-	extgl_Open();
+	if (extgl_Open() != 0) {
+#ifdef _DEBUG
+		printf("Could not load gl libs\n");
+#endif
+		return JNI_FALSE;
+	}
 	vis_info = glXChooseVisual(disp, screen, attriblist);
 
         /* might be a better way to handle not being able to set GLX_ALPHA_SIZE... */

Update of /cvsroot/java-game-lib/LWJGL/src/native
In directory sc8-pr-cvs1:/tmp/cvs-serv22313

Modified Files:
	config.h.in configure.in 
Log Message:
Switched to dynamic loading of gl functions and libs

Index: config.h.in
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/config.h.in
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/config.h.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config.h.in	28 Nov 2002 22:40:05 -0000	1.1
+++ config.h.in	11 Dec 2002 07:16:31 -0000	1.2
@@ -6,12 +6,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the `GL' library (-lGL). */
-#undef HAVE_LIBGL
-
-/* Define to 1 if you have the `GLU' library (-lGLU). */
-#undef HAVE_LIBGLU
-
 /* Define to 1 if you have the `openal' library (-lopenal). */
 #undef HAVE_LIBOPENAL
 

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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.in	30 Nov 2002 21:36:12 -0000	1.5
+++ configure.in	11 Dec 2002 07:16:31 -0000	1.6
@@ -56,12 +56,8 @@
 fi
 
 dnl Checks for libraries.
-dnl Replace `main' with a function in -lGL:
 LIBS='-L/usr/X11R6/lib'
 AC_PATH_X
-AC_CHECK_LIB(GL, main,, AC_MSG_ERROR(GL is required))
-dnl Replace `main' with a function in -lGLU:
-AC_CHECK_LIB(GLU, main,, AC_MSG_ERROR(GLU is required))
 dnl Replace `main' with a function in -lX11:
 AC_CHECK_LIB(X11, main,, AC_MSG_ERROR(X11 is required))
 dnl Replace `main' with a function in -lXext:

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks
In directory sc8-pr-cvs1:/tmp/cvs-serv22313/common/callbacks

Modified Files:
	GLUQuadricCallbacks.h 
Log Message:
Switched to dynamic loading of gl functions and libs

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.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- GLUQuadricCallbacks.h	30 Nov 2002 03:28:30 -0000	1.3
+++ GLUQuadricCallbacks.h	11 Dec 2002 07:16:31 -0000	1.4
@@ -9,7 +9,6 @@
 #define	_GLUQuadricCallbacks_H
 
 #include "extgl.h"
-#include <GL/glu.h>
 #include <stdlib.h>
 #include <stdio.h>
 

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv22313/win32

Modified Files:
	org_lwjgl_opengl_BaseGL.cpp 
Log Message:
Switched to dynamic loading of gl functions and libs

Index: org_lwjgl_opengl_BaseGL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_BaseGL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_BaseGL.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_BaseGL.cpp	24 Nov 2002 17:13:33 -0000	1.4
+++ org_lwjgl_opengl_BaseGL.cpp	11 Dec 2002 07:16:31 -0000	1.5
@@ -108,7 +108,8 @@
 		printf("Failed to set pixel format\n");
 		return JNI_FALSE;
 	}
-
+	if (extgl_Open() != 0)
+		return JNI_FALSE;
 	// Create a rendering context
 	hglrc = wglCreateContext(hdc);
 	if (hglrc == NULL) {
@@ -119,6 +120,11 @@
 	// Automatically make it the current context
 	wglMakeCurrent(hdc, hglrc);
 
+	if (extgl_Initialize() != 0) {
+		printf("Failed to initialize GL\n");
+		return JNI_FALSE;
+	}
+
 	char * p = (char *) glGetString(GL_EXTENSIONS);
     if (NULL == p) {
         printf("NO extensions available\n");
@@ -126,11 +132,6 @@
 		printf("Available extensions:\n%s\n", p);
 	}
 	
-	if (extgl_Initialize() != 0) {
-		printf("Failed to initialize GL\n");
-		return JNI_FALSE;
-	}
-
 	return JNI_TRUE;
 }
 
@@ -147,7 +148,7 @@
 	// Delete the rendering context
 	if (hglrc != NULL)
 		wglDeleteContext(hglrc); 
-
+	extgl_Close();
 }
 
 /*

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv22313/linux

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
Switched to dynamic loading of gl functions and libs

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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_Display.cpp	4 Dec 2002 15:17:49 -0000	1.6
+++ org_lwjgl_Display.cpp	11 Dec 2002 07:16:31 -0000	1.7
@@ -40,13 +40,11 @@
  */
 
 
+#include "extgl.h"
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/xf86vmode.h>
-#include <GL/glx.h>
 #include <X11/Xutil.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
 #include <stdio.h>
 #include <jni.h>
 #include "org_lwjgl_Display.h"
@@ -144,7 +142,7 @@
 		return JNI_FALSE;
 	}
 	root_win = RootWindow(disp, screen);
-
+	extgl_Open();
 	vis_info = glXChooseVisual(disp, screen, attriblist);
 
         /* might be a better way to handle not being able to set GLX_ALPHA_SIZE... */
@@ -213,6 +211,7 @@
 	XFree(avail_modes);
 	XFree(vis_info);
 	XCloseDisplay(disp);
+	extgl_Close();
 #ifdef _DEBUG
 	printf("Closed X connection\n");
 #endif

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv22313/common

Modified Files:
	checkGLerror.h extgl.c extgl.h org_lwjgl_opengl_GLU.cpp 
Log Message:
Switched to dynamic loading of gl functions and libs

Index: checkGLerror.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/checkGLerror.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/checkGLerror.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- checkGLerror.h	26 Nov 2002 17:34:26 -0000	1.5
+++ checkGLerror.h	11 Dec 2002 07:16:31 -0000	1.6
@@ -14,7 +14,6 @@
 
 #include <jni.h>
 #include "extgl.h"
-#include <GL/glu.h>
 
 #define CHECK_GL_ERROR \
 	{ \

Index: extgl.c
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- extgl.c	19 Nov 2002 07:42:54 -0000	1.1
+++ extgl.c	11 Dec 2002 07:16:31 -0000	1.2
@@ -37,18 +37,472 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifndef _WIN32
-#include <GL/glx.h>
-#endif /* _WIN32 */
-
 /* turn off the warning for the borland compiler*/
 #ifdef __BORLANDC__
 #pragma warn -8064
 #pragma warn -8065
[...1546 lines suppressed...]
+	lib_glu_handle = LoadLibrary("glu32.dll");
+    if (lib_glu_handle == NULL)
+        return 1;
+#endif
+	
+	return 0;
+}
+
+void extgl_Close(void)
+{
+#ifndef _WIN32
+	dlclose(lib_glu_handle);
+	dlclose(lib_gl_handle);
+#else
+	FreeLibrary(lib_gl_handle);
+	FreeLibrary(lib_glu_handle);
+#endif
 }
 
 /* deprecated function please do not use it, use extgl_Initialize() instead */

Index: extgl.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- extgl.h	19 Nov 2002 07:42:54 -0000	1.1
+++ extgl.h	11 Dec 2002 07:16:31 -0000	1.2
@@ -1,4997 +1,5673 @@
-/* Small parts were taken from glext.h, here's the lisence: */
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-** 
[...10620 lines suppressed...]
+    int OpenGL13;
+    int OpenGL14;
+};
+
+extern struct ExtensionTypes extgl_Extensions;
+
+extern struct ExtensionTypes SupportedExtensions; /* deprecated, please do not use */
+
+/* initializes everything, call this right after the rc is created. the function returns 0 if successful */
+int extgl_Initialize();
+int extgl_Open(void);
+void extgl_Close(void);
+
+int glInitialize(); /* deprecated, please do not use */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __EXTGL_H__ */

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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_GLU.cpp	30 Nov 2002 03:40:47 -0000	1.4
+++ org_lwjgl_opengl_GLU.cpp	11 Dec 2002 07:16:31 -0000	1.5
@@ -39,14 +39,9 @@
  * @version $Revision$
  */
 
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
 #include "org_lwjgl_opengl_GLU.h"
 #include "extgl.h"
 #include "checkGLerror.h"
-#include "GL/glu.h"
 
 #include "callbacks/GLUQuadricCallbacks.h"