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

Revision: 3391
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3391&view=rev
Author:   kappa1
Date:     2010-07-25 14:22:09 +0000 (Sun, 25 Jul 2010)

Log Message:
-----------
AppletLoader: slight tweak to make code more readable

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-07-25 13:35:00 UTC (rev 3390)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-07-25 14:22:09 UTC (rev 3391)
@@ -284,10 +284,10 @@
 		fgColor 		= getColor("boxfgcolor", Color.black);	
 
 		// load logos, if value is "" then skip
-		if (!getParameter("al_logo").equals("")) {
+		if (getParameter("al_logo").length() > 0) {
 			logo 		= getImage(getParameter("al_logo"));
 		}
-		if (!getParameter("al_progressbar").equals("")) {
+		if (getParameter("al_progressbar").length() > 0) {
 			progressbar = getImage(getParameter("al_progressbar"));
 		}
 		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3390
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3390&view=rev
Author:   kappa1
Date:     2010-07-25 13:35:00 +0000 (Sun, 25 Jul 2010)

Log Message:
-----------
AppletLoader: removed dead code.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-07-25 13:31:49 UTC (rev 3389)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-07-25 13:35:00 UTC (rev 3390)
@@ -463,11 +463,6 @@
 			int x = offscreen.getWidth(null)/2; 
 			int y = offscreen.getHeight(null)/2;
 			
-			/*if(logo != null) {
-				x = (offscreen.getWidth(null) - logo.getWidth(null)) / 2;
-				y = (offscreen.getHeight(null) - logo.getHeight(null)) / 2;
-			}*/
-			
 			// draw logo
 			if (logo != null) {
 				og.drawImage(logoBuffer, x-logo.getWidth(null)/2, y-logo.getHeight(null)/2, this);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3389
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3389&view=rev
Author:   kappa1
Date:     2010-07-25 13:31:49 +0000 (Sun, 25 Jul 2010)

Log Message:
-----------
AppletLoader: addded ability to use appletloader with no images, just the logo, just the progressbar or both. To set no image for either image you must set the parameter value to "". Both images are now centred independently allowing variable size logo and progressbar images. Resized appletprogress.gif to match appletlogo.png size. 

Modified Paths:
--------------
    trunk/LWJGL/res/appletprogress.gif
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/res/appletprogress.gif
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-07-25 12:18:17 UTC (rev 3388)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-07-25 13:31:49 UTC (rev 3389)
@@ -283,14 +283,13 @@
 		setBackground(bgColor);
 		fgColor 		= getColor("boxfgcolor", Color.black);	
 
-		// load logos
-		logo 			= getImage(getParameter("al_logo"));
-		progressbar 	= getImage(getParameter("al_progressbar"));
-		
-		//sanity check
-		if(logo == null || progressbar == null) {
-			fatalErrorOccured("Unable to load logo and progressbar images", null);
+		// load logos, if value is "" then skip
+		if (!getParameter("al_logo").equals("")) {
+			logo 		= getImage(getParameter("al_logo"));
 		}
+		if (!getParameter("al_progressbar").equals("")) {
+			progressbar = getImage(getParameter("al_progressbar"));
+		}
 		
 		// check for lzma support
 		try {
@@ -460,22 +459,27 @@
 			
 			painting = true;
 			
-			// get logo position so its in the middle of applet
-			int x = 0, y = 0;
+			// get position at the middle of the offscreen buffer
+			int x = offscreen.getWidth(null)/2; 
+			int y = offscreen.getHeight(null)/2;
 			
-			if(logo != null) {
+			/*if(logo != null) {
 				x = (offscreen.getWidth(null) - logo.getWidth(null)) / 2;
 				y = (offscreen.getHeight(null) - logo.getHeight(null)) / 2;
-			}
+			}*/
 			
 			// draw logo
-			if (logo != null) og.drawImage(logoBuffer, x, y, this);
+			if (logo != null) {
+				og.drawImage(logoBuffer, x-logo.getWidth(null)/2, y-logo.getHeight(null)/2, this);
+			}
 			
 			// draw message
 			int messageX = (offscreen.getWidth(null) - fm.stringWidth(message)) / 2;
 			int messageY = y + 20;
-			if (logo != null) messageY += logoBuffer.getHeight(null);
 			
+			if (logo != null) messageY += logo.getHeight(null)/2;
+			else if (progressbar != null) messageY += progressbar.getHeight(null)/2;
+			
 			og.drawString(message, messageX, messageY);
 			
 			// draw subtaskmessage, if any
@@ -486,9 +490,9 @@
 
 			// draw loading bar, clipping it depending on percentage done
 			if (progressbar != null) {
-				int barSize = (progressbarBuffer.getWidth(null) * percentage) / 100;
-				og.clipRect(0, 0, x + barSize, offscreen.getHeight(null));
-				og.drawImage(progressbarBuffer, x, y, this);
+				int barSize = (progressbar.getWidth(null) * percentage) / 100;
+				og.clipRect(x-progressbar.getWidth(null)/2, 0, barSize, offscreen.getHeight(null));
+				og.drawImage(progressbarBuffer, x-progressbar.getWidth(null)/2, y-progressbar.getHeight(null)/2, this);
 			}
 			
 			painting = false;
@@ -527,7 +531,10 @@
 			g.fillRect(0, 0, buffer.getWidth(null), buffer.getHeight(null));
 			
 			// buffer background is cleared, so draw logo under progressbar
-			if (img == progressbar && logo != null) g.drawImage(logoBuffer, 0, 0, null);
+			if (img == progressbar && logo != null) {
+				g.drawImage(logoBuffer, progressbar.getWidth(null)/2-logo.getWidth(null)/2, 
+										progressbar.getHeight(null)/2-logo.getHeight(null)/2, null);
+			}
 			
 			g.drawImage(img, 0, 0, this);
 			g.dispose();
@@ -1453,6 +1460,9 @@
 		} catch (Exception e) {
 			/* */
 		}
+		
+		// show error as image could not be loaded
+		fatalErrorOccured("Unable to load logo and progressbar images", null);
 		return null;
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3388
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3388&view=rev
Author:   kappa1
Date:     2010-07-25 12:18:17 +0000 (Sun, 25 Jul 2010)

Log Message:
-----------
AppletLoader: actually fail with error message if logo images are not found or an error occurs when they are loaded, added missing MediaTracker step. Also prevent paint thread from null pointer exception when this happens.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-07-25 11:40:58 UTC (rev 3387)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-07-25 12:18:17 UTC (rev 3388)
@@ -405,7 +405,6 @@
 	 * @see java.awt.Container#paint(java.awt.Graphics)
 	 */
 	public void paint(Graphics g) {
-		
 		// don't paint loader if applet loaded
 		if(state == STATE_DONE) {
 			return;
@@ -416,16 +415,21 @@
 			offscreen = createImage(getWidth(), getHeight());
 			
 			// create buffers for animated gifs
-			logoBuffer = createImage(logo.getWidth(null), logo.getHeight(null));
-			progressbarBuffer = createImage(logo.getWidth(null), logo.getHeight(null));
+			if (logo != null) {
+				logoBuffer = createImage(logo.getWidth(null), logo.getHeight(null));
+				// add image observer, it will notify when next animated gif frame is ready 
+				offscreen.getGraphics().drawImage(logo, 0, 0, this);
+				// in case image is not animated fill image buffer once
+				imageUpdate(logo, ImageObserver.FRAMEBITS, 0, 0, 0, 0);
+			}
 			
-			// add image observer, it will notify when next animated gif frame is ready 
-			offscreen.getGraphics().drawImage(logo, 0, 0, this);
-			offscreen.getGraphics().drawImage(progressbar, 0, 0, this);
-			
-			// in case image is not animated fill image buffers once
-			imageUpdate(logo, ImageObserver.FRAMEBITS, 0, 0, 0, 0);
-			imageUpdate(progressbar, ImageObserver.FRAMEBITS, 0, 0, 0, 0);
+			if (progressbar != null) {
+				progressbarBuffer = createImage(progressbar.getWidth(null), progressbar.getHeight(null));
+				// add image observer, it will notify when next animated gif frame is ready 
+				offscreen.getGraphics().drawImage(progressbar, 0, 0, this);
+				// in case image is not animated fill image buffer once
+				imageUpdate(progressbar, ImageObserver.FRAMEBITS, 0, 0, 0, 0);
+			}
 		}
 
 		// draw everything onto an image before drawing to avoid flicker
@@ -436,14 +440,6 @@
 		og.setColor(bgColor);
 		og.fillRect(0, 0, offscreen.getWidth(null), offscreen.getHeight(null));
 
-		// get logo position so its in the middle of applet
-		int x = 0, y = 0;
-		
-		if(logo != null && !fatalError) {
-			x = (offscreen.getWidth(null) - logo.getWidth(null)) / 2;
-			y = (offscreen.getHeight(null) - logo.getHeight(null)) / 2;
-		}
-
 		og.setColor(fgColor);
 		String message = getDescriptionForState();
 
@@ -464,12 +460,22 @@
 			
 			painting = true;
 			
+			// get logo position so its in the middle of applet
+			int x = 0, y = 0;
+			
+			if(logo != null) {
+				x = (offscreen.getWidth(null) - logo.getWidth(null)) / 2;
+				y = (offscreen.getHeight(null) - logo.getHeight(null)) / 2;
+			}
+			
 			// draw logo
-			og.drawImage(logoBuffer, x, y, this);
+			if (logo != null) og.drawImage(logoBuffer, x, y, this);
 			
 			// draw message
 			int messageX = (offscreen.getWidth(null) - fm.stringWidth(message)) / 2;
-			int messageY = y + logoBuffer.getHeight(null) + 20;
+			int messageY = y + 20;
+			if (logo != null) messageY += logoBuffer.getHeight(null);
+			
 			og.drawString(message, messageX, messageY);
 			
 			// draw subtaskmessage, if any
@@ -479,9 +485,11 @@
 			}
 
 			// draw loading bar, clipping it depending on percentage done
-			int barSize = (progressbarBuffer.getWidth(null) * percentage) / 100;
-			og.clipRect(0, 0, x + barSize, offscreen.getHeight(null));
-			og.drawImage(progressbarBuffer, x, y, this);
+			if (progressbar != null) {
+				int barSize = (progressbarBuffer.getWidth(null) * percentage) / 100;
+				og.clipRect(0, 0, x + barSize, offscreen.getHeight(null));
+				og.drawImage(progressbarBuffer, x, y, this);
+			}
 			
 			painting = false;
 		}
@@ -519,7 +527,7 @@
 			g.fillRect(0, 0, buffer.getWidth(null), buffer.getHeight(null));
 			
 			// buffer background is cleared, so draw logo under progressbar
-			if (img == progressbar) g.drawImage(logoBuffer, 0, 0, null);
+			if (img == progressbar && logo != null) g.drawImage(logoBuffer, 0, 0, null);
 			
 			g.drawImage(img, 0, 0, this);
 			g.dispose();
@@ -1438,7 +1446,10 @@
 	        tracker.addImage(image, 0);
 	        tracker.waitForAll();
 	        
-	        return image;
+	        // if no errors return image
+	        if (!tracker.isErrorAny()) {
+	        	return image;
+	        }
 		} catch (Exception e) {
 			/* */
 		}
@@ -1572,5 +1583,4 @@
 		}
 	}	
 	
-
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3387
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3387&view=rev
Author:   kappa1
Date:     2010-07-25 11:40:58 +0000 (Sun, 25 Jul 2010)

Log Message:
-----------
AppletLoader: fix error message so that it actually uses the error message string.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-07-24 20:00:58 UTC (rev 3386)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-07-25 11:40:58 UTC (rev 3387)
@@ -211,9 +211,6 @@
 	/** whether a fatal error occured */
 	protected boolean	fatalError;
 	
-	/** fatal error that occured */
-	protected String	fatalErrorDescription;
-	
 	/** whether we're running in debug mode */
 	protected boolean 	debugMode;
 	
@@ -454,10 +451,6 @@
 		if (fatalError) {
 			String[] errorMessage = (certificateRefused) ? certificateRefusedMessage : genericErrorMessage;
 			
-			if (!certificateRefused) {
-				errorMessage[errorMessage.length-1] = fatalErrorDescription;
-			}			
-			
 			for(int i=0; i<errorMessage.length; i++) {
 				if(errorMessage[i] != null) {
 					int messageX = (offscreen.getWidth(null) - fm.stringWidth(errorMessage[i])) / 2;
@@ -767,7 +760,7 @@
 			fatalErrorOccured(ace.getMessage(), ace);
 			certificateRefused = true;
 		} catch (Exception e) {
-			fatalErrorOccured(e.getMessage(), e);
+			fatalErrorOccured("This occurred while '" + getDescriptionForState() + "'", e);
 		} finally {
 			loaderThread = null;
 		}
@@ -1547,9 +1540,10 @@
 	 */
 	protected void fatalErrorOccured(String error, Exception e) {
 		fatalError = true;
-		fatalErrorDescription = "This occurred while '" + getDescriptionForState() + "'";
-		System.out.println(fatalErrorDescription);
+		genericErrorMessage[genericErrorMessage.length-1] = error;
+		System.out.println(error);
 		if(e != null) {
+			System.out.println(e.getMessage());
 			System.out.println(generateStacktrace(e));
 		}
 		repaint();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.