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

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

Modified Files:
	BasicTest.java 
Log Message:
applied DarkProphets patch for better error handling and more types

Index: BasicTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/devil/BasicTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- BasicTest.java	22 May 2005 12:12:02 -0000	1.11
+++ BasicTest.java	7 Sep 2005 16:06:06 -0000	1.12
@@ -70,7 +70,12 @@
 		System.out.println("error = " + ILU.iluErrorString(IL.ilGetError()));
 		URL imageURL = BasicTest.class.getResource("/res/ILtest.tga");
 		System.out.println("ilLoadFromURL " + imageURL);
-		System.out.println("load lump = " + IL.ilLoadFromURL(imageURL));
+		try {
+			System.out.println("load lump = " + IL.ilLoadFromURL(imageURL));
+		} catch (Exception e) {
+			e.printStackTrace();
+			System.exit(0);
+		}
 		System.out.println("error = " + ILU.iluErrorString(IL.ilGetError()));
 		int newIm = IL.ilCloneCurImage();
 		IL.ilCopyImage(im.get(0));

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

Modified Files:
	IL.java 
Log Message:
applied DarkProphets patch for better error handling and more types

Index: IL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/IL.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- IL.java	29 May 2005 22:16:56 -0000	1.19
+++ IL.java	7 Sep 2005 16:06:06 -0000	1.20
@@ -447,74 +447,96 @@
 	 * @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) {
-			String extension = filename.substring(index + 1);
-			if (extension.equalsIgnoreCase("bmp")) {
-				return IL_BMP;
-			} else if (extension.equalsIgnoreCase("cut")) {
-				return IL_CUT;
-			} else if (extension.equalsIgnoreCase("gif")) {
-				return IL_GIF;
-			} else if (extension.equalsIgnoreCase("ico")) {
-				return IL_ICO;
-			} else if (extension.equalsIgnoreCase("jpg")
-					|| extension.equalsIgnoreCase("jpeg")
-					|| extension.equalsIgnoreCase("jpe")) {
-				return IL.IL_JPG;
-			} else if (extension.equalsIgnoreCase("lif")) {
-				return IL_LIF;
-			} else if (extension.equalsIgnoreCase("mng")) {
-				return IL_MNG;
-			} else if (extension.equalsIgnoreCase("pcd")) {
-				return IL_PCD;
-			} else if (extension.equalsIgnoreCase("pcx")) {
-				return IL_PCX;
-			} else if (extension.equalsIgnoreCase("pic")) {
-				return IL_PIC;
-			} else if (extension.equalsIgnoreCase("png")) {
-				return IL_PNG;
-			} else if (extension.equalsIgnoreCase("pbm") || extension.equalsIgnoreCase("pgm")
-					|| extension.equalsIgnoreCase("ppm")) {
-				return IL_PNM;
-			} else if (extension.equalsIgnoreCase("psd")) {
-				return IL_PSD;
-			} else if (extension.equalsIgnoreCase("psp")) {
-				return IL_PSP;
-			} else if (extension.equalsIgnoreCase("bw") || extension.equalsIgnoreCase("rgb")
-					|| extension.equalsIgnoreCase("rgba") || extension.equalsIgnoreCase("sgi")) {
-				return IL_SGI;
-			} else if (extension.equalsIgnoreCase("tga")) {
-				return IL_TGA;
-			} else if (extension.equalsIgnoreCase("tif") || extension.equalsIgnoreCase("tiff")) {
-				return IL_TIF;
-			}
+	public static int ilGetType(String extension) {
+		// Save having to use equalsIgnoreCase all the time
+		extension = extension.toLowerCase();
+		int type = IL_TYPE_UNKNOWN;
+		
+		if (extension.equals("bmp")) {
+			type = IL_BMP;
+		} else if (extension.equals("cut")) {
+			type = IL_CUT;
+		} else if (extension.equals("gif")) {
+			type = IL_GIF;
+		} else if (extension.equals("ico")) {
+			type = IL_ICO;
+		} else if (extension.equals("jpg")) {
+			type = IL_JPG;
+		} else if (extension.equals("lif")) {
+			type = IL_LIF;
+		} else if (extension.equals("mng")) {
+			type = IL_MNG;
+		} else if (extension.equals("pcd")) {
+			type = IL_PCD;
+		} else if (extension.equals("pcx")) {
+			type = IL_PCX;
+		} else if (extension.equals("pic")) {
+			type = IL_PIC;
+		} else if (extension.equals("png")) {
+			type = IL_PNG;
+		} else if (extension.equals("pbm") || extension.equals("pgm")
+				|| extension.equals("ppm")) {
+			type = IL_PNM;
+		} else if (extension.equals("psd")) {
+			type = IL_PSD;
+		} else if (extension.equals("psp")) {
+			type = IL_PSP;
+		} else if (extension.equals("bw") || extension.equals("rgb")
+				|| extension.equals("rgba") || extension.equals("sgi")) {
+			type = IL_SGI;
+		} else if (extension.equals("tga")) {
+			type = IL_TGA;
+		} else if (extension.equals("tif") || extension.equals("tiff")) {
+			type = IL_TIF;
+		} else if (extension.equals("dds")) {
+			type = IL_DDS;
+		} else if (extension.equals("raw")) {
+			type = IL_RAW;
+		} else if (extension.equals("lbm")) {
+			type = IL_LBM;
+		} else if (extension.equals("jng")) {
+			type = IL_JNG;
+		} else if (extension.equals("wal")) {
+			type = IL_WAL;
+		} else if (extension.equals("pix")) {
+			type = IL_PIX;
+		} else if (extension.equals("mdl")) {
+			type = IL_MDL;
+		} else if (extension.equals("exif")) {
+			type = IL_EXIF;
+		} else if (extension.equals("oil")) {
+			type = IL_OIL;
+		} else if (extension.equals("dcx")) {
+			type = IL_DCX;
+		} else if (extension.equals("pxr")) {
+			type = IL_PXR;
+		} else if (extension.equals("xpm")) {
+			type = IL_XPM;
+		} else if (extension.equals("pal")) {
+			type = IL_JASC_PAL;
+		} else if (extension.equals("h")) {
+			type = IL_CHEAD;
 		}
-		return IL_TYPE_UNKNOWN;
+		
+		return type;
 	}
 
-
 	/**
 	 * 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;
-
+	public static boolean ilLoadFromURL(URL url) throws IOException {
+		int type = IL_TYPE_UNKNOWN;
+		
 		String file = url.toString();
-
-		// read stream
-		try {
-			result = ilLoadFromStream(url.openStream(), getILType(file));
-		} catch (IOException e) {
-			e.printStackTrace();
-			result = false;
+		int index = file.lastIndexOf('.');
+		if (index != -1) {
+			String extension = file.substring(index + 1);
+			type = ilGetType(extension);
 		}
-
-		return result;
+		return ilLoadFromStream(url.openStream(), type); 
 	}
 
 	/**
@@ -524,7 +546,7 @@
 	 * @param type Type of image to expect
 	 * @return true if image was loaded
 	 */
-	public static boolean ilLoadFromStream(InputStream stream, int type) {
+	public static boolean ilLoadFromStream(InputStream stream, int type) throws IOException {
 		boolean result = false;
 		int lastRead = 0;
 		byte[] buffer = new byte[4096];
@@ -542,8 +564,10 @@
 			lump.flip();
 			result = ilLoadL(type, lump);
 		} catch (IOException e) {
-			e.printStackTrace();
-			result = false;
+			try {
+				buf.close();
+			} catch (IOException f ) {}
+			throw e; 
 		}
 
 		return result;

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

Modified Files:
	MacOSXDisplay.java 
Log Message:
use buffer.get since we dont have a backing array

Index: MacOSXDisplay.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- MacOSXDisplay.java	5 Jul 2005 21:54:12 -0000	1.34
+++ MacOSXDisplay.java	7 Sep 2005 15:43:52 -0000	1.35
@@ -545,7 +545,8 @@
 		int height;
 		
 		width = height = (int) Math.sqrt(size);
-		int[] imageData = icons[biggest].asIntBuffer().array();
+		int[] imageData = new int[icons[biggest].remaining()];
+		icons[biggest].asIntBuffer().get(imageData);
 		
 		BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
 		img.setRGB(0, 0, width, height, imageData, 0, width);