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

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

Modified Files:
	IL.java 
Log Message:
javadoc

Index: IL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/IL.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- IL.java	29 May 2005 22:14:32 -0000	1.18
+++ IL.java	29 May 2005 22:16:56 -0000	1.19
@@ -441,6 +441,12 @@
 
 	public static native boolean ilSaveData(String FileName);	
 	
+	/**
+	 * Determines the IL type for file passed
+	 * 
+	 * @param filename File to determine type for
+	 * @return IL type, or IL_TYPE_UNKNOWN if undeterminable
+	 */
 	public static int getILType(String filename) {
 		int index = filename.lastIndexOf('.');
 		if (index != -1) {

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

Modified Files:
	IL.java 
Log Message:
added getILType(filename)

Index: IL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/IL.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- IL.java	22 May 2005 11:09:02 -0000	1.17
+++ IL.java	29 May 2005 22:14:32 -0000	1.18
@@ -440,63 +440,69 @@
 			int Depth, byte Bpp);
 
 	public static native boolean ilSaveData(String FileName);	
-
-	/**
-	 * Loads an image from the specified url
-	 * 
-	 * @param url URL to load from
-	 * @return true if image was loaded
-	 */
-	public static boolean ilLoadFromURL(URL url) {
-		boolean result = false;
-		int type = IL_TYPE_UNKNOWN;
-
-		String file = url.toString();
-		int index = file.lastIndexOf('.');
+	
+	public static int getILType(String filename) {
+		int index = filename.lastIndexOf('.');
 		if (index != -1) {
-			String extension = file.substring(index + 1);
+			String extension = filename.substring(index + 1);
 			if (extension.equalsIgnoreCase("bmp")) {
-				type = IL_BMP;
+				return IL_BMP;
 			} else if (extension.equalsIgnoreCase("cut")) {
-				type = IL_CUT;
+				return IL_CUT;
 			} else if (extension.equalsIgnoreCase("gif")) {
-				type = IL_GIF;
+				return IL_GIF;
 			} else if (extension.equalsIgnoreCase("ico")) {
-				type = IL_ICO;
-			} else if (extension.equalsIgnoreCase("jpg")) {
-				type = IL_JPG;
+				return IL_ICO;
+			} else if (extension.equalsIgnoreCase("jpg")
+					|| extension.equalsIgnoreCase("jpeg")
+					|| extension.equalsIgnoreCase("jpe")) {
+				return IL.IL_JPG;
 			} else if (extension.equalsIgnoreCase("lif")) {
-				type = IL_LIF;
+				return IL_LIF;
 			} else if (extension.equalsIgnoreCase("mng")) {
-				type = IL_MNG;
+				return IL_MNG;
 			} else if (extension.equalsIgnoreCase("pcd")) {
-				type = IL_PCD;
+				return IL_PCD;
 			} else if (extension.equalsIgnoreCase("pcx")) {
-				type = IL_PCX;
+				return IL_PCX;
 			} else if (extension.equalsIgnoreCase("pic")) {
-				type = IL_PIC;
+				return IL_PIC;
 			} else if (extension.equalsIgnoreCase("png")) {
-				type = IL_PNG;
+				return IL_PNG;
 			} else if (extension.equalsIgnoreCase("pbm") || extension.equalsIgnoreCase("pgm")
 					|| extension.equalsIgnoreCase("ppm")) {
-				type = IL_PNM;
+				return IL_PNM;
 			} else if (extension.equalsIgnoreCase("psd")) {
-				type = IL_PSD;
+				return IL_PSD;
 			} else if (extension.equalsIgnoreCase("psp")) {
-				type = IL_PSP;
+				return IL_PSP;
 			} else if (extension.equalsIgnoreCase("bw") || extension.equalsIgnoreCase("rgb")
 					|| extension.equalsIgnoreCase("rgba") || extension.equalsIgnoreCase("sgi")) {
-				type = IL_SGI;
+				return IL_SGI;
 			} else if (extension.equalsIgnoreCase("tga")) {
-				type = IL_TGA;
+				return IL_TGA;
 			} else if (extension.equalsIgnoreCase("tif") || extension.equalsIgnoreCase("tiff")) {
-				type = IL_TIF;
+				return IL_TIF;
 			}
 		}
+		return IL_TYPE_UNKNOWN;
+	}
+
+
+	/**
+	 * Loads an image from the specified url
+	 * 
+	 * @param url URL to load from
+	 * @return true if image was loaded
+	 */
+	public static boolean ilLoadFromURL(URL url) {
+		boolean result = false;
+
+		String file = url.toString();
 
 		// read stream
 		try {
-			result = ilLoadFromStream(url.openStream(), type);
+			result = ilLoadFromStream(url.openStream(), getILType(file));
 		} catch (IOException e) {
 			e.printStackTrace();
 			result = false;

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

Modified Files:
	build.xml 
Log Message:
fixed lib includes for mac os x on release

Index: build.xml
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- build.xml	19 May 2005 22:30:35 -0000	1.80
+++ build.xml	29 May 2005 21:53:48 -0000	1.81
@@ -103,7 +103,9 @@
 		<include name="liblwjgl-devil.jnilib" />
 		
 		<include name="openal.dylib" />
-		<include name="IL" />
+		<include name="libIL.dylib" />
+		<include name="libILU.dylib" />
+		<include name="libILUT.dylib" />
 	</patternset>
 
 	<!-- Files to include in source distribution -->

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

Modified Files:
	extil.c extilu.c extilut.c 
Log Message:
use dlopen to load dynamic libraries


Index: extilut.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/extilut.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- extilut.c	22 May 2005 11:14:00 -0000	1.7
+++ extilut.c	29 May 2005 21:24:18 -0000	1.8
@@ -1,18 +1,11 @@
 /* Handle to ilut Library */
 #ifdef _WIN32
-#include "extilut.h"
-static HMODULE devILUThandle;
-#endif
-#ifdef _X11
-#include "extilut.h"
-static void* devILUThandle;
-#endif
-#ifdef _MACOSX
-#include <mach-o/dyld.h>
-#include <stdlib.h>
-#include <string.h>
-static const struct mach_header* devILUThandle;
-#include "extilut.h"
+ #include "extilut.h"
+ static HMODULE devILUThandle;
+#else
+ #include <dlfcn.h>
+ #include "extilut.h"
+ static void* devILUThandle;
 #endif
 
 /**
@@ -22,22 +15,9 @@
 static void *NativeGetFunctionPointer(const char *function) {
 #ifdef _WIN32
 	return GetProcAddress(devILUThandle, function);
-#endif
-#ifdef _X11
+#else
 	return dlsym(devILUThandle, function);
 #endif
-#ifdef _MACOSX
-	char *mac_symbol_name = (char *)malloc((strlen(function) + 2)*sizeof(char));
-	if (mac_symbol_name == NULL)
-		return NULL;
-	mac_symbol_name[0] = '_';
-	strcpy(&(mac_symbol_name[1]), function);
-	NSSymbol symbol = NSLookupSymbolInImage(devILUThandle, mac_symbol_name, NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
-	free(mac_symbol_name);
-	if (symbol == NULL)
-		return NULL;
-	return NSAddressOfSymbol(symbol);
-#endif
 }
 
 /**
@@ -77,12 +57,11 @@
 		printfDebug("Testing '%s'\n", path_str);
 #ifdef _WIN32
 		devILUThandle = LoadLibrary(path_str);
-#endif
-#ifdef _X11
+#else
 		devILUThandle = dlopen(path_str, RTLD_LAZY);
-#endif
-#ifdef _MACOSX
-		devILUThandle = NSAddImage(path_str, NSADDIMAGE_OPTION_RETURN_ON_ERROR);
+		if(devILUThandle == NULL) {
+			printfDebug("dlopen failure: %s", dlerror());
+		}
 #endif
 		if (devILUThandle != NULL) {
 			printfDebug("Found ilut at '%s'\n", path_str);
@@ -103,15 +82,11 @@
 void extilut_Close(void) {
 #ifdef _WIN32
 	FreeLibrary(devILUThandle);
-#endif
-#ifdef _X11
+#else
 	if (devILUThandle != NULL) {
 		dlclose(devILUThandle);
 	}
 #endif
-#ifdef _MACOSX
-	// Cannot remove the image
-#endif
 	devILUThandle = NULL;
 }
 

Index: extil.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/extil.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- extil.c	18 May 2005 17:36:42 -0000	1.9
+++ extil.c	29 May 2005 21:24:18 -0000	1.10
@@ -1,18 +1,11 @@
 /* Handle to devil Library */
 #ifdef _WIN32
-#include "extil.h"
-static HMODULE devILhandle;
-#endif
-#ifdef _X11
-#include "extil.h"
-static void* devILhandle;
-#endif
-#ifdef _MACOSX
-#include <mach-o/dyld.h>
-#include <stdlib.h>
-#include <string.h>
-const struct mach_header* devILhandle = NULL;
-#include "extil.h"
+ #include "extil.h"
+ static HMODULE devILhandle;
+#else
+ #include <dlfcn.h>
+ #include "extil.h"
+ static void* devILhandle;
 #endif
 
 /**
@@ -22,22 +15,9 @@
 static void *NativeGetFunctionPointer(const char *function) {
 #ifdef _WIN32
 	return GetProcAddress(devILhandle, function);
-#endif
-#ifdef _X11
+#else
 	return dlsym(devILhandle, function);
 #endif
-#ifdef _MACOSX
-	char *mac_symbol_name = (char *)malloc((strlen(function) + 2)*sizeof(char));
-	if (mac_symbol_name == NULL)
-		return NULL;
-	mac_symbol_name[0] = '_';
-	strcpy(&(mac_symbol_name[1]), function);
-	NSSymbol symbol = NSLookupSymbolInImage(devILhandle, mac_symbol_name, NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
-	free(mac_symbol_name);
-	if (symbol == NULL)
-		return NULL;
-	return NSAddressOfSymbol(symbol);
-#endif
 }
 
 /**
@@ -77,12 +57,11 @@
 		printfDebug("Testing '%s'\n", path_str);
 #ifdef _WIN32
 		devILhandle = LoadLibrary(path_str);
-#endif
-#ifdef _X11
+#else
 		devILhandle = dlopen(path_str, RTLD_LAZY);
-#endif
-#ifdef _MACOSX
-		devILhandle = NSAddImage(path_str, NSADDIMAGE_OPTION_RETURN_ON_ERROR);
+		if(devILhandle == NULL) {
+			printfDebug("dlopen failure: %s", dlerror());
+		}
 #endif
 		if (devILhandle != NULL) {
 			printfDebug("Found devil at '%s'\n", path_str);
@@ -103,15 +82,11 @@
 void extil_Close(void) {
 #ifdef _WIN32
 	FreeLibrary(devILhandle);
-#endif
-#ifdef _X11
+#else
 	if (devILhandle != NULL) {
 		dlclose(devILhandle);
 	}
 #endif
-#ifdef _MACOSX
-	// Cannot remove the image
-#endif
 	devILhandle = NULL;
 }
 

Index: extilu.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/extilu.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- extilu.c	22 May 2005 11:14:00 -0000	1.8
+++ extilu.c	29 May 2005 21:24:18 -0000	1.9
@@ -1,18 +1,11 @@
 /* Handle to ilu Library */
 #ifdef _WIN32
-#include "extilu.h"
-static HMODULE devILUhandle;
-#endif
-#ifdef _X11
-#include "extilu.h"
-static void* devILUhandle;
-#endif
-#ifdef _MACOSX
-#include <mach-o/dyld.h>
-#include <stdlib.h>
-#include <string.h>
-static const struct mach_header* devILUhandle;
-#include "extilu.h"
+ #include "extilu.h"
+ static HMODULE devILUhandle;
+#else
+ #include <dlfcn.h>
+ #include "extilu.h"
+ static void* devILUhandle;
 #endif
 
 /**
@@ -22,22 +15,9 @@
 static void *NativeGetFunctionPointer(const char *function) {
 #ifdef _WIN32
 	return GetProcAddress(devILUhandle, function);
-#endif
-#ifdef _X11
+#else
 	return dlsym(devILUhandle, function);
 #endif
-#ifdef _MACOSX
-	char *mac_symbol_name = (char *)malloc((strlen(function) + 2)*sizeof(char));
-	if (mac_symbol_name == NULL)
-		return NULL;
-	mac_symbol_name[0] = '_';
-	strcpy(&(mac_symbol_name[1]), function);
-	NSSymbol symbol = NSLookupSymbolInImage(devILUhandle, mac_symbol_name, NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
-	free(mac_symbol_name);
-	if (symbol == NULL)
-		return NULL;
-	return NSAddressOfSymbol(symbol);
-#endif
 }
 
 /**
@@ -77,12 +57,11 @@
 		printfDebug("Testing '%s'\n", path_str);
 #ifdef _WIN32
 		devILUhandle = LoadLibrary(path_str);
-#endif
-#ifdef _X11
+#else
 		devILUhandle = dlopen(path_str, RTLD_LAZY);
-#endif
-#ifdef _MACOSX
-		devILUhandle = NSAddImage(path_str, NSADDIMAGE_OPTION_RETURN_ON_ERROR);
+		if(devILUhandle == NULL) {
+			printfDebug("dlopen failure: %s", dlerror());
+		}
 #endif
 		if (devILUhandle != NULL) {
 			printfDebug("Found ilu at '%s'\n", path_str);
@@ -103,14 +82,10 @@
 void extilu_Close(void) {
 #ifdef _WIN32
 	FreeLibrary(devILUhandle);
-#endif
-#ifdef _X11
+#else
 	if (devILUhandle != NULL) {
 		dlclose(devILUhandle);
 	}
 #endif
-#ifdef _MACOSX
-	// Cannot remove the image
-#endif
 	devILUhandle = NULL;
 }