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

Revision: 3695
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3695&view=rev
Author:   kappa1
Date:     2011-11-12 21:50:55 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
bump native version number for OS X natives due to recent changes to them

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java

Modified: trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java	2011-11-12 21:31:00 UTC (rev 3694)
+++ trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java	2011-11-12 21:50:55 UTC (rev 3695)
@@ -42,7 +42,7 @@
  * $Id$
  */
 final class MacOSXSysImplementation extends J2SESysImplementation {
-	private static final int JNI_VERSION = 21;
+	private static final int JNI_VERSION = 22;
 
 	static {
 		// Make sure AWT is properly initialized. This avoids hangs on Mac OS X 10.3

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

Revision: 3694
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3694&view=rev
Author:   kappa1
Date:     2011-11-12 21:31:00 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
AppletLoader: minor tweak to show better update message when checking cache files for changes

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	2011-11-12 21:03:48 UTC (rev 3693)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-11-12 21:31:00 UTC (rev 3694)
@@ -180,30 +180,33 @@
 
 	/** checking for already downloaded files */
 	public static final int STATE_CHECKING_CACHE 			= 4;
+	
+	/** checking if any updates are available for cache files */
+	public static final int STATE_CHECKING_FOR_UPDATES		= 5;
 
 	/** downloading packages */
-	public static final int STATE_DOWNLOADING 				= 5;
+	public static final int STATE_DOWNLOADING 				= 6;
 
 	/** extracting packages */
-	public static final int STATE_EXTRACTING_PACKAGES 		= 6;
+	public static final int STATE_EXTRACTING_PACKAGES 		= 7;
 	
 	/** validating packages */
-	public static final int STATE_VALIDATING_PACKAGES 		= 7;
+	public static final int STATE_VALIDATING_PACKAGES 		= 8;
 
 	/** updating the classpath */
-	public static final int STATE_UPDATING_CLASSPATH 		= 8;
+	public static final int STATE_UPDATING_CLASSPATH 		= 9;
 
 	/** switching to real applet */
-	public static final int STATE_SWITCHING_APPLET 			= 9;
+	public static final int STATE_SWITCHING_APPLET 			= 10;
 
 	/** initializing real applet */
-	public static final int STATE_INITIALIZE_REAL_APPLET	= 10;
+	public static final int STATE_INITIALIZE_REAL_APPLET	= 11;
 
 	/** stating real applet */
-	public static final int STATE_START_REAL_APPLET 		= 11;
+	public static final int STATE_START_REAL_APPLET 		= 12;
 
 	/** done */
-	public static final int STATE_DONE 						= 12;
+	public static final int STATE_DONE 						= 13;
 
 	/** used to calculate length of progress bar */
 	protected volatile int percentage;
@@ -678,6 +681,8 @@
 				return "Determining packages to load";
 			case STATE_CHECKING_CACHE:
 				return "Calculating download size";
+			case STATE_CHECKING_FOR_UPDATES:
+				return "Checking for updates";
 			case STATE_DOWNLOADING:
 				return "Downloading packages";
 			case STATE_EXTRACTING_PACKAGES:
@@ -1343,6 +1348,7 @@
 
 		// if timestamps file exists, load it
 		if (timestampsFile.exists()) {
+			setState(STATE_CHECKING_FOR_UPDATES);
 			filesLastModified = readHashMapFile(timestampsFile);
 		}
 

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

Revision: 3693
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3693&view=rev
Author:   kappa1
Date:     2011-11-12 21:03:48 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
Add the QuartzCore framework to the list of frameworks available to the linker

Modified Paths:
--------------
    trunk/LWJGL/platform_build/macosx_ant/build.xml

Modified: trunk/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/macosx_ant/build.xml	2011-11-12 20:45:35 UTC (rev 3692)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml	2011-11-12 21:03:48 UTC (rev 3693)
@@ -35,7 +35,7 @@
 
 	<target name="link">
 		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
-			<arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon -framework OpenGL -framework JavaNativeFoundation -F/System/Library/Frameworks/JavaVM.framework/Frameworks"/>
+			<arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon -framework OpenGL -framework QuartzCore -framework JavaNativeFoundation -F/System/Library/Frameworks/JavaVM.framework/Frameworks"/>
 			<fileset dir="${objdir}" includes="*.o"/>
 		</apply>
 		<apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">

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

Revision: 3692
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3692&view=rev
Author:   kappa1
Date:     2011-11-12 20:45:35 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
MacOS: further limit CALayer to only be used when running as an Applet

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java	2011-11-12 19:01:28 UTC (rev 3691)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java	2011-11-12 20:45:35 UTC (rev 3692)
@@ -32,6 +32,8 @@
 package org.lwjgl.opengl;
 
 import java.awt.Canvas;
+import java.awt.Component;
+import java.applet.Applet;
 import java.nio.ByteBuffer;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
@@ -81,7 +83,7 @@
 		// due to performance..
         
 		// Allow the use of a Core Animation Layer only when using non fullscreen Display.setParent() or AWTGLCanvas
-		final boolean allowCALayer = (Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas;
+		final boolean allowCALayer = ((Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas) && isApplet(component);
 		
 		if (firstLockSucceeded)
 			return lockAndInitHandle(lock_buffer, component, allowCALayer);
@@ -105,4 +107,22 @@
 	}
 
 	private static native void nUnlock(ByteBuffer lock_buffer) throws LWJGLException;
+	
+	/**
+	 * This method will return true if the component is running in an applet
+	 */
+	public boolean isApplet(Canvas component) {
+		
+		Component parent = component.getParent();
+		
+		while (parent != null) {
+			if (parent instanceof Applet) {
+				return true;
+			}
+			parent = parent.getParent();
+		}
+		
+		// not an applet
+		return false;
+	}
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java	2011-11-12 19:01:28 UTC (rev 3691)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java	2011-11-12 20:45:35 UTC (rev 3692)
@@ -51,7 +51,7 @@
 
 	protected void initHandle(Canvas component) throws LWJGLException {
 		// Allow the use of a Core Animation Layer only when using non fullscreen Display.setParent() or AWTGLCanvas
-		final boolean allowCALayer = (Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas;
+		final boolean allowCALayer = ((Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas) && awt_surface.isApplet(component);
 		
 		nInitHandle(awt_surface.lockAndGetHandle(component), getHandle(), allowCALayer);
 	}

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

Revision: 3691
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3691&view=rev
Author:   kappa1
Date:     2011-11-12 19:01:28 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
MacOS: remove the use of 'Blocks' in the Cocoa native code by switching to 'Selectors', should allow natives to be binary compatible with OS X 10.5 now.

Modified Paths:
--------------
    trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m

Modified: trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m
===================================================================
--- trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m	2011-11-10 18:46:43 UTC (rev 3690)
+++ trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m	2011-11-12 19:01:28 UTC (rev 3691)
@@ -62,7 +62,22 @@
 
 @end
 
+// forward declaration
+@interface AttachLayerOnMainThread : NSObject {
+    MacOSXPeerInfo *peer_info;
+    JAWT_MacOSXDrawingSurfaceInfo *macosx_dsi;
+}
 
+- (void) attachLayer;
+
+- (MacOSXPeerInfo*) peer_info;
+- (JAWT_MacOSXDrawingSurfaceInfo) macosx_dsi;
+
+- (void) setPeer_info: (MacOSXPeerInfo*)input;
+- (void) setMacosx_dsi: (JAWT_MacOSXDrawingSurfaceInfo*)input;
+
+@end
+
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXCanvasPeerInfo_nInitHandle
 (JNIEnv *env, jclass clazz, jobject lock_buffer_handle, jobject peer_info_handle, jboolean allowCALayer) {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -97,18 +112,15 @@
 			}
         
 			if (macosx_dsi != NULL) {
-				[JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
-					// attach the "root layer" to the AWT Canvas surface layers
-					id <JAWT_SurfaceLayers> surfaceLayers = (id <JAWT_SurfaceLayers>)macosx_dsi;//dsi->platformInfo;
-					if(surfaceLayers.layer == NULL) {
-						PBufferGLLayer *caGLLayer = [[PBufferGLLayer new] autorelease];
-						caGLLayer.peer_info = peer_info;
-						caGLLayer.asynchronous = YES;
-						caGLLayer.needsDisplayOnBoundsChange = YES;
-						caGLLayer.opaque = YES;
-						surfaceLayers.layer = caGLLayer;                
-					}
-				}];
+				
+				AttachLayerOnMainThread *attachLayerOnMainThread = [[AttachLayerOnMainThread new] autorelease];
+				attachLayerOnMainThread.peer_info = peer_info;
+				attachLayerOnMainThread.macosx_dsi = macosx_dsi;
+				
+				[JNFRunLoop performOnMainThread:@selector(attachLayer)
+													on:attachLayerOnMainThread
+													withObject:nil
+													waitUntilDone:YES];
 			}
 			
 			[pool release];
@@ -122,6 +134,40 @@
 	[pool release];
 }
 
+// Object class to CALayer on AppKit Thread
+@implementation AttachLayerOnMainThread
+
+- (void) attachLayer {
+    // attach the "root layer" to the AWT Canvas surface layers
+	id <JAWT_SurfaceLayers> surfaceLayers = (id <JAWT_SurfaceLayers>)macosx_dsi;//dsi->platformInfo;
+	if(surfaceLayers.layer == NULL) {
+		PBufferGLLayer *caGLLayer = [[PBufferGLLayer new] autorelease];
+		caGLLayer.peer_info = peer_info;
+		caGLLayer.asynchronous = YES;
+		caGLLayer.needsDisplayOnBoundsChange = YES;
+		caGLLayer.opaque = YES;
+		surfaceLayers.layer = caGLLayer;                
+	}
+}
+
+- (MacOSXPeerInfo*) peer_info {
+    return peer_info;
+}
+
+- (JAWT_MacOSXDrawingSurfaceInfo*) macosx_dsi {
+    return macosx_dsi;
+}
+
+- (void) setPeer_info: (MacOSXPeerInfo*)input {
+    peer_info = input;
+}
+
+- (void) setMacosx_dsi: (JAWT_MacOSXDrawingSurfaceInfo*)input {
+    macosx_dsi = input;
+}
+
+@end
+
 // rotates a red square when asked to draw
 @implementation PBufferGLLayer
 

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