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-serv28973/win32

Modified Files:
	org_lwjgl_opengl_BaseGL.cpp 
Log Message:
Added more pixelformat tests to win32

Index: org_lwjgl_opengl_BaseGL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_BaseGL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_BaseGL.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- org_lwjgl_opengl_BaseGL.cpp	12 Dec 2002 20:06:15 -0000	1.7
+++ org_lwjgl_opengl_BaseGL.cpp	12 Dec 2002 22:04:05 -0000	1.8
@@ -60,15 +60,16 @@
 		printf("No window handle\n");
 		return JNI_FALSE;
 	}
+	int flags = PFD_DRAW_TO_WINDOW |   // support window 
+		PFD_SUPPORT_OPENGL |   // support OpenGL 
+		PFD_GENERIC_ACCELERATED |
+		PFD_DOUBLEBUFFER;      // double buffered 
 
 	PIXELFORMATDESCRIPTOR pfd = { 
 		sizeof(PIXELFORMATDESCRIPTOR),   // size of this pfd 
 		1,                     // version number 
-		PFD_DRAW_TO_WINDOW |   // support window 
-		PFD_SUPPORT_OPENGL |   // support OpenGL 
-		PFD_GENERIC_ACCELERATED |
-		PFD_DOUBLEBUFFER,      // double buffered 
-		PFD_TYPE_RGBA,         // RGBA type 
+		flags,         // RGBA type 
+		PFD_TYPE_RGBA,
 		(BYTE)colorBits,       
 		0, 0, 0, 0, 0, 0,      // color bits ignored 
 		(BYTE)alphaBits,       
@@ -86,7 +87,7 @@
 	// Ensure desktop color depth is adequate
 	int availableBitDepth = GetDeviceCaps(hdc, BITSPIXEL);
 	if (availableBitDepth < colorBits) {
-		printf("This application requires a greater colour depth.");
+		printf("This application requires a greater colour depth.\n");
 		return JNI_FALSE;
 	};
 
@@ -97,8 +98,34 @@
 	if (iPixelFormat == 0) {
 		printf("Failed to choose pixel format.\n");
 		return JNI_FALSE;
-	}
-
+	}
+
+	PIXELFORMATDESCRIPTOR desc;
+	if (DescribePixelFormat(hdc, iPixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &desc) == 0) {
+		printf("Could not describe pixel format\n");
+		return JNI_FALSE;
+	}
+
+	if (desc.cColorBits < colorBits) {
+		printf("This application requires a greater colour depth.\n");
+		return JNI_FALSE;
+	}
+
+	if (desc.cStencilBits < stencilBits) {
+		printf("This application requires a greater stencil depth.\n");
+		return JNI_FALSE;
+	}
+
+	if (desc.cDepthBits < depthBits) {
+		printf("This application requires a greater depth buffer depth.\n");
+		return JNI_FALSE;
+	}
+
+	if ((desc.dwFlags & flags) == 0) {
+		printf("Capabilities not supported.\n");
+		return JNI_FALSE;
+	}
+
 #ifdef _DEBUG
 	printf("Pixel format is %d\n", iPixelFormat);
 #endif

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

Modified Files:
	org_lwjgl_opengl_BaseGL.cpp 
Log Message:
Moved print of extensions to debug version

Index: org_lwjgl_opengl_BaseGL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_BaseGL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_BaseGL.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_opengl_BaseGL.cpp	11 Dec 2002 10:14:08 -0000	1.6
+++ org_lwjgl_opengl_BaseGL.cpp	12 Dec 2002 20:06:15 -0000	1.7
@@ -125,13 +125,14 @@
 		return JNI_FALSE;
 	}
 
+#ifdef _DEBUG
 	char * p = (char *) glGetString(GL_EXTENSIONS);
     if (NULL == p) {
         printf("NO extensions available\n");
     } else {
 		printf("Available extensions:\n%s\n", p);
 	}
-	
+#endif	
 	return JNI_TRUE;
 }
 

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

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
Removed a printf

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_input_Mouse.cpp	12 Dec 2002 19:51:20 -0000	1.3
+++ org_lwjgl_input_Mouse.cpp	12 Dec 2002 20:04:56 -0000	1.4
@@ -135,7 +135,6 @@
 		printf("Failed to acquire mouse\n");
 #endif
 	}
-	printf("Acquired mouse\n");
 	return JNI_TRUE;
 }
 

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

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
Fixed a mouse button state array bug

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- org_lwjgl_input_Mouse.cpp	30 Nov 2002 21:25:00 -0000	1.9
+++ org_lwjgl_input_Mouse.cpp	12 Dec 2002 19:51:20 -0000	1.10
@@ -233,13 +233,13 @@
 			case ButtonPress:
 				switch (event.xbutton.button) {
 					case Button1:
-						buttons[0] = 1;
+						buttons[0] = JNI_TRUE;
 						break;
 					case Button2:
-						buttons[1] = 1;
+						buttons[1] = JNI_TRUE;
 						break;
 					case Button3:
-						buttons[2] = 1;
+						buttons[2] = JNI_TRUE;
 						break;
 					case Button4:
 						current_z--;
@@ -253,13 +253,13 @@
 			case ButtonRelease:
 				switch (event.xbutton.button) {
 					case Button1:
-						buttons[0] = 0;
+						buttons[0] = JNI_FALSE;
 						break;
 					case Button2:
-						buttons[1] = 0;
+						buttons[1] = JNI_FALSE;
 						break;
 					case Button3:
-						buttons[2] = 0;
+						buttons[2] = JNI_FALSE;
 						break;
 					case Button4: /* Fall through */
 					case Button5:
@@ -324,9 +324,7 @@
 	last_y = current_y;
 	last_z = current_z;
 	jbooleanArray buttonsArray = (jbooleanArray) env->GetStaticObjectField(clazz, fid_button);
-	unsigned char * class_buttons = (unsigned char *) env->GetPrimitiveArrayCritical(buttonsArray, NULL);
-	memcpy(class_buttons, buttons, NUM_BUTTONS*sizeof(unsigned char));
-	env->ReleasePrimitiveArrayCritical(buttonsArray, class_buttons, 0);
+	env->SetBooleanArrayRegion(buttonsArray, 0, NUM_BUTTONS, buttons);
 	if (current_fullscreen)
 		warpPointer();
 }

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

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
Fixed a mouse button state array bug

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_input_Mouse.cpp	15 Aug 2002 15:43:02 -0000	1.2
+++ org_lwjgl_input_Mouse.cpp	12 Dec 2002 19:51:20 -0000	1.3
@@ -121,7 +121,7 @@
 	}
 
 	// Grab non-exclusive foreground access to device
-	if (lpdiMouse->SetCooperativeLevel(hwnd, DISCL_NONEXCLUSIVE | DISCL_FOREGROUND) != DI_OK) {
+	if (lpdiMouse->SetCooperativeLevel(hwnd, DISCL_EXCLUSIVE | DISCL_FOREGROUND) != DI_OK) {
 		printf("Failed to set mouse coop\n");
 		return JNI_FALSE;
 	}
@@ -134,7 +134,8 @@
 #ifdef _DEBUG
 		printf("Failed to acquire mouse\n");
 #endif
-	}
+	}
+	printf("Acquired mouse\n");
 	return JNI_TRUE;
 }
 
@@ -187,9 +188,12 @@
 		env->SetStaticIntField(clazz, fid_dy, (jint)diMouseState.lY);
 		env->SetStaticIntField(clazz, fid_dz, (jint)diMouseState.lZ);
 		jbooleanArray buttonsArray = (jbooleanArray) env->GetStaticObjectField(clazz, fid_button);
-		BYTE * buttons = (BYTE *) env->GetPrimitiveArrayCritical(buttonsArray, NULL);
-		memcpy(buttons, diMouseState.rgbButtons, 4);
-		env->ReleasePrimitiveArrayCritical(buttonsArray, buttons, 0);
+		for (int i = 0; i < 4; i++)
+			if (diMouseState.rgbButtons[i] != 0)
+				diMouseState.rgbButtons[i] = JNI_TRUE;
+			else
+				diMouseState.rgbButtons[i] = JNI_FALSE;
+		env->SetBooleanArrayRegion(buttonsArray, 0, 4, diMouseState.rgbButtons);
 	} else {
 #ifdef _DEBUG
 		printf("Failed to get mouse device state\n");