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

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

Modified Files:
	Timer.java 
Log Message:
Now copes with processors that adjust their clockspeed

Index: Timer.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/Timer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Timer.java	12 Jun 2004 20:28:27 -0000	1.3
+++ Timer.java	7 Jul 2004 22:24:33 -0000	1.4
@@ -47,7 +47,11 @@
 public class Timer {
 
 	// Record the timer resolution on classload
-	private static final long resolution = Sys.getTimerResolution();
+	private static long resolution = Sys.getTimerResolution();
+	
+	// Every so often we will re-query the timer resolution
+	private static final int QUERY_INTERVAL = 1000; // in calls to tick()
+	private static int queryCount = 0;
 
 	// Globally keeps track of time for all instances of Timer	
 	private static long currentTime;
@@ -129,6 +133,13 @@
 	 */
 	public static void tick() {
 		currentTime = Sys.getTime();
+		
+		// Periodically refresh the timer resolution:
+		queryCount ++;
+		if (queryCount > QUERY_INTERVAL) {
+			queryCount = 0;
+			resolution = Sys.getTimerResolution();
+		}
 	}
 	
 	/**

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

Modified Files:
	org_lwjgl_input_Cursor.cpp 
Log Message:
Fixed linux native cursor hotspot

Index: org_lwjgl_input_Cursor.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Cursor.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- org_lwjgl_input_Cursor.cpp	12 Jun 2004 20:28:32 -0000	1.12
+++ org_lwjgl_input_Cursor.cpp	7 Jul 2004 10:31:26 -0000	1.13
@@ -55,7 +55,7 @@
 	Display *disp = incDisplay(env);
 	if (disp == NULL)
 		return 0;
-  const int *delays = NULL;
+	const int *delays = NULL;
 	if (delay_buffer != NULL)
 		delays = (const int *)env->GetDirectBufferAddress(delay_buffer) + delays_offset;		
 	XcursorPixel *pixels = (XcursorPixel *)env->GetDirectBufferAddress(image_buffer) + images_offset;
@@ -67,7 +67,8 @@
 	for (int i = 0; i < num_images; i++) {
 		XcursorImage *cursor_image = XcursorImageCreate(width, height);
 		cursor_image->xhot = x_hotspot;
-		cursor_image->yhot = y_hotspot;
+		// Of some reason, the y hotspot coordinate is offset by 1
+		cursor_image->yhot = y_hotspot + 1;
 		cursor_image->pixels = &(pixels[stride*i]);
 		if (num_images > 1)
 			cursor_image->delay = delays[i];		

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

Modified Files:
	org_lwjgl_opengl_Display.cpp 
Log Message:
Win32: Disable ARB pixel format path unless needed (samples > 0)

Index: org_lwjgl_opengl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- org_lwjgl_opengl_Display.cpp	7 Jul 2004 08:06:57 -0000	1.14
+++ org_lwjgl_opengl_Display.cpp	7 Jul 2004 09:40:48 -0000	1.15
@@ -707,11 +707,13 @@
 		closeWindow(dummy_hwnd, dummy_hdc);
 		return;
 	}
+	extgl_InitWGL(env);
+	jclass cls_pixel_format = env->GetObjectClass(pixel_format);
+	int samples = (int)env->GetIntField(pixel_format, env->GetFieldID(cls_pixel_format, "samples", "I"));
 	// Some crazy strangeness here so we can use ARB_pixel_format to specify the number
 	// of multisamples we want. If the extension is present we'll delete the existing
 	// rendering context and start over, using the ARB extension instead to pick the context.
-	extgl_InitWGL(env);
-	if (extgl_Extensions.WGL_ARB_pixel_format) {
+	if (samples > 0 && extgl_Extensions.WGL_ARB_pixel_format) {
 		pixel_format_index = findPixelFormatARB(env, dummy_hdc, pixel_format, NULL, true, true, true);
 		wglMakeCurrent(NULL, NULL);
 		wglDeleteContext(display_hglrc);

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

Modified Files:
	PixelFormat.java 
Log Message:
Added pixel format warnings to PixelFormat.java

Index: PixelFormat.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/PixelFormat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PixelFormat.java	2 Jul 2004 19:01:57 -0000	1.1
+++ PixelFormat.java	7 Jul 2004 09:38:19 -0000	1.2
@@ -36,6 +36,10 @@
  * of this class is used as arguments to Display.create() and Pbuffer.create(), to
  * indicate minimum required properties.
  *
+ * WARNING: Some pixel formats are known to cause troubles on certain buggy drivers.
+ *          Example: Under Windows, specifying samples != 0 will enable the ARB
+ *          pixel format selection path, which could trigger a crash.
+ *
  * @author eli...@so...
  * @version $Revision$
  */

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

Modified Files:
	org_lwjgl_opengl_Display.cpp 
Log Message:
Win32 fix

Index: org_lwjgl_opengl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- org_lwjgl_opengl_Display.cpp	6 Jul 2004 07:50:33 -0000	1.13
+++ org_lwjgl_opengl_Display.cpp	7 Jul 2004 08:06:57 -0000	1.14
@@ -101,7 +101,7 @@
 	}
 	putAttrib(&attrib_list, WGL_ACCELERATION_ARB); putAttrib(&attrib_list, WGL_FULL_ACCELERATION_ARB);
 	putAttrib(&attrib_list, WGL_PIXEL_TYPE_ARB); putAttrib(&attrib_list, WGL_TYPE_RGBA_ARB);
-	putAttrib(&attrib_list, WGL_DOUBLE_BUFFER_ARB); putAttrib(&attrib_list, window ? TRUE : FALSE);
+	putAttrib(&attrib_list, WGL_DOUBLE_BUFFER_ARB); putAttrib(&attrib_list, double_buffer ? TRUE : FALSE);
 	putAttrib(&attrib_list, WGL_SUPPORT_OPENGL_ARB); putAttrib(&attrib_list, TRUE);
 	putAttrib(&attrib_list, WGL_COLOR_BITS_ARB); putAttrib(&attrib_list, bpp);
 	putAttrib(&attrib_list, WGL_ALPHA_BITS_ARB); putAttrib(&attrib_list, alpha);