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.sourceforge.net:/tmp/cvs-serv14141/src/native/win32

Modified Files:
	org_lwjgl_Sys.c 
Log Message:
Win32: Fixed Sys.alert()

Index: org_lwjgl_Sys.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Sys.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_Sys.c	20 Jan 2005 22:51:28 -0000	1.6
+++ org_lwjgl_Sys.c	28 Jan 2005 22:42:23 -0000	1.7
@@ -82,7 +82,7 @@
 {
 	char * eMessageText = GetStringNativeChars(env, message);
 	char * cTitleBarText = GetStringNativeChars(env, title);
-	MessageBox(getCurrentHWND(), eMessageText, cTitleBarText, MB_OK | MB_TOPMOST);
+	MessageBox(NULL, eMessageText, cTitleBarText, MB_OK | MB_TOPMOST);
 
 	printfDebug("*** Alert ***%s\n%s\n", cTitleBarText, eMessageText);
 	

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

Modified Files:
	checkALerror.h 
Log Message:
OpenAL: Enable error checking unconditionally, not only when debug is enabled

Index: checkALerror.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/checkALerror.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- checkALerror.h	10 Sep 2004 08:13:47 -0000	1.12
+++ checkALerror.h	28 Jan 2005 21:08:16 -0000	1.13
@@ -39,25 +39,21 @@
 
 #define CHECK_AL_ERROR \
 	{ \
-		if (isDebugEnabled()) { \
-			int err = alGetError(); \
-			if (err != AL_NO_ERROR) { \
-				jclass cls = (*env)->FindClass(env, "org/lwjgl/openal/OpenALException"); \
-				(*env)->ThrowNew(env, cls, (const char*) alGetString(err)); \
-				(*env)->DeleteLocalRef(env, cls); \
-			} \
+		int err = alGetError(); \
+		if (err != AL_NO_ERROR) { \
+			jclass cls = (*env)->FindClass(env, "org/lwjgl/openal/OpenALException"); \
+			(*env)->ThrowNew(env, cls, (const char*) alGetString(err)); \
+			(*env)->DeleteLocalRef(env, cls); \
 		} \
 	}
 /* only available if deviceaddress is specified in method */
 #define CHECK_ALC_ERROR \
 	{ \
-		if (isDebugEnabled()) { \
-			int err = alcGetError((ALCdevice*) deviceaddress); \
-			if (err != AL_NO_ERROR) { \
-				jclass cls = (*env)->FindClass(env, "org/lwjgl/openal/OpenALException"); \
-				(*env)->ThrowNew(env, cls, (const char*) alcGetString((ALCdevice*) deviceaddress, err)); \
-				(*env)->DeleteLocalRef(env, cls); \
-			} \
+		int err = alcGetError((ALCdevice*) deviceaddress); \
+		if (err != AL_NO_ERROR) { \
+			jclass cls = (*env)->FindClass(env, "org/lwjgl/openal/OpenALException"); \
+			(*env)->ThrowNew(env, cls, (const char*) alcGetString((ALCdevice*) deviceaddress, err)); \
+			(*env)->DeleteLocalRef(env, cls); \
 		} \
 	}
 

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

Modified Files:
	org_lwjgl_openal_ALC.c 
Log Message:
OpenAL: Don't call CHECK_ALC_ERROR after alcCloseDevice

Index: org_lwjgl_openal_ALC.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALC.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_openal_ALC.c	14 Nov 2004 10:42:16 -0000	1.5
+++ org_lwjgl_openal_ALC.c	28 Jan 2005 21:02:48 -0000	1.6
@@ -163,7 +163,6 @@
  */
 static void JNICALL Java_org_lwjgl_openal_ALC_alcCloseDevice (JNIEnv *env, jclass clazz, jint deviceaddress) {
 	alcCloseDevice((ALCdevice*) deviceaddress);
-	CHECK_ALC_ERROR
 }
 
 /**

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8244/src/java/org/lwjgl/openal

Modified Files:
	AL.java 
Log Message:
Renamed AL.getPathFromJWS to AL.getPathFromClassLoader and made it access protected methods too

Index: AL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- AL.java	22 Nov 2004 09:43:52 -0000	1.34
+++ AL.java	28 Jan 2005 15:47:29 -0000	1.35
@@ -145,15 +145,15 @@
 			throw new LWJGLException("Unknown platform: "+osName);
 		}
 		
-		String jwsPath = getPathFromJWS(jwsLibname);
+		String jwsPath = getPathFromClassLoader(jwsLibname);
 		if (jwsPath != null) {
-			Sys.log("getPathFromJWS: Path found: " + jwsPath);
+			Sys.log("getPathFromClassLoader: Path found: " + jwsPath);
 			libpath += seperator
 				+ jwsPath.substring(0, jwsPath.lastIndexOf(File.separator));
 		}
-		String lwjgl_jws_path = getPathFromJWS("lwjgl");
+		String lwjgl_jws_path = getPathFromClassLoader("lwjgl");
 		if (lwjgl_jws_path != null) {
-			Sys.log("getPathFromJWS: Path found: " + lwjgl_jws_path);
+			Sys.log("getPathFromClassLoader: Path found: " + lwjgl_jws_path);
 			libpath += seperator
 				+ lwjgl_jws_path.substring(0, lwjgl_jws_path.lastIndexOf(File.separator));
 		}
@@ -237,25 +237,29 @@
 	}
 	
 	/**
-	 * Tries to locate OpenAL from the JWS Library path
+	 * Tries to locate OpenAL from the current ClassLoader
 	 * This method exists because OpenAL is loaded from native code, and as such
-	 * is exempt from JWS library loading rutines. OpenAL therefore always fails.
-	 * We therefore invoke the protected method of the JWS classloader to see if it can
+	 * is exempt from ClassLoader library loading rutines. OpenAL therefore always fails.
+	 * We therefore invoke the protected method of the ClassLoader to see if it can
 	 * locate it. 
 	 * 
 	 * @param libname Name of library to search for
 	 * @return Absolute path to library if found, otherwise null
 	 */
-	private static String getPathFromJWS(String libname) {
+	private static String getPathFromClassLoader(String libname) {
 		try {		 
-      Sys.log("getPathFromJWS: searching for: " + libname);
+			Sys.log("getPathFromClassLoader: searching for: " + libname);
 			Object o = AL.class.getClassLoader();
 			Class c = o.getClass();
-			Method findLibrary =
-				c.getMethod("findLibrary", new Class[] { String.class });
-			Object[] arguments = new Object[] { libname };
-			return (String) findLibrary.invoke(o, arguments);
-
+			while (c != null) {
+				try {
+					Method findLibrary = c.getDeclaredMethod("findLibrary", new Class[] { String.class });
+					Object[] arguments = new Object[] { libname };
+					return (String)findLibrary.invoke(o, arguments);
+				} catch (NoSuchMethodException e) {
+					c = c.getSuperclass();
+				}
+			}
 		} catch (Exception e) {
 			Sys.log("Failure locating OpenAL using classloader:" + e);
 		}

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

Modified Files:
	build.xml 
Log Message:
Update to fix a problem with openal environmental problem in the OSX version

Index: build.xml
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- build.xml	25 Jan 2005 21:26:18 -0000	1.56
+++ build.xml	28 Jan 2005 02:09:51 -0000	1.57
@@ -311,7 +311,7 @@
       
       <echo>Compiling Mac OS X LWJGL version</echo>   
       <exec dir="${lwjgl.src.native}/macosx" executable="make" failonerror="true">
-         <env key="AL" path="${openal.home}/include/AL/" />
+         <env key="AL" path="${openal.home}" />
       </exec>
    
       <move file="${lwjgl.src.native}/macosx/liblwjgl.jnilib" tofile="${lwjgl.lib}/liblwjgl.jnilib" />