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:/tmp/cvs-serv23904/src/native/win32

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
Gamma back in

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- org_lwjgl_Display.cpp	16 Sep 2003 08:29:16 -0000	1.48
+++ org_lwjgl_Display.cpp	16 Sep 2003 15:42:25 -0000	1.49
@@ -59,39 +59,39 @@
  */
 JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_Display_nGetAvailableDisplayModes
   (JNIEnv * env, jclass clazz)
-{

-	jobjectArray result = GetAvailableDisplayModesEx(env);

-	if (result == NULL) {

-#ifdef _DEBUG

-		printf("Extended display mode selection failed, using fallback\n");

-#endif

-		result = GetAvailableDisplayModes(env);

-	}

-	return result;

+{
+	jobjectArray result = GetAvailableDisplayModesEx(env);
+	if (result == NULL) {
+#ifdef _DEBUG
+		printf("Extended display mode selection failed, using fallback\n");
+#endif
+		result = GetAvailableDisplayModes(env);
+	}
+	return result;
 }
 
 /**
  * Choose displaymodes using extended codepath (multiple displaydevices)
  */
-jobjectArray GetAvailableDisplayModesEx(JNIEnv * env) {

-	typedef BOOL (WINAPI * EnumDisplayDevicesAPROC)(IN LPCSTR lpDevice, IN DWORD iDevNum, OUT PDISPLAY_DEVICEA lpDisplayDevice, IN DWORD dwFlags);

-	typedef BOOL (WINAPI * EnumDisplaySettingsExAPROC)(IN LPCSTR lpszDeviceName, IN DWORD iModeNum, OUT LPDEVMODEA lpDevMode, IN DWORD dwFlags);

-	EnumDisplayDevicesAPROC EnumDisplayDevicesA;

-	EnumDisplaySettingsExAPROC EnumDisplaySettingsExA;

-

-	HMODULE lib_handle = LoadLibrary("user32.dll");

-	if (lib_handle == NULL) {

-#ifdef _DEBUG

-		printf("Could not load user32.dll\n");

-#endif

-		return NULL;

-	}

-	EnumDisplayDevicesA = (EnumDisplayDevicesAPROC)GetProcAddress(lib_handle, "EnumDisplayDevicesA");

-	if (EnumDisplayDevicesA == NULL)

-		return NULL;

-	EnumDisplaySettingsExA = (EnumDisplaySettingsExAPROC)GetProcAddress(lib_handle, "EnumDisplaySettingsExA");

-	if (EnumDisplaySettingsExA == NULL)

-		return NULL;

+jobjectArray GetAvailableDisplayModesEx(JNIEnv * env) {
+	typedef BOOL (WINAPI * EnumDisplayDevicesAPROC)(IN LPCSTR lpDevice, IN DWORD iDevNum, OUT PDISPLAY_DEVICEA lpDisplayDevice, IN DWORD dwFlags);
+	typedef BOOL (WINAPI * EnumDisplaySettingsExAPROC)(IN LPCSTR lpszDeviceName, IN DWORD iModeNum, OUT LPDEVMODEA lpDevMode, IN DWORD dwFlags);
+	EnumDisplayDevicesAPROC EnumDisplayDevicesA;
+	EnumDisplaySettingsExAPROC EnumDisplaySettingsExA;
+
+	HMODULE lib_handle = LoadLibrary("user32.dll");
+	if (lib_handle == NULL) {
+#ifdef _DEBUG
+		printf("Could not load user32.dll\n");
+#endif
+		return NULL;
+	}
+	EnumDisplayDevicesA = (EnumDisplayDevicesAPROC)GetProcAddress(lib_handle, "EnumDisplayDevicesA");
+	if (EnumDisplayDevicesA == NULL)
+		return NULL;
+	EnumDisplaySettingsExA = (EnumDisplaySettingsExAPROC)GetProcAddress(lib_handle, "EnumDisplaySettingsExA");
+	if (EnumDisplaySettingsExA == NULL)
+		return NULL;
 
 	int i = 0, j = 0, n = 0;
 	int AvailableModes = 0;
@@ -146,7 +146,7 @@
 				env->SetObjectArrayElement(ret, n++, displayMode);
 			}
 		}
-	}

+	}
 	FreeLibrary(lib_handle);
 	return ret;
 }
@@ -394,9 +394,6 @@
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_Display_setGammaRamp
   (JNIEnv * env, jclass clazz, jobject gammaRampBuffer)
 {
-
-	return JNI_FALSE;
-
 	const float *gammaRamp = (const float *)env->GetDirectBufferAddress(gammaRampBuffer);
 	// Turn array of floats into array of RGB WORDs
 

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input
In directory sc8-pr-cvs1:/tmp/cvs-serv23300/src/java/org/lwjgl/input

Modified Files:
	Controller.java Cursor.java Mouse.java 
Log Message:
Lazy library instantiation

Index: Controller.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Controller.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Controller.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Controller.java	17 Aug 2003 18:48:29 -0000	1.7
+++ Controller.java	16 Sep 2003 15:39:46 -0000	1.8
@@ -132,10 +132,9 @@
 	private static String[] buttonName;
 	private static final Map buttonMap = new HashMap(8);
 
-	static {
-		initialize();
-	}
-
+	/** Lazy initialization */
+	private static boolean initialized;
+	
 	/**
 	 * Controller cannot be constructed.
 	 */
@@ -156,6 +155,7 @@
 			buttonMap.put(buttonName[i], new Integer(i));
 		}
 		
+		initialized = true;
 	}
 
 	/**
@@ -163,6 +163,10 @@
 	 * @throws Exception if the controller could not be created for any reason
 	 */
 	public static void create() throws Exception {
+		if (!initialized) {
+			initialize();
+		}
+		
 		if (created) {
 			return;
 		}

Index: Cursor.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Cursor.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Cursor.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Cursor.java	17 Aug 2003 16:38:57 -0000	1.11
+++ Cursor.java	16 Sep 2003 15:39:46 -0000	1.12
@@ -50,9 +50,8 @@
 
 public class Cursor {
 
-	static {
-		System.loadLibrary(Sys.getLibraryName());
-	}
+	/** Lazy initialization */
+	private static boolean initialized = false;
 
 	/**
 	 * The native handle to the cursor
@@ -75,14 +74,22 @@
 	 * @throws Exception if the cursor could not be created for any reason
 	 */
 	public Cursor(int width, int height, int xHotspot, int yHotspot, int numImages, IntBuffer images, IntBuffer delays) throws Exception {
+		if (!initialized) {
+			initialize();
+		}
 		assert Mouse.isCreated();
 		assert width*height*numImages <= images.remaining(): "width*height*numImages > images.remaining()";
 		assert delays == null || numImages <= delays.remaining(): "delays != null && numImages > delays.remaining()";
-		assert xHotspot <= width && xHotspot >= 0: "xHotspot > width || xHotspot < 0";
-		assert yHotspot <= height && yHotspot >= 0: "yHotspot > height || yHotspot < 0";
+		assert xHotspot < width && xHotspot >= 0: "xHotspot > width || xHotspot < 0";
+		assert yHotspot < height && yHotspot >= 0: "yHotspot > height || yHotspot < 0";
                 IntBuffer images_copy = ByteBuffer.allocateDirect(images.remaining()*4).order(ByteOrder.nativeOrder()).asIntBuffer();
 		flipImages(width, height, numImages, images, images_copy);
 		nativeHandle = nCreateCursor(width, height, xHotspot, height - yHotspot, numImages, images_copy, 0, delays, delays != null ? delays.position() : 0);
+	}
+	
+	private static void initialize() {
+		System.loadLibrary(Sys.getLibraryName());
+		initialized = true;
 	}
 
 	private static void flipImages(int width, int height, int numImages, IntBuffer images, IntBuffer images_copy) {

Index: Mouse.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Mouse.java	29 Aug 2003 08:00:43 -0000	1.24
+++ Mouse.java	16 Sep 2003 15:39:46 -0000	1.25
@@ -83,9 +83,8 @@
 	private static String[] buttonName;
 	private static final Map buttonMap = new HashMap(16);
 
-	static {
-		initialize();
-	}
+	/** Lazy initialization */
+	private static boolean initialized;
 
 	/**
 	 * Mouse cannot be constructed.
@@ -190,6 +189,8 @@
 			buttonName[i] = "BUTTON" + i;
 			buttonMap.put(buttonName[i], new Integer(i));
 		}
+		
+		initialized = true;
 	}
 
 	/**
@@ -203,17 +204,20 @@
 	 * @throws Exception if the mouse could not be created for any reason
 	 */
 	public static void create() throws Exception {
-		if (created)
+		if (!initialized) {
+			initialize();
+		}
+		if (created) {
 			return;
-		if (!nCreate())
+		}
+		if (!nCreate()) {
 			throw new Exception("The mouse could not be created.");
+		}
 		created = true;
 		currentCursor = null;
 
-		//set mouse buttons
+		// set mouse buttons
 		buttons = new boolean[buttonCount];
-		
-
 	}
 
 	/**
@@ -271,7 +275,10 @@
 	 */
 	public static boolean isButtonDown(int button) {
 		assert created : "The mouse has not been created.";
-		return buttons[button];
+		if (button >= buttonCount)
+			return false;
+		else
+			return buttons[button];
 	}
 	
 	/**
@@ -280,7 +287,7 @@
 	 * @return a String with the button's human readable name in it or null if the button is unnamed
 	 */
 	public static String getButtonName(int button) {
-		if (button < 0 || button >= buttonName.length)
+		if (button >= buttonName.length)
 			return null;
 		else
 			return buttonName[button];

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv31580

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
Tried harder to fix NT display mode selection

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- org_lwjgl_Display.cpp	10 Sep 2003 22:55:25 -0000	1.47
+++ org_lwjgl_Display.cpp	16 Sep 2003 08:29:16 -0000	1.48
@@ -59,32 +59,40 @@
  */
 JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_Display_nGetAvailableDisplayModes
   (JNIEnv * env, jclass clazz)
-{
-  // Determine whether to use a display name or NULL, which depends on the operating
-	// system
-	OSVERSIONINFO osvi;
-
-	osvi.dwOSVersionInfoSize = sizeof(osvi);
-	GetVersionEx(&osvi);
-	
-	if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion >= 5 ||
-            osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS && osvi.dwMinorVersion >= 10) {
-#ifdef _DEBUG
-		printf("Selecting extended display mode check\n");
-#endif	
-		return GetAvailableDisplayModesEx(env);
-	} else {
-#ifdef _DEBUG
-		printf("Selecting standard display mode check");
-#endif	
-		return GetAvailableDisplayModes(env);
-	}
+{

+	jobjectArray result = GetAvailableDisplayModesEx(env);

+	if (result == NULL) {

+#ifdef _DEBUG

+		printf("Extended display mode selection failed, using fallback\n");

+#endif

+		result = GetAvailableDisplayModes(env);

+	}

+	return result;

 }
 
 /**
  * Choose displaymodes using extended codepath (multiple displaydevices)
  */
-jobjectArray GetAvailableDisplayModesEx(JNIEnv * env) {
+jobjectArray GetAvailableDisplayModesEx(JNIEnv * env) {

+	typedef BOOL (WINAPI * EnumDisplayDevicesAPROC)(IN LPCSTR lpDevice, IN DWORD iDevNum, OUT PDISPLAY_DEVICEA lpDisplayDevice, IN DWORD dwFlags);

+	typedef BOOL (WINAPI * EnumDisplaySettingsExAPROC)(IN LPCSTR lpszDeviceName, IN DWORD iModeNum, OUT LPDEVMODEA lpDevMode, IN DWORD dwFlags);

+	EnumDisplayDevicesAPROC EnumDisplayDevicesA;

+	EnumDisplaySettingsExAPROC EnumDisplaySettingsExA;

+

+	HMODULE lib_handle = LoadLibrary("user32.dll");

+	if (lib_handle == NULL) {

+#ifdef _DEBUG

+		printf("Could not load user32.dll\n");

+#endif

+		return NULL;

+	}

+	EnumDisplayDevicesA = (EnumDisplayDevicesAPROC)GetProcAddress(lib_handle, "EnumDisplayDevicesA");

+	if (EnumDisplayDevicesA == NULL)

+		return NULL;

+	EnumDisplaySettingsExA = (EnumDisplaySettingsExAPROC)GetProcAddress(lib_handle, "EnumDisplaySettingsExA");

+	if (EnumDisplaySettingsExA == NULL)

+		return NULL;

+
 	int i = 0, j = 0, n = 0;
 	int AvailableModes = 0;
 
@@ -98,12 +106,12 @@
 	DisplayDevice.cb = sizeof(DISPLAY_DEVICE);
   
   //enumerate all displays, and all of their displaymodes
-	while(EnumDisplayDevices(NULL, i++, &DisplayDevice, 0) != 0) {
+	while(EnumDisplayDevicesA(NULL, i++, &DisplayDevice, 0) != 0) {
 #ifdef _DEBUG
 	  printf("Querying %s device\n", DisplayDevice.DeviceString);
 #endif
 		j = 0;
-		while(EnumDisplaySettingsEx(DisplayDevice.DeviceName, j++, &DevMode, 0) != 0) {
+		while(EnumDisplaySettingsExA(DisplayDevice.DeviceName, j++, &DevMode, 0) != 0) {
 #ifdef _DEBUG
 			printf("Checking setting #%d\n", j);
 #endif
@@ -125,9 +133,9 @@
 	jmethodID displayModeConstructor = env->GetMethodID(displayModeClass, "<init>", "(IIII)V");
   
 	i = 0, n = 0;
-	while(EnumDisplayDevices(NULL, i++, &DisplayDevice, 0) != 0) {
+	while(EnumDisplayDevicesA(NULL, i++, &DisplayDevice, 0) != 0) {
 		j = 0;
-		while(EnumDisplaySettingsEx(DisplayDevice.DeviceName, j++, &DevMode, 0) != 0) {
+		while(EnumDisplaySettingsExA(DisplayDevice.DeviceName, j++, &DevMode, 0) != 0) {
 			// Filter out indexed modes
 			if (DevMode.dmBitsPerPel > 8) {
 				jobject displayMode;
@@ -138,7 +146,8 @@
 				env->SetObjectArrayElement(ret, n++, displayMode);
 			}
 		}
-	}
+	}

+	FreeLibrary(lib_handle);
 	return ret;
 }