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

Update of /cvsroot/java-game-lib/LWJGL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10641

Modified Files:
	build.xml 
Log Message:
Make build.xml compile LWJGL with debug on, to enable line numbers in stack traces

Index: build.xml
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- build.xml	2 Nov 2004 12:48:56 -0000	1.39
+++ build.xml	5 Nov 2004 17:19:02 -0000	1.40
@@ -176,15 +176,15 @@
 
 	<!-- Compiles the Java source code -->
 	<target name="compile" description="Compiles the java source code">
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/**.java" source="1.4" target="1.4" taskname="lwjgl" />
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/input/**" source="1.4" target="1.4" taskname="input" />
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/openal/**" source="1.4" target="1.4" taskname="openal" />
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" source="1.4" target="1.4" taskname="opengl" />
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/test/**" source="1.4" target="1.4" taskname="test" />
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/examples/**" source="1.4" target="1.4" taskname="examples" />
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/**" source="1.4" target="1.4" taskname="util" />
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/fmod3/**" source="1.4" target="1.4" taskname="fmod" />
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/devil/**" source="1.4" target="1.4" taskname="devil" debug="on"/>
+		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/**.java" source="1.4" target="1.4" taskname="lwjgl" />
+		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/input/**" source="1.4" target="1.4" taskname="input" />
+		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/openal/**" source="1.4" target="1.4" taskname="openal" />
+		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" source="1.4" target="1.4" taskname="opengl" />
+		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/test/**" source="1.4" target="1.4" taskname="test" />
+		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/examples/**" source="1.4" target="1.4" taskname="examples" />
+		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/**" source="1.4" target="1.4" taskname="util" />
+		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/fmod3/**" source="1.4" target="1.4" taskname="fmod" />
+		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/devil/**" source="1.4" target="1.4" taskname="devil"/>
 	</target>
 
 	<!-- Compiles the native files -->

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

Modified Files:
	extal.c extgl.c extgl.h org_lwjgl_opengl_GL11.c 
Log Message:
Linux: removed redundant last_z from Mouse.c. Mac: Compile fixes. Use NSAddImage for loading GL library

Index: org_lwjgl_opengl_GL11.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL11.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_opengl_GL11.c	10 Sep 2004 08:13:48 -0000	1.1
+++ org_lwjgl_opengl_GL11.c	5 Nov 2004 10:30:03 -0000	1.2
@@ -312,7 +312,7 @@
 static glGetBooleanvPROC glGetBooleanv; 
 static glGetClipPlanePROC glGetClipPlane; 
 static glGetDoublevPROC glGetDoublev; 
-glGetErrorPROC glGetError;
+glGetErrorPROC glGetError = NULL;
 static glGetFloatvPROC glGetFloatv; 
 static glGetIntegervPROC glGetIntegerv; 
 static glGetLightfvPROC glGetLightfv; 
@@ -326,7 +326,7 @@
 static glGetPixelMapusvPROC glGetPixelMapusv; 
 static glGetPointervPROC glGetPointerv; 
 static glGetPolygonStipplePROC glGetPolygonStipple; 
-glGetStringPROC glGetString;
+glGetStringPROC glGetString = NULL;
 static glGetTexEnvfvPROC glGetTexEnvfv; 
 static glGetTexEnvivPROC glGetTexEnviv; 
 static glGetTexGenfvPROC glGetTexGenfv; 

Index: extal.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- extal.c	3 Nov 2004 12:10:20 -0000	1.17
+++ extal.c	5 Nov 2004 10:29:57 -0000	1.18
@@ -144,7 +144,6 @@
  * Loads the OpenAL Library
  */
 static bool LoadOpenAL(JNIEnv *env, jobjectArray oalPaths) {
-
 	jsize pathcount = (*env)->GetArrayLength(env, oalPaths);
 	int i;
 	jstring path;
@@ -159,33 +158,33 @@
 #ifdef _WIN32
 		lib_str = concatenate(path_str, "lwjglaudio.dll");
 		handleOAL = LoadLibrary(lib_str);
-                free(lib_str);
+		free(lib_str);
 #endif
 #ifdef _X11
-		char *lib_str = concatenate(path_str, "libogg.so.0");
+		lib_str = concatenate(path_str, "libogg.so.0");
 		handleOGG = dlopen(lib_str, RTLD_LAZY);
-                free(lib_str);
+		free(lib_str);
 
 		lib_str = concatenate(path_str, "libvorbis.so.0");
 		handleVorbis = dlopen(lib_str, RTLD_LAZY);
-                free(lib_str);
+		free(lib_str);
 
 		lib_str = concatenate(path_str, "libvorbisfile.so.3");
 		handleVorbisFile = dlopen(lib_str, RTLD_LAZY);
-                free(lib_str);
+		free(lib_str);
 
 		lib_str = concatenate(path_str, "libopenal.so");
 		handleOAL = dlopen(lib_str, RTLD_LAZY);
-                free(lib_str);
+		free(lib_str);
 
 		if (handleOAL == NULL) {
 			closeVorbisLibs();
 		}
 #endif
 #ifdef _MACOSX
-		char *lib_str = concatenate(path_str, "openal.dylib");
+		lib_str = concatenate(path_str, "openal.dylib");
 		handleOAL = NSAddImage(lib_str, NSADDIMAGE_OPTION_RETURN_ON_ERROR);
-                free(lib_str);
+		free(lib_str);
 #endif
 		if (handleOAL != NULL) {
 			printfDebug("Found OpenAL at '%s'\n", path_str);

Index: extgl.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- extgl.h	2 Nov 2004 15:51:08 -0000	1.43
+++ extgl.h	5 Nov 2004 10:30:00 -0000	1.44
@@ -399,6 +399,7 @@
 
 /* helper stuff */
 
+#ifndef _MACOSX
 struct ExtensionTypes
 {
 #ifdef _WIN32 /* WGL extensions */
@@ -425,6 +426,7 @@
 };
 
 extern struct ExtensionTypes extgl_Extensions;
+#endif
 
 typedef GLenum (APIENTRY * glGetErrorPROC) (void);
 typedef const GLubyte * (APIENTRY * glGetStringPROC) (GLenum name);

Index: extgl.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- extgl.c	3 Nov 2004 12:10:20 -0000	1.27
+++ extgl.c	5 Nov 2004 10:29:58 -0000	1.28
@@ -85,7 +85,9 @@
 aglSurfaceTexturePROC aglSurfaceTexture = NULL;
 #endif
 
+#ifndef _MACOSX
 struct ExtensionTypes extgl_Extensions;
+#endif
 
 #ifdef _WIN32
 HMODULE lib_gl_handle = NULL;
@@ -100,8 +102,8 @@
 #endif
 
 #ifdef _MACOSX
-CFBundleRef opengl_bundle_ref = NULL;
-//CFBundleRef agl_bundle_ref = NULL;
+#include <mach-o/dyld.h>
+static const struct mach_header *opengl_lib_handle = NULL;
 #endif
 
 /* getProcAddress */
@@ -135,16 +137,16 @@
 #endif
 
 #ifdef _MACOSX
-	CFStringRef str = CFStringCreateWithCStringNoCopy(NULL, name, kCFStringEncodingUTF8, kCFAllocatorNull);
-	void *func_pointer = CFBundleGetFunctionPointerForName(opengl_bundle_ref, str);
-	if (func_pointer == NULL) {
-/*		func_pointer = CFBundleGetFunctionPointerForName(agl_bundle_ref, str);
-		if (func_pointer == NULL) {*/
-			printfDebug("Could not locate symbol %s\n", name);
-//		}
-	}
-	CFRelease(str);
-	return func_pointer;
+	#define BUFFER_SIZE 1024
+	char mach_name[BUFFER_SIZE] = "_";
+	strncat(mach_name, name, BUFFER_SIZE - 1);
+
+	if (NSIsSymbolNameDefinedInImage(opengl_lib_handle, mach_name)) {           
+		NSSymbol sym = NSLookupSymbolInImage(opengl_lib_handle, mach_name, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
+		void *address = NSAddressOfSymbol(sym);
+		return address;
+	} else
+		return NULL;
 #endif
 }
 
@@ -157,74 +159,9 @@
 }
 
 #ifdef _MACOSX
-// -------------------------
-static CFBundleRef loadBundle(const Str255 frameworkName)
-{
-	OSStatus err = noErr;
-	FSRefParam fileRefParam;
-	FSRef fileRef;
-	CFURLRef bundleURLOpenGL;
-	CFBundleRef bundle_ref;
-
-	memset(&fileRefParam, 0, sizeof(fileRefParam));
-	memset(&fileRef, 0, sizeof(fileRef));
-	fileRefParam.ioNamePtr  = frameworkName;
-	fileRefParam.newRef = &fileRef;
-
-	// Frameworks directory/folder
-	//
-	err = FindFolder (kSystemDomain, kFrameworksFolderType, false, &fileRefParam.ioVRefNum, &fileRefParam.ioDirID);
-	if (noErr != err)
-	{
-		printfDebug("Could not find frameworks folder\n");
-		return NULL;
-	}
-
-	// make FSRef for folder
-	//
-	err = PBMakeFSRefSync (&fileRefParam);
-
-
-	if (noErr != err)
-	{
-		printfDebug("Could make FSref to frameworks folder\n");
-		return NULL;
-	}
-
-	// create URL to folder
-	//
-	bundleURLOpenGL = CFURLCreateFromFSRef (kCFAllocatorDefault, &fileRef);
-	if (!bundleURLOpenGL)
-	{
-		printfDebug("Could create framework URL\n");
-		return NULL;
-	}
-
-	bundle_ref = CFBundleCreate(kCFAllocatorDefault,bundleURLOpenGL);
-	CFRelease (bundleURLOpenGL);
-	if (bundle_ref == NULL)
-	{
-		printfDebug("Could not load framework\n");
-		return NULL;
-	}
-
-	// if the code was successfully loaded, look for our function.
-	if (!CFBundleLoadExecutable(bundle_ref))
-	{
-		printfDebug("Could not load MachO executable\n");
-		CFRelease(bundle_ref);
-		return NULL;
-	}
-
-	return bundle_ref;
-}
-
-static void aglUnloadFramework(CFBundleRef f)
-{
-	CFBundleUnloadExecutable(f);
-	CFRelease(f);
+static const struct mach_header *loadImage(const char *lib_name) {   
+	return NSAddImage(lib_name, NSADDIMAGE_OPTION_RETURN_ON_ERROR);
 }
-
 #endif
 
 bool extgl_QueryExtension(JNIEnv *env, const GLubyte*extensions, const char *name)
@@ -262,69 +199,16 @@
 
 }
 
-
-/*-----------------------------------------------------*/
-/* AGL stuff BEGIN*/
-/*-----------------------------------------------------*/
-#ifdef _MACOSX
-
-// Commecnted out as AGL is not needed
-/*bool extgl_InitAGL(JNIEnv *env)
-{
-	aglChoosePixelFormat = (aglChoosePixelFormatPROC)extgl_GetProcAddress("aglChoosePixelFormat");
-	aglDestroyPixelFormat = (aglDestroyPixelFormatPROC)extgl_GetProcAddress("aglDestroyPixelFormat");
-	aglNextPixelFormat = (aglNextPixelFormatPROC)extgl_GetProcAddress("aglNextPixelFormat");
-	aglDescribePixelFormat = (aglDescribePixelFormatPROC)extgl_GetProcAddress("aglDescribePixelFormat");
-	aglDevicesOfPixelFormat = (aglDevicesOfPixelFormatPROC)extgl_GetProcAddress("aglDevicesOfPixelFormat");
-	aglQueryRendererInfo = (aglQueryRendererInfoPROC)extgl_GetProcAddress("aglQueryRendererInfo");
-	aglDestroyRendererInfo = (aglDestroyRendererInfoPROC)extgl_GetProcAddress("aglDestroyRendererInfo");
-	aglNextRendererInfo = (aglNextRendererInfoPROC)extgl_GetProcAddress("aglNextRendererInfo");
-	aglDescribeRenderer = (aglDescribeRendererPROC)extgl_GetProcAddress("aglDescribeRenderer");
-	aglCreateContext = (aglCreateContextPROC)extgl_GetProcAddress("aglCreateContext");
-	aglDestroyContext = (aglDestroyContextPROC)extgl_GetProcAddress("aglDestroyContext");
-	aglCopyContext = (aglCopyContextPROC)extgl_GetProcAddress("aglCopyContext");
-	aglUpdateContext = (aglUpdateContextPROC)extgl_GetProcAddress("aglUpdateContext");
-	aglSetCurrentContext = (aglSetCurrentContextPROC)extgl_GetProcAddress("aglSetCurrentContext");
-	aglGetCurrentContext = (aglGetCurrentContextPROC)extgl_GetProcAddress("aglGetCurrentContext");
-	aglSetDrawable = (aglSetDrawablePROC)extgl_GetProcAddress("aglSetDrawable");
-	aglSetOffScreen = (aglSetOffScreenPROC)extgl_GetProcAddress("aglSetOffScreen");
-	aglSetFullScreen = (aglSetFullScreenPROC)extgl_GetProcAddress("aglSetFullScreen");
-	aglGetDrawable = (aglGetDrawablePROC)extgl_GetProcAddress("aglGetDrawable");
-	aglSetVirtualScreen = (aglSetVirtualScreenPROC)extgl_GetProcAddress("aglSetVirtualScreen");
-	aglGetVirtualScreen = (aglGetVirtualScreenPROC)extgl_GetProcAddress("aglGetVirtualScreen");
-	aglGetVersion = (aglGetVersionPROC)extgl_GetProcAddress("aglGetVersion");
-	aglSwapBuffers = (aglSwapBuffersPROC)extgl_GetProcAddress("aglSwapBuffers");
-	aglEnable = (aglEnablePROC)extgl_GetProcAddress("aglEnable");
-	aglDisable = (aglDisablePROC)extgl_GetProcAddress("aglDisable");
-	aglIsEnabled = (aglIsEnabledPROC)extgl_GetProcAddress("aglIsEnabled");
-	aglSetInteger = (aglSetIntegerPROC)extgl_GetProcAddress("aglSetInteger");
-	aglGetInteger = (aglGetIntegerPROC)extgl_GetProcAddress("aglGetInteger");
-	aglUseFont = (aglUseFontPROC)extgl_GetProcAddress("aglUseFont");
-	aglGetError = (aglGetErrorPROC)extgl_GetProcAddress("aglGetError");
-	aglErrorString = (aglErrorStringPROC)extgl_GetProcAddress("aglErrorString");
-	aglResetLibrary = (aglResetLibraryPROC)extgl_GetProcAddress("aglResetLibrary");
-	aglSurfaceTexture = (aglSurfaceTexturePROC)extgl_GetProcAddress("aglSurfaceTexture");
-	return !extgl_error; // Split out AGL into extgl_agl.cpp like wgl and glx and replace with InitializeFunctions
-}
-*/
-#endif
 /*-----------------------------------------------------*/
 /* AGL stuff END*/
 /*-----------------------------------------------------*/
 
 #ifdef _MACOSX
 bool extgl_Open(void) {
-	if (opengl_bundle_ref != NULL)
+	if (opengl_lib_handle != NULL)
 		return true;
-	opengl_bundle_ref = loadBundle("\pOpenGL.framework");
-	if (opengl_bundle_ref == NULL)
-		return false;
-/*	agl_bundle_ref = loadBundle("\pAGL.framework");
-	if (agl_bundle_ref == NULL) {
-		aglUnloadFramework(opengl_bundle_ref);
-		return false;
-	}*/
-	return true;
+	opengl_lib_handle = loadImage("/System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib");
+	return opengl_lib_handle != NULL;
 }
 #endif
 
@@ -372,9 +256,7 @@
 	lib_gl_handle = NULL;
 #endif
 #ifdef _MACOSX
-	aglUnloadFramework(opengl_bundle_ref);
-//	aglUnloadFramework(agl_bundle_ref);
-	opengl_bundle_ref = NULL;
+	opengl_lib_handle = NULL;
 #endif
 }
 

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

Modified Files:
	org_lwjgl_input_Mouse.c 
Log Message:
Linux: removed redundant last_z from Mouse.c. Mac: Compile fixes. Use NSAddImage for loading GL library

Index: org_lwjgl_input_Mouse.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- org_lwjgl_input_Mouse.c	2 Nov 2004 12:48:58 -0000	1.17
+++ org_lwjgl_input_Mouse.c	5 Nov 2004 10:30:04 -0000	1.18
@@ -67,7 +67,6 @@
 static int last_poll_y;
 static int last_event_x;
 static int last_event_y;
-static int last_z;
 static jbyte buttons[NUM_BUTTONS];
 static event_queue_t event_queue;
 static bool buffer_enabled;
@@ -251,7 +250,7 @@
 	if (disp == NULL)
 		return;
 	int i;
-	last_z = last_poll_y = last_poll_x = last_event_x = last_event_y = accum_dx = accum_dy = accum_dz = 0;
+	last_poll_y = last_poll_x = last_event_x = last_event_y = accum_dx = accum_dy = accum_dz = 0;
 	resetCursorToCenter();
 	for (i = 0; i < NUM_BUTTONS; i++)
 		buttons[i] = 0;