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

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

Modified Files:
	org_lwjgl_input_Mouse.h 
Log Message:
Updated Mouse.h

Index: org_lwjgl_input_Mouse.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Mouse.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- org_lwjgl_input_Mouse.h	6 Apr 2004 14:23:18 -0000	1.13
+++ org_lwjgl_input_Mouse.h	6 Apr 2004 14:46:40 -0000	1.14
@@ -66,14 +66,6 @@
 
 /*
  * Class:     org_lwjgl_input_Mouse
- * Method:    initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_initIDs
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_input_Mouse
  * Method:    nHasWheel
  * Signature: ()Z
  */

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

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
win32 fixup

Index: org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- org_lwjgl_input_Mouse.cpp	6 Apr 2004 14:23:19 -0000	1.47
+++ org_lwjgl_input_Mouse.cpp	6 Apr 2004 14:40:36 -0000	1.48
@@ -434,9 +434,9 @@
 	int dx, dy;
 
 	int *coords = (int *)env->GetDirectBufferAddress(coord_buffer_obj);
-	int coords_length = env->GetDirectBufferCapacity(coord_buffer_obj);
+	int coords_length = (int)env->GetDirectBufferCapacity(coord_buffer_obj);
 	unsigned char *buttons_buffer = (unsigned char *)env->GetDirectBufferAddress(button_buffer_obj);
-	int buttons_length = env->GetDirectBufferCapacity(button_buffer_obj);
+	int buttons_length = (int)env->GetDirectBufferCapacity(button_buffer_obj);
 	if (coords_length < 3) {
 		printfDebug("ERROR: Not enough space in coords array: %d < 3\n", coords_length);
 		return;
@@ -467,8 +467,8 @@
 	dy = -dy;
 
 	coords[0] = dx;
-	coords[0] = dy;
-	coords[0] = diMouseState.lZ;
+	coords[1] = dy;
+	coords[2] = diMouseState.lZ;
 	for (int i = 0; i < mButtoncount; i++) {
 		if (diMouseState.rgbButtons[i] != 0) {
 			diMouseState.rgbButtons[i] = JNI_TRUE;
@@ -479,6 +479,6 @@
 	int num_buttons = mButtoncount;
 	if (num_buttons > buttons_length)
 		num_buttons = buttons_length;
-	for (int i = 0; i < num_buttons; i++)
-		buttons_buffer[i] = (unsigned char)diMouseState.rgbButtons[i];
+	for (int j = 0; j < num_buttons; j++)
+		buttons_buffer[j] = (unsigned char)diMouseState.rgbButtons[j];
 }

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

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
Make poll deltas accumulative, and only reset on getD*

Index: org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- org_lwjgl_input_Mouse.cpp	26 Mar 2004 21:11:20 -0000	1.25
+++ org_lwjgl_input_Mouse.cpp	6 Apr 2004 14:23:18 -0000	1.26
@@ -50,11 +50,6 @@
 static const int NUM_COOKIES = NUM_BUTTONS + 3;
 static const int WHEEL_SCALE = 120;
 
-static jfieldID fid_dx;
-static jfieldID fid_dy;
-static jfieldID fid_dwheel;
-static jfieldID fid_buttons;
-
 static jbyte button_states[NUM_BUTTONS];
 static bool buffer_enabled;
 /*static int x_axis_index = NUM_BUTTONS;
@@ -176,13 +171,6 @@
 	return NUM_BUTTONS;
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_initIDs(JNIEnv * env, jclass clazz) {
-	fid_dx = env->GetStaticFieldID(clazz, "dx", "I");
-	fid_dy = env->GetStaticFieldID(clazz, "dy", "I");
-	fid_dwheel = env->GetStaticFieldID(clazz, "dwheel", "I");
-	fid_buttons = env->GetStaticFieldID(clazz, "buttons", "[B");
-}
-
 JNIEXPORT jint JNICALL Java_org_lwjgl_input_Mouse_nGetNativeCursorCaps(JNIEnv *env, jclass clazz) {
 	return 0;
 }
@@ -235,17 +223,28 @@
 	}
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nPoll(JNIEnv * env, jclass clazz) {
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nPoll(JNIEnv * env, jclass clazz, jobject coord_buffer_obj, jobject button_buffer_obj) {
 	int dx, dy, dz;
 	//pollMouseDevice();
 	dz = last_dz*WHEEL_SCALE;
 	dx = last_dx;
 	dy = -last_dy;
-	env->SetStaticIntField(clazz, fid_dx, (jint)dx);
-	env->SetStaticIntField(clazz, fid_dy, (jint)dy);
-	env->SetStaticIntField(clazz, fid_dwheel, (jint)dz);
-	jbyteArray buttons_array = (jbyteArray)env->GetStaticObjectField(clazz, fid_buttons);
-	env->SetByteArrayRegion(buttons_array, 0, NUM_BUTTONS, button_states);
+	int *coords = (int *)env->GetDirectBufferAddress(coord_buffer_obj);
+	int coords_length = env->GetDirectBufferCapacity(coord_buffer_obj);
+	unsigned char *buttons_buffer = (unsigned char *)env->GetDirectBufferAddress(button_buffer_obj);
+	int buttons_length = env->GetDirectBufferCapacity(button_buffer_obj);
+	if (coords_length < 3) {
+		printfDebug("ERROR: Not enough space in coords array: %d < 3\n", coords_length);
+		return;
+	}
+	coords[0] = dx;
+	coords[1] = dy;
+	coords[2] = dz;
+	int num_buttons = NUM_BUTTONS;
+	if (num_buttons > buttons_length)
+		num_buttons = buttons_length;
+	for (int i = 0; i < num_buttons; i++)
+		buttons_buffer[i] = button_states[i];
 	resetDeltas();
 }
 

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

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
Make poll deltas accumulative, and only reset on getD*

Index: org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- org_lwjgl_input_Mouse.cpp	4 Apr 2004 07:37:22 -0000	1.46
+++ org_lwjgl_input_Mouse.cpp	6 Apr 2004 14:23:19 -0000	1.47
@@ -54,12 +54,6 @@
 static bool mCreate_success;								 // bool used to determine successfull creation
 static bool mFirstTimeInitialization = true; // boolean to determine first time initialization
 
-// Cached fields of Mouse.java
-static jfieldID fidMButtons;
-static jfieldID fidMDX;
-static jfieldID fidMDY;
-static jfieldID fidMDWheel;
-
 static POINT cursorPos;
 static RECT windowRect;
 static bool usingNativeCursor;
@@ -71,8 +65,7 @@
 void CreateMouse();
 void SetupMouse();
 void InitializeMouseFields();
-void CacheMouseFields(JNIEnv *env, jclass clsMouse);
-void UpdateMouseFields(JNIEnv *env, jclass clsMouse);
+void UpdateMouseFields(JNIEnv *env, jclass clsMouse, jobject coord_buffer_obj, jobject button_buffer_obj);
 
 static void getScreenClientRect(RECT* clientRect, RECT* windowRect)
 {
@@ -84,14 +77,6 @@
 	clientRect->right += clientRect->left;
 }
 
-/**
- * Initializes any field ids
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_initIDs(JNIEnv * env, jclass clazz) {
-	/* Cache fields in Mouse */
-	CacheMouseFields(env, clazz);
-}
-
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Mouse_nHasWheel(JNIEnv *, jclass) {
 	return mHaswheel;
 }
@@ -113,7 +98,6 @@
 	} 
 
 	ShowCursor(FALSE);
-	CacheMouseFields(env, clazz);
 
 	/* skip enumeration, since we only want system mouse */
 	CreateMouse();
@@ -312,9 +296,9 @@
  * Method:		nPoll
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nPoll(JNIEnv * env, jclass clazz) {
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nPoll(JNIEnv * env, jclass clazz, jobject coord_buffer_obj, jobject button_buffer_obj) {
 	mDIDevice->Acquire();
-	UpdateMouseFields(env, clazz);
+	UpdateMouseFields(env, clazz, coord_buffer_obj, button_buffer_obj);
 }
 
 /**
@@ -444,11 +428,20 @@
 /**
  * Updates the fields on the Mouse
  */
-static void UpdateMouseFields(JNIEnv *env, jclass clsMouse) {
+static void UpdateMouseFields(JNIEnv *env, jclass clsMouse, jobject coord_buffer_obj, jobject button_buffer_obj) {
 	HRESULT								 hRes; 
 	DIMOUSESTATE diMouseState;						// State of Mouse
 	int dx, dy;
 
+	int *coords = (int *)env->GetDirectBufferAddress(coord_buffer_obj);
+	int coords_length = env->GetDirectBufferCapacity(coord_buffer_obj);
+	unsigned char *buttons_buffer = (unsigned char *)env->GetDirectBufferAddress(button_buffer_obj);
+	int buttons_length = env->GetDirectBufferCapacity(button_buffer_obj);
+	if (coords_length < 3) {
+		printfDebug("ERROR: Not enough space in coords array: %d < 3\n", coords_length);
+		return;
+	}
+
 	// get data from the Mouse 
 	hRes = mDIDevice->GetDeviceState(sizeof(DIMOUSESTATE), &diMouseState);
 	if (hRes != DI_OK) { 
@@ -473,10 +466,9 @@
 	}
 	dy = -dy;
 
-	env->SetStaticIntField(clsMouse, fidMDX, (jint)dx);
-	env->SetStaticIntField(clsMouse, fidMDY, (jint)dy);
-	env->SetStaticIntField(clsMouse, fidMDWheel, (jint)diMouseState.lZ);
-	
+	coords[0] = dx;
+	coords[0] = dy;
+	coords[0] = diMouseState.lZ;
 	for (int i = 0; i < mButtoncount; i++) {
 		if (diMouseState.rgbButtons[i] != 0) {
 			diMouseState.rgbButtons[i] = JNI_TRUE;
@@ -484,16 +476,9 @@
 			diMouseState.rgbButtons[i] = JNI_FALSE;
 		}
 	}
-	jbyteArray mButtonsArray = (jbyteArray) env->GetStaticObjectField(clsMouse, fidMButtons);
-	env->SetByteArrayRegion(mButtonsArray, 0, mButtoncount, (const signed char *) diMouseState.rgbButtons);
-}
-
-/**
- * Caches the field ids for quicker access
- */
-void CacheMouseFields(JNIEnv* env, jclass clsMouse) {
-	fidMButtons	= env->GetStaticFieldID(clsMouse, "buttons", "[B");
-	fidMDX		= env->GetStaticFieldID(clsMouse, "dx", "I");
-	fidMDY		= env->GetStaticFieldID(clsMouse, "dy", "I");
-	fidMDWheel	= env->GetStaticFieldID(clsMouse, "dwheel", "I");
+	int num_buttons = mButtoncount;
+	if (num_buttons > buttons_length)
+		num_buttons = buttons_length;
+	for (int i = 0; i < num_buttons; i++)
+		buttons_buffer[i] = (unsigned char)diMouseState.rgbButtons[i];
 }

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

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
Make poll deltas accumulative, and only reset on getD*

Index: org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- org_lwjgl_input_Mouse.cpp	26 Mar 2004 21:11:20 -0000	1.45
+++ org_lwjgl_input_Mouse.cpp	6 Apr 2004 14:23:18 -0000	1.46
@@ -62,11 +62,6 @@
 static bool should_grab = false;
 static bool native_cursor = false;
 
-static jfieldID fid_buttons = NULL;
-static jfieldID fid_dx = NULL;
-static jfieldID fid_dy = NULL;
-static jfieldID fid_dwheel = NULL;
-
 static int last_x;
 static int last_y;
 static int last_z;
@@ -106,19 +101,6 @@
 	last_y = current_y;
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_initIDs
-  (JNIEnv * env, jclass clazz)
-{
-	if (fid_buttons == NULL)
-		fid_buttons = env->GetStaticFieldID(clazz, "buttons", "[B");
-	if (fid_dx == NULL)
-		fid_dx = env->GetStaticFieldID(clazz, "dx", "I");
-	if (fid_dy == NULL)
-		fid_dy = env->GetStaticFieldID(clazz, "dy", "I");
-	if (fid_dwheel == NULL)
-		fid_dwheel = env->GetStaticFieldID(clazz, "dwheel", "I");
-}
-
 static bool blankCursor(void) {
 	unsigned int best_width, best_height;
 	if (XQueryBestCursor(getCurrentDisplay(), getCurrentWindow(), 1, 1, &best_width, &best_height) == 0) {
@@ -378,18 +360,29 @@
 		setCursorPos(event->x, event->y);
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nPoll(JNIEnv * env, jclass clazz) {
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nPoll(JNIEnv * env, jclass clazz, jobject coord_buffer_obj, jobject button_buffer_obj) {
 	int moved_x = current_x - last_x;
 	int moved_y = -(current_y - last_y);
 	int moved_z = current_z - last_z;
-	env->SetStaticIntField(clazz, fid_dx, (jint)moved_x);
-	env->SetStaticIntField(clazz, fid_dy, (jint)moved_y);
-	env->SetStaticIntField(clazz, fid_dwheel, (jint)moved_z);
+	int *coords = (int *)env->GetDirectBufferAddress(coord_buffer_obj);
+	int coords_length = env->GetDirectBufferCapacity(coord_buffer_obj);
+	unsigned char *buttons_buffer = (unsigned char *)env->GetDirectBufferAddress(button_buffer_obj);
+	int buttons_length = env->GetDirectBufferCapacity(button_buffer_obj);
+	if (coords_length < 3) {
+		printfDebug("ERROR: Not enough space in coords array: %d < 3\n", coords_length);
+		return;
+	}
+	coords[0] = moved_x;
+	coords[1] = moved_y;
+	coords[2] = moved_z;
 	last_x = current_x;
 	last_y = current_y;
 	last_z = current_z;
-	jbyteArray buttons_array = (jbyteArray)env->GetStaticObjectField(clazz, fid_buttons);
-	env->SetByteArrayRegion(buttons_array, 0, NUM_BUTTONS, buttons);
+	int num_buttons = NUM_BUTTONS;
+	if (num_buttons > buttons_length)
+		num_buttons = buttons_length;
+	for (int i = 0; i < num_buttons; i++)
+		buttons_buffer[i] = buttons[i];
 	warpPointer();
 }
 

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

Modified Files:
	Mouse.java 
Log Message:
Make poll deltas accumulative, and only reset on getD*

Index: Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- Mouse.java	3 Apr 2004 18:18:25 -0000	1.47
+++ Mouse.java	6 Apr 2004 14:23:17 -0000	1.48
@@ -33,6 +33,7 @@
 package org.lwjgl.input;
 
 import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -72,7 +73,7 @@
 	private static boolean created;
 
 	/** The mouse buttons status from the last poll */
-	private static byte[] buttons;
+	private static ByteBuffer buttons;
 
 	/** X */
 	private static int x;
@@ -80,6 +81,9 @@
 	/** Y */
 	private static int y;
 	
+	/** Buffer to hold the deltas dx, dy and dwheel */
+	private static IntBuffer coord_buffer;
+
 	/** Delta X */
 	private static int dx;
 
@@ -177,8 +181,8 @@
 		if (currentCursor != null) {
 			nSetNativeCursor(currentCursor.getHandle());
 	 		currentCursor.setTimeout();
-      x = Window.getWidth() / 2;
-      y = Window.getHeight() / 2;      
+		x = Window.getWidth() / 2;
+		y = Window.getHeight() / 2;      
 		} else {
 			nSetNativeCursor(0);
 		}
@@ -221,7 +225,6 @@
 	 */
 	private static void initialize() {
 		Sys.initialize();
-		initIDs();
 		
 		// Assign names to all the buttons
 		buttonName = new String[16];
@@ -234,13 +237,8 @@
 	}
 
 	/**
-	 * Register fields with the native library
-	 */
-	private static native void initIDs();
-
-	/**
 	 * "Create" the mouse. The display must first have been created.
-	* 
+	 * 
 	 * @throws LWJGLException if the mouse could not be created for any reason
 	 */
 	public static void create() throws LWJGLException {
@@ -256,10 +254,12 @@
 		hasWheel = nHasWheel();
 		created = true;
 		currentCursor = null;
+		dx = dy = dwheel = 0;
 
 		// set mouse buttons
 		buttonCount = nGetButtonCount();
-		buttons = new byte[buttonCount];
+		buttons = BufferUtils.createByteBuffer(buttonCount);
+		coord_buffer = BufferUtils.createIntBuffer(3);
 	}
 
 	/** Native query of wheel support */
@@ -305,6 +305,7 @@
 			return;
 		created = false;
 		buttons = null;
+		coord_buffer = null;
 		currentCursor = null;
 
 		nDestroy();
@@ -334,11 +335,17 @@
 	public static void poll() {
 		if (!created)
 			throw new IllegalStateException("Mouse must be created before you can poll it");
-		nPoll();
+		nPoll(coord_buffer, buttons);
 		
+		int poll_dx = coord_buffer.get(0);
+		int poll_dy = coord_buffer.get(1);
+		int poll_dwheel = coord_buffer.get(2);
 		// set absolute position
-		x += dx;
-		y += dy;
+		x += poll_dx;
+		y += poll_dy;
+		dx += poll_dx;
+		dy += poll_dy;
+		dwheel += poll_dwheel;
 
 		// if window has been created, clamp to edges
 		if(Window.isCreated()) {
@@ -360,7 +367,7 @@
 	/**
 	 * Native method to poll the mouse
 	 */
-	private static native void nPoll();
+	private static native void nPoll(IntBuffer coord_buffer, ByteBuffer buttons);
 
 	/**
 	 * See if a particular mouse button is down.
@@ -374,7 +381,7 @@
 		if (button >= buttonCount || button < 0)
 			return false;
 		else
-			return buttons[button] == 1;
+			return buttons.get(button) == 1;
 	}
 	
 	/**
@@ -505,24 +512,30 @@
 	}	
 	
 	/**
-	 * @return Movement on the x axis since last poll
+	 * @return Movement on the x axis since last time getDX() was called
 	 */
 	public static int getDX() {
-		return dx;
+		int result = dx;
+		dx = 0;
+		return result;
 	}
 
 	/**
-	 * @return Movement on the y axis since last poll
+	 * @return Movement on the y axis since last time getDY() was called
 	 */
 	public static int getDY() {
-		return dy;
+		int result = dy;
+		dy = 0;
+		return result;
 	}
 
 	/**
-	 * @return Movement of the wheel since last poll
+	 * @return Movement of the wheel since last time getDWheel() was called
 	 */
 	public static int getDWheel() {
-		return dwheel;
+		int result = dwheel;
+		dwheel = 0;
+		return result;
 	}
 
 	/**

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

Modified Files:
	org_lwjgl_input_Mouse.h 
Log Message:
Make poll deltas accumulative, and only reset on getD*

Index: org_lwjgl_input_Mouse.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Mouse.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- org_lwjgl_input_Mouse.h	26 Mar 2004 21:11:20 -0000	1.12
+++ org_lwjgl_input_Mouse.h	6 Apr 2004 14:23:18 -0000	1.13
@@ -7,7 +7,6 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* Inaccessible static: _00024assertionsDisabled */
 #undef org_lwjgl_input_Mouse_CURSOR_ONE_BIT_TRANSPARENCY
 #define org_lwjgl_input_Mouse_CURSOR_ONE_BIT_TRANSPARENCY 1L
 #undef org_lwjgl_input_Mouse_CURSOR_8_BIT_ALPHA
@@ -18,6 +17,7 @@
 /* Inaccessible static: buttons */
 /* Inaccessible static: x */
 /* Inaccessible static: y */
+/* Inaccessible static: coord_buffer */
 /* Inaccessible static: dx */
 /* Inaccessible static: dy */
 /* Inaccessible static: dwheel */
@@ -32,7 +32,6 @@
 /* Inaccessible static: eventState */
 #undef org_lwjgl_input_Mouse_BUFFER_SIZE
 #define org_lwjgl_input_Mouse_BUFFER_SIZE 50L
-/* Inaccessible static: class_00024org_00024lwjgl_00024input_00024Mouse */
 /*
  * Class:     org_lwjgl_input_Mouse
  * Method:    nGetNativeCursorCaps
@@ -108,10 +107,10 @@
 /*
  * Class:     org_lwjgl_input_Mouse
  * Method:    nPoll
- * Signature: ()V
+ * Signature: (Ljava/nio/IntBuffer;Ljava/nio/ByteBuffer;)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nPoll
-  (JNIEnv *, jclass);
+  (JNIEnv *, jclass, jobject, jobject);
 
 /*
  * Class:     org_lwjgl_input_Mouse

Update of /cvsroot/java-game-lib/LWJGL/www/images/installation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29442/images/installation

Added Files:
	netbeans-1.png netbeans-2.png netbeans-3.png 
Log Message:
Netbeans installation guide

--- NEW FILE: netbeans-1.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: netbeans-2.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: netbeans-3.png ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/java-game-lib/LWJGL/www
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29442

Modified Files:
	installation.php 
Log Message:
Netbeans installation guide

Index: installation.php
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/installation.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- installation.php	4 Apr 2004 10:24:39 -0000	1.2
+++ installation.php	6 Apr 2004 01:32:12 -0000	1.3
@@ -142,7 +142,15 @@
     <p>&nbsp;</p>
     <h3>Netbeans</h3>
     <p>
-      <i>no text yet</i>
+      1. Having installed LWJGL on your platform of choice, fire up Netbeans.<br>
+      2. Create a new project, and mount lwjgl.jar in the project filesystem by right clicking the Filesystem and selecting Mount -> Archive Files<br><br>
+      <img src="images/installation/netbeans-1.png"><br><br>
+      3. Having created a class to run, you need to setup that class to execute using an External Execution<br><br>
+      <img src="images/installation/netbeans-2.png"><br><br>
+      Since Netbeans doesn't allow to change the library path you either have to change the working directory of the executor to the lwjgl.dll<br>
+      or copy files over to whereever you run from. More info is provided in the <a href="http://www.netbeans.org/kb/faqs/miscellaneous.html#FAQ_34" target="_blank">Netbeans FAQ.</a><br><br>
+      <img src="images/installation/netbeans-3.png"><br><br>
+      4. You should now be able to run the application directly from Netbeans. Push F6 to verify.
     </p>  
     
     <!-- JCreator -->