java-game-lib-cvs Mailing List for Lightweight Java Game Library (Page 4)

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

Modified Files:
	Window.h display.cpp display.h org_lwjgl_input_Cursor.cpp 
	org_lwjgl_input_Mouse.cpp org_lwjgl_opengl_Display.cpp 
Log Message:
Linux: improve cursor position handling (warp behaviour)

Index: display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/display.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- display.cpp	23 Aug 2004 08:46:35 -0000	1.6
+++ display.cpp	8 Sep 2004 20:15:55 -0000	1.7
@@ -73,6 +73,14 @@
 static unsigned short *b_ramp;
 static extension current_extension = NONE;
 
+int getScreenModeWidth(void) {
+	return current_width;
+}
+
+int getScreenModeHeight(void) {
+	return current_height;
+}
+
 extension getCurrentDisplayModeExtension(void) {
 	return current_extension;
 }

Index: display.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/display.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- display.h	23 Aug 2004 08:46:35 -0000	1.3
+++ display.h	8 Sep 2004 20:15:55 -0000	1.4
@@ -46,6 +46,8 @@
 
 typedef enum {XRANDR, XF86VIDMODE, NONE} extension;
 
+extern int getScreenModeWidth(void);
+extern int getScreenModeHeight(void);
 extern jobject initDisplay(JNIEnv *env, int screen);
 extern void switchDisplayMode(JNIEnv * env, jobject mode, int screen);
 extern void resetDisplayMode(JNIEnv * env, int screen);

Index: org_lwjgl_opengl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Display.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- org_lwjgl_opengl_Display.cpp	23 Aug 2004 11:33:57 -0000	1.21
+++ org_lwjgl_opengl_Display.cpp	8 Sep 2004 20:15:55 -0000	1.22
@@ -88,7 +88,6 @@
 static bool focused;
 static bool closerequested;
 static bool grab;
-static bool ignore_motion_events;
 
 static int current_screen;
 static Display *display_connection = NULL;
@@ -105,10 +104,6 @@
 	return context;
 }
 
-Atom getWarpAtom(void) {
-	return warp_atom;
-}
-
 int getCurrentScreen(void) {
 	return current_screen;
 }
@@ -153,13 +148,17 @@
 				printfDebug("Could not open X display connection\n");
 			return NULL;
 		}
-		warp_atom = XInternAtom(getDisplay(), "ignore_warp_atom", False);
+		warp_atom = XInternAtom(display_connection, "_LWJGL_WARP", False);
 	}
 	async_x_error = false;
 	display_connection_usage++;
 	return display_connection;
 }
 
+Atom getWarpAtom(void) {
+	return warp_atom;
+}
+
 void decDisplay(void) {
 	display_connection_usage--;
 	if (display_connection_usage == 0) {
@@ -231,14 +230,6 @@
 	}
 }
 
-static void handleMotion(XMotionEvent *event) {
-	if (ignore_motion_events) {
-		resetCursor(event->x, event->y);
-	} else {
-		handlePointerMotion(event);
-	}
-}
-
 static void checkInput(void) {
 	Window win;
 	int revert_mode;
@@ -256,8 +247,8 @@
 		XNextEvent(getDisplay(), &event);
 		switch (event.type) {
 			case ClientMessage:
-				if (event.xclient.message_type == getWarpAtom()) {
-					ignore_motion_events = event.xclient.data.b[0] == 1 ? true : false;
+				if (event.xclient.message_type == warp_atom) {
+					handleWarpEvent(&(event.xclient));
 				} else if ((event.xclient.format == 32) && ((Atom)event.xclient.data.l[0] == delete_atom))
 					closerequested = true;
 				break;
@@ -289,7 +280,7 @@
 				handleButtonRelease(&(event.xbutton));
 				break;
 			case MotionNotify:
-				handleMotion(&(event.xmotion));
+				handlePointerMotion(&(event.xmotion));
 				break;
 			case KeyPress:
 			case KeyRelease:
@@ -351,7 +342,6 @@
 	closerequested = false;
 	vsync_enabled = false;
 	grab = false;
-	ignore_motion_events = false;
 	Window root_win;
 	Window win;
 	XSetWindowAttributes attribs;
@@ -367,7 +357,7 @@
 	attribs.background_pixel = 0xFF000000;
 	attribs.win_gravity = NorthWestGravity;
 	attribmask = CWColormap | CWBackPixel | CWEventMask | CWWinGravity;
-	if (isLegacyFullscreen()/* || undecorated*/) {
+	if (isLegacyFullscreen()) {
 		attribmask |= CWOverrideRedirect;
 		attribs.override_redirect = True;
 	}

Index: Window.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/Window.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Window.h	23 Aug 2004 08:46:35 -0000	1.19
+++ Window.h	8 Sep 2004 20:15:55 -0000	1.20
@@ -55,15 +55,12 @@
 	 */
 	extern bool releaseInput(void);
 
-	extern void resetCursor(int x, int y);
-
 	extern bool checkXError(JNIEnv *env);
-	
 	extern Atom getWarpAtom(void);
-
 	/*
 	 * Various functions to release/acquire keyboard and mouse
 	 */
+	extern void handleWarpEvent(XClientMessageEvent *);
 	extern void handlePointerMotion(XMotionEvent *);
 	extern void handleButtonPress(XButtonEvent *);
 	extern void handleButtonRelease(XButtonEvent *);

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.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- org_lwjgl_input_Mouse.cpp	6 Sep 2004 10:21:34 -0000	1.63
+++ org_lwjgl_input_Mouse.cpp	8 Sep 2004 20:15:55 -0000	1.64
@@ -39,17 +39,16 @@
  * @version $Revision$
  */
 
-
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/xf86vmode.h>
+#include <X11/Xcursor/Xcursor.h>
 #include <assert.h>
 #include <string.h>
 #include "Window.h"
 #include "common_tools.h"
+#include "display.h"
 #include "org_lwjgl_input_Mouse.h"
-#include <X11/Xcursor/Xcursor.h>
-//#include "extxcursor.h"
 
 #define NUM_BUTTONS 3
 
@@ -61,12 +60,12 @@
 static bool pointer_grabbed;
 static bool created;
 
+static int dx;
+static int dy;
+static int dz;
 static int last_x;
 static int last_y;
 static int last_z;
-static int current_x;
-static int current_y;
-static int current_z;
 static jbyte buttons[NUM_BUTTONS];
 static event_queue_t event_queue;
 static bool buffer_enabled;
@@ -84,24 +83,21 @@
 }
 
 static void setCursorPos(int x, int y) {
-	current_x = cap(x, 0, getWindowWidth() - 1);
-	current_y = cap(y, 0, getWindowHeight() - 1);
+	int current_x = x;
+	int current_y = y;
+	dx += current_x - last_x;
+	dy += current_y - last_y;
+	last_x = current_x;
+	last_y = current_y;
 }
 
 static int transformY(int y) {
 	return getWindowHeight() - 1 - y;
 }
 
-static void transformCursorPos(int x, int y) {
-	// transform to OpenGL coordinate system center
-	y = transformY(y);
-	setCursorPos(x, y);
-}
-
-void resetCursor(int x, int y) {
-	transformCursorPos(x, y);
-	last_x = current_x;
-	last_y = current_y;
+static void resetCursor(int x, int y) {
+	last_x = x;
+	last_y = y;
 }
 
 static bool blankCursor(void) {
@@ -170,27 +166,21 @@
 	updateCursor();
 }
 
-static void doWarpPointer(void ) {
-	XEvent ignore_warp_guard;
-	ignore_warp_guard.type = ClientMessage;
-	ignore_warp_guard.xclient.message_type = getWarpAtom();
-	ignore_warp_guard.xclient.format = 8;
-	// Tell event loop to start ignoring motion events
-	ignore_warp_guard.xclient.data.b[0] = 1;
-	XSendEvent(getDisplay(), getCurrentWindow(), False, 0, &ignore_warp_guard);
-	XWarpPointer(getDisplay(), None, getCurrentWindow(), 0, 0, 0, 0, getWindowWidth()/2, transformY(getWindowHeight()/2));
-	// Tell event loop to stop ignoring motion events
-	ignore_warp_guard.xclient.data.b[0] = 0;
-	XSendEvent(getDisplay(), getCurrentWindow(), False, 0, &ignore_warp_guard);
+void handleWarpEvent(XClientMessageEvent *event) {
+	int center_x = event->data.l[0];
+	int center_y = event->data.l[1];
+	resetCursor(center_x, center_y);
 }
 
-static void warpPointer(void) {
-	if (!pointer_grabbed || !shouldGrab())
-		return;
-	// Reset pointer to middle of screen if outside a certain inner border
-	if (current_x < POINTER_WARP_BORDER || current_y < POINTER_WARP_BORDER || 
-			current_x > getWindowWidth() - POINTER_WARP_BORDER || current_y > getWindowHeight() - POINTER_WARP_BORDER)
-		doWarpPointer();
+static void doWarpPointer(int center_x, int center_y) {
+	XEvent warp_event;
+	warp_event.type = ClientMessage;
+	warp_event.xclient.message_type = getWarpAtom();
+	warp_event.xclient.format = 32;
+	warp_event.xclient.data.l[0] = center_x;
+	warp_event.xclient.data.l[1] = center_y;
+	XSendEvent(getDisplay(), getCurrentWindow(), False, 0, &warp_event);
+	XWarpPointer(getDisplay(), None, getCurrentWindow(), 0, 0, 0, 0, center_x, center_y);
 }
 
 JNIEXPORT jint JNICALL Java_org_lwjgl_input_Mouse_nGetNativeCursorCaps
@@ -247,7 +237,7 @@
 	if (disp == NULL)
 		return;
 	int i;
-	current_z = last_z = 0;
+	last_z = last_y = last_x = dx = dy = dz = 0;
 	for (i = 0; i < NUM_BUTTONS; i++)
 		buttons[i] = 0;
 	if (!blankCursor()) {
@@ -261,7 +251,7 @@
 	buffer_enabled = false;
 	updatePointerGrab();
 	initEventQueue(&event_queue);
-	doWarpPointer();
+	doWarpPointer(getWindowWidth()/2, getWindowHeight()/2);
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nDestroy
@@ -299,10 +289,10 @@
 void handleButtonPress(XButtonEvent *event) {
 	switch (event->button) {
 		case Button4:
-			current_z += WHEEL_SCALE;
+			dz += WHEEL_SCALE;
 			break;
 		case Button5:
-			current_z -= WHEEL_SCALE;
+			dz -= WHEEL_SCALE;
 			break;
 		default: break;
 	}
@@ -313,14 +303,44 @@
 	handleButton(event, 0);
 }
 
+static int max(int v1, int v2) {
+	return v1 > v2 ? v1 : v2;
+}
+
+static int min(int v1, int v2) {
+	return v1 < v2 ? v1 : v2;
+}
+
 void handlePointerMotion(XMotionEvent *event) {
-	setCursorPos(event->x, event->y);
+	int x = event->x;
+	int y = event->y;
+	setCursorPos(x, y);
+	if (!pointer_grabbed || !shouldGrab())
+		return;
+	int x_root = event->x_root;
+	int y_root = event->y_root;
+	// find the window position in root coordinates
+	int win_left = x_root - x;
+	int win_top = y_root - y;
+	int win_right = win_left + getWindowWidth();
+	int win_bottom = win_top + getWindowHeight();
+	// cap the window position to the screen dimensions
+	int border_left = max(0, win_left);
+	int border_top = max(0, win_top);
+	int border_right = min(getScreenModeWidth(), win_right);
+	int border_bottom = min(getScreenModeHeight(), win_bottom);
+	// determine whether the cursor is outside the bounds
+	bool outside_limits = 	x_root < border_left + POINTER_WARP_BORDER || y_root < border_top + POINTER_WARP_BORDER ||
+							x_root > border_right - POINTER_WARP_BORDER || y_root > border_bottom - POINTER_WARP_BORDER;
+	if (outside_limits) {
+		// Find the center of the limits in window coordinates
+		int center_x = (border_right - border_left)/2;
+		int center_y = (border_bottom - border_top)/2;
+		doWarpPointer(center_x, center_y);
+	}
 }
 
 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;
 	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);
@@ -329,18 +349,17 @@
 		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;
+	coords[0] = dx;
+	coords[1] = -dy;
+	coords[2] = dz;
+	dx = 0;
+	dy = 0;
+	dz = 0;
 	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();
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nEnableBuffer(JNIEnv *env, jclass clazz) {

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.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- org_lwjgl_input_Cursor.cpp	21 Aug 2004 00:18:19 -0000	1.16
+++ org_lwjgl_input_Cursor.cpp	8 Sep 2004 20:15:55 -0000	1.17
@@ -72,8 +72,7 @@
 	for (int i = 0; i < num_images; i++) {
 		XcursorImage *cursor_image = XcursorImageCreate(width, height);
 		cursor_image->xhot = x_hotspot;
-		// Of some reason, the y hotspot coordinate is offset by 1
-		cursor_image->yhot = y_hotspot + 1;
+		cursor_image->yhot = y_hotspot;
 		cursor_image->pixels = &(pixels[stride*i]);
 		if (num_images > 1)
 			cursor_image->delay = delays[i];		

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

Modified Files:
	build-fmod.bat build.bat 
Log Message:
define WIN32 when building

Index: build-fmod.bat
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/platform_build/win32_ms_cmdline/build-fmod.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- build-fmod.bat	6 Sep 2004 16:41:45 -0000	1.4
+++ build-fmod.bat	8 Sep 2004 18:50:21 -0000	1.5
@@ -3,7 +3,7 @@
 set JAVAHOME=C:\Java\jdk1.5.0
 set FMODHOME="C:\Program Files\fmodapi373win\api\inc"
 set PLTSDKHOME="C:\Program Files\Microsoft SDK"
-set COPTIONS=/I%FMODHOME% /I%PLTSDKHOME%\include /I%JAVAHOME%\include /I%JAVAHOME%\include\win32 /I..\..\src\native\common /O2 /nologo /c /EHsc
+set COPTIONS=-DWIN32 /I%FMODHOME% /I%PLTSDKHOME%\include /I%JAVAHOME%\include /I%JAVAHOME%\include\win32 /I..\..\src\native\common /O2 /nologo /c /EHsc
 set LINKEROPTS=/link /LIBPATH:%PLTSDKHOME%\Lib
 set LIBS=user32.lib Gdi32.lib Advapi32.lib
 

Index: build.bat
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/platform_build/win32_ms_cmdline/build.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- build.bat	30 Jun 2004 23:26:54 -0000	1.2
+++ build.bat	8 Sep 2004 18:50:21 -0000	1.3
@@ -5,7 +5,7 @@
 set EAXHOME="c:\Program Files\Creative Labs\EAX 2.0 Extensions SDK"
 set DXHOME="C:\Program Files\DX90SDK"
 set PLTSDKHOME="C:\Program Files\Microsoft SDK"
-set COPTIONS=/I%DXHOME%\Include /I%PLTSDKHOME%\include /I%JAVAHOME%\include /I%JAVAHOME%\include\win32 /I%ALHOME%\Include /I%EAXHOME%\Include /I..\..\src\native\common /O2 /nologo /c
+set COPTIONS=-DWIN32 /I%DXHOME%\Include /I%PLTSDKHOME%\include /I%JAVAHOME%\include /I%JAVAHOME%\include\win32 /I%ALHOME%\Include /I%EAXHOME%\Include /I..\..\src\native\common /O2 /nologo /c
 set LINKEROPTS=/link /LIBPATH:%ALHOME%\libs /LIBPATH:%EAXHOME%\Libs /LIBPATH:%DXHOME%\Lib /LIBPATH:%PLTSDKHOME%\Lib
 set LIBS=dinput.lib dxguid.lib OpenAL32.lib alut.lib eaxguid.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib
 

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

Modified Files:
	lwjgl.jar lwjgl_fmod3.jar lwjgl_media.jar lwjgl_test.jar 
	lwjgl_util.jar 
Log Message:
1.4 compatable

Index: lwjgl_fmod3.jar
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/jnlp/lwjgl_fmod3.jar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsZZTZri and /tmp/cvsXxyofD differ

Index: lwjgl_media.jar
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/jnlp/lwjgl_media.jar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsVwXt3k and /tmp/cvszzkfVF differ

Index: lwjgl.jar
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/jnlp/lwjgl.jar,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvssn4Gyu and /tmp/cvs2nQrvP differ

Index: lwjgl_test.jar
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/jnlp/lwjgl_test.jar,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsrzU61C and /tmp/cvsIdMw2X differ

Index: lwjgl_util.jar
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/jnlp/lwjgl_util.jar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsH1JGdy and /tmp/cvs7yWbiT differ

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

Modified Files:
	download.php 
Log Message:
0.92
removed references to local builds

Index: download.php
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/download.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- download.php	14 May 2004 18:47:14 -0000	1.4
+++ download.php	7 Sep 2004 16:43:15 -0000	1.5
@@ -9,22 +9,20 @@
   <div class="paragraph_item">
     <h2>Download</h2>
     <p>
-      Latest stable release is 0.9. Please download it here:<br>
-      <a href="http://sourceforge.net/project/showfiles.php?group_id=58488&package_id=54362&release_id=230885" target="_blank">LWJGL 0.9 alpha</a>
+      Latest stable release is 0.92. Please download it here:<br>
+      <a href="https://sourceforge.net/project/showfiles.php?group_id=58488" target="_blank">LWJGL 0.92 alpha</a>
     </p>
+    <!--
     <p>
       Random Win32 CVS builds are provided here: <i>Please note that these builds may be more buggy than an official release, but will typically contain the newest features.</i><br>
       <a href="http://matzon.dk/brian/lwjgl/builds/lwjgl-2004-05-14.zip">lwjgl-2004-05-14.zip</a> <i>swt enabled!</i><br>
       <a href="http://matzon.dk/brian/lwjgl/builds/lwjgl-2004-05-14-swt.zip">lwjgl-2004-05-14-swt.zip</a> <i>swt enabled! (includes swt support files)</i><br>
     </p>
+    -->
     <p>
       Latest CVS tarball. Please download it here:<br>
       <a href="http://cvs.sourceforge.net/cvstarballs/java-game-lib-cvsroot.tar.bz2">CVS Tarball</a>
     </p>
-    <p>
-      For a list of all releases of LWJGL please follow this link:<br>
-      <a href="http://sourceforge.net/project/showfiles.php?group_id=58488" target="_blank">LWJGL all releases</a>
-    </p>
   </div>
   
 <?php 

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

Modified Files:
	build.xml 
Log Message:
default to 1.4

Index: build.xml
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- build.xml	6 Sep 2004 20:31:22 -0000	1.32
+++ build.xml	7 Sep 2004 16:42:39 -0000	1.33
@@ -153,15 +153,15 @@
 
 	<!-- Compiles the Java source code -->
 	<target name="compile_java" description="Compiles the java source code">
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/**.java" taskname="lwjgl"/>
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/input/**" taskname="input"/>
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/openal/**" taskname="openal"/>
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" taskname="opengl"/>
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/vector/**" taskname="vector"/>
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/fmod3/**" taskname="fmod"/>
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/test/**" taskname="test"/>
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/examples/**" taskname="examples"/>
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/**" taskname="util"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/**.java" source="1.4" target="1.4" taskname="lwjgl"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/input/**" source="1.4" target="1.4" taskname="input"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/openal/**" source="1.4" target="1.4" taskname="openal"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" source="1.4" target="1.4" taskname="opengl"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/vector/**" source="1.4" target="1.4" taskname="vector"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/fmod3/**" source="1.4" target="1.4" taskname="fmod"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/test/**" source="1.4" target="1.4" taskname="test"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/examples/**" source="1.4" target="1.4" taskname="examples"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/**" source="1.4" target="1.4" taskname="util"/>
 	</target>
 	
 	<!-- Compiles the native files -->

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

Modified Files:
	lwjgl-demo.php lwjgl.jar lwjgl_fmod3.jar lwjgl_media.jar 
	lwjgl_test.jar lwjgl_util.jar 
Added Files:
	lwjgl_linux.jar lwjgl_win32.jar lwjglaudio_linux.jar 
	lwjglaudio_win32.jar lwjglfmod3_linux.jar lwjglfmod3_win32.jar 
Removed Files:
	lwjgl-media.jar lwjgl-windows.jar lwjglaudio-windows.jar 
	lwjglfmod3-windows.jar 
Log Message:
jnlp updated

--- lwjglfmod3-windows.jar DELETED ---

--- NEW FILE: lwjglaudio_win32.jar ---
(This appears to be a binary file; contents omitted.)

Index: lwjgl-demo.php
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/jnlp/lwjgl-demo.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lwjgl-demo.php	21 Jun 2004 21:51:22 -0000	1.2
+++ lwjgl-demo.php	6 Sep 2004 21:54:48 -0000	1.3
@@ -28,16 +28,25 @@
   </resources> 
   <resources os="Windows">
     <j2se version="1.4+"/> 
-    <nativelib href="lwjgl-windows.jar"/>
-    <nativelib href="lwjglaudio-windows.jar"/>
-    <nativelib href="lwjglfmod3-windows.jar"/>";
+    <nativelib href="lwjgl_win32.jar"/>
+    <nativelib href="lwjglaudio_win32.jar"/>
+    <nativelib href="lwjglfmod3_win32.jar"/>";
   </resources> 
   <resources os="Linux" arch="i386">
     <j2se version="1.4+"/> 
-    <nativelib href="lwjgl-linux.jar"/>
-    <nativelib href="lwjglaudio-linux.jar"/>
-    <nativelib href="lwjglfmod3-linux.jar"/>";
+    <nativelib href="lwjgl_linux.jar"/>
+    <nativelib href="lwjglaudio_linux.jar"/>
+    <nativelib href="lwjglfmod3_linux.jar"/>";
   </resources>   
   <!--<property key="java.library.path" value="." />-->
-  <application-desc main-class="org.lwjgl.<?php echo substr($_SERVER["PATH_INFO"], 1, strlen($_SERVER["PATH_INFO"])-1); ?>"/>
+  <application-desc main-class="org.lwjgl.<?php echo substr($_SERVER["PATH_INFO"], 1, strlen($_SERVER["PATH_INFO"])-1); ?>">
+  <?php
+    if(isset($HTTP_GET_VARS['arguments'])) {
+      $arguments = $HTTP_GET_VARS['arguments'];
+      foreach ($arguments as $argument) {
+        echo "<argument>" . $argument . "</argument>\n";
+      }
+    }
+  ?>
+  </application-desc>
 </jnlp>
\ No newline at end of file

--- NEW FILE: lwjgl_linux.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: lwjglfmod3_linux.jar ---
(This appears to be a binary file; contents omitted.)

--- lwjglaudio-windows.jar DELETED ---

--- lwjgl-windows.jar DELETED ---

Index: lwjgl_util.jar
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/jnlp/lwjgl_util.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsYbfXjI and /tmp/cvsrr1nSW differ

--- NEW FILE: lwjglfmod3_win32.jar ---
(This appears to be a binary file; contents omitted.)

--- lwjgl-media.jar DELETED ---

Index: lwjgl_fmod3.jar
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/jnlp/lwjgl_fmod3.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsVzGsvg and /tmp/cvsqBS0nv differ

Index: lwjgl_media.jar
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/jnlp/lwjgl_media.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsk0sG8p and /tmp/cvslIMjhF differ

--- NEW FILE: lwjglaudio_linux.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: lwjgl_win32.jar ---
(This appears to be a binary file; contents omitted.)

Index: lwjgl.jar
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/jnlp/lwjgl.jar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvs3zWjRC and /tmp/cvsCioi8R differ

Index: lwjgl_test.jar
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/jnlp/lwjgl_test.jar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvseW7poA and /tmp/cvshEmflQ differ

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

Modified Files:
	news.php 
Log Message:
0.92

Index: news.php
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/include/news.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- news.php	23 Jul 2004 15:25:26 -0000	1.4
+++ news.php	6 Sep 2004 21:06:33 -0000	1.5
@@ -3,26 +3,31 @@
   // =======================================================
 	// 
 	$news[0] = array(
+    "LWJGL 0.92 released!", 
+    "LWJGL 0.92 has arrived! Get Downloading! Please follow <a href=\"http://puppygames.net/forums/viewtopic.php?p=5052\">this thread</a> for more info",
+    "Monday, September 5th, 2004");
+
+  $news[1] = array(
     "LWJGL on Mac OS X (Donation Drive)", 
     "The initial Max OS X port was made by Elias on a Mac we borrowed. With the limited time in hand Elias successfully created a Mac port (although somewhat crippled). As some of you may know, we have since then tried many times to get Mac developers to join the team. So far we have met with limited success. In order to fix the LWJGL Mac port we needto have a dedicated developer with a Mac willing to offer a lot of spare time. To that end Elias (or actually the - soon to be - company <a href=\"http://oddlabs.com/\" target=\"_blank\">Oddlabs</a> that is currently working on Tribal Trouble) has expressed a willingness to purchase a Mac and commit to finally getting Mac OS X properly supported. As Elias has already proved his skills, we see this as a very good solution.<br><br>However, as many of you know Mac hardware is rather pricey - which is why we have decided to donate what is in the LWJGL donation fund (It was originally setupto allow us to do whatever needed to get a Mac port going). We hope to increase the fund to $1000 USD as fast as possible.The fund currently holds $90.89 USD. Caspian Rychlik-Prince willdonate $400 (!) to the cause which means we're already halfway! The sooner we reach the $1000 mark, the sooner the Mac port can be finished!<br><br>This is your chance to help out with the LWJGL library! So dig deep ;)<br><br>Should we increase this fund to more than $1000 the remaining money will be kept in the fund, and used to help with creating new features (ie. purchasing a controller to do the Force Feedback implementation), hosting on a proper server or other LWJGL causes.<br><br>To donate to the LWJGL fund, follow this link: <a href=\"http://sourceforge.net/donate/index.php?group_id=58488\" target=\"_blank\">http://sourceforge.net/donate/index.php?group_id=58488</a> (Paypal donation).<br><br>Note: 10% of all proceeds will go to EFF.<br>Should you wish to donate directly, without any proceeds going to EFF, you can do so by sending money to the: br...@ma... paypal account.",
     "Wednesday, July 21st, 2004");
 
-	$news[1] = array(
+	$news[2] = array(
     "LWJGL @ JavaOne", 
     "LWJGL powered <a href=\"http://www.puppygames.net/downloads/hallucinogenesis/hallucinogenesis.jnlp\">Super Elvis</a> by <a href=\"http://puppygames.net/\" target=\"_blank\">puppygames.net</a> won the Sun Microsystems 'Technology Game Development Contest'!\nAdditionally Sun demoed another application using LWJGL: <a href=\"http://home.halden.net/tombr/squareheads/squareheads.html\" target=\"_blank\">Square Heads</a> and commented on it's sheer speed.",
     "Wednesday, June 30th, 2004");
 
-  $news[2] = array(
+  $news[3] = array(
     "LWJGL Wiki", 
     "One of LWJGL's shortcommings has always been the lack of good tutorials and examples. Well all this ends now! We have setup a wiki, and all registered users may add new articles, FAQ entries and more. So please start filling the wiki with content:<br><a href=\"http://wiki.lwjgl.org\" target=\"_blank\">LWJGL Wiki</a>",
     "Thursday, April 29th, 2004");
 
-  $news[3] = array(
+  $news[4] = array(
     "LWJGL 0.9a released", 
     "LWJGL 0.9 alpha has been released! Download <a href=\"http://www.lwjgl.org/download.php\">here</a>.<br>consider <a href=\"http://sourceforge.net/donate/index.php?group_id=58488\">donating</a> if you find LWJGL usefull.",
     "Tuesday, April 13th, 2004");
   
-  $news[4] = array(
+  $news[5] = array(
     "New site!", 
     "Welcome to the grand opening of our new site! Please browse around. Should you find any errors or have trouble finding exactly what your looking for, please email <a href=\"mailto:in...@lw...\">in...@lw...</a>",
     "Sunday, March 28th, 2004");

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

Modified Files:
	changelog.php 
Log Message:
0.92

Index: changelog.php
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/changelog.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- changelog.php	13 Apr 2004 18:13:27 -0000	1.3
+++ changelog.php	6 Sep 2004 21:05:29 -0000	1.4
@@ -22,6 +22,7 @@
     <p>
       <ul>
       	<li><a href="changelogs/full-changelog.txt">Full changelog</a></li>
+      	<li><a href="#0.92">LWJGL 0.92</a></li>
       	<li><a href="#0.90">LWJGL 0.90</a></li>
         <li><a href="#0.89">LWJGL 0.89</a></li>
         <li><a href="#0.80">LWJGL 0.80</a></li>
@@ -35,6 +36,7 @@
       </ul>
     </p>
 
+    <?php printChangelog("0.92"); ?>
     <?php printChangelog("0.90"); ?>
     <?php printChangelog("0.89"); ?>
     <?php printChangelog("0.80"); ?>

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

Modified Files:
	full-changelog.txt 
Added Files:
	0.92-changelog.txt 
Log Message:
0.92

--- NEW FILE: 0.92-changelog.txt ---
2004-09-06 22:31  matzon

	* build.xml: neeeed moooree fiiilleeessss

2004-09-06 22:30  matzon

	* doc/README: updated to be in line with 0.92

2004-09-06 22:08  matzon

	* build.xml: create media file too

2004-09-06 22:05  matzon

	* res/resources.txt: updated resource file

2004-09-06 22:04  matzon

	* res/: Wave1.WAV, Wave2.WAV, Wave3.WAV, mono.wav, stereo.wav,
[...2154 lines suppressed...]
	  images/opengl_logo.png, include/default.php: logo stuff

2004-04-16 12:46  cix_foo

	* src/java/org/lwjgl/examples/Game.java: First example code checked
	  in!

2004-04-13 22:33  matzon

	* www/installation.php: linux often needs -Djava.library.path

2004-04-13 22:07  matzon

	* www/download.php, www/include/news.php, build.xml, doc/README:
	  ready for 0.9

2004-04-13 20:13  matzon

	* www/: changelog.php, changelogs/0.90-changelog.txt,
	  changelogs/full-changelog.txt: 0.9 changelogs
Index: full-changelog.txt
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/changelogs/full-changelog.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- full-changelog.txt	13 Apr 2004 18:13:28 -0000	1.2
+++ full-changelog.txt	6 Sep 2004 21:05:05 -0000	1.3
@@ -1,3 +1,2197 @@
+2004-09-06 22:31  matzon
+
+	* build.xml: neeeed moooree fiiilleeessss
+
+2004-09-06 22:30  matzon
+
+	* doc/README: updated to be in line with 0.92
+
+2004-09-06 22:08  matzon
+
+	* build.xml: create media file too
[...2679 lines suppressed...]
 	  opengl/CoreGL14Constants.java, opengl/GL.java,
-	  opengl/GLConstants.java, opengl/OpenGLException.java,
-	  vector/Matrix2f.java, vector/Matrix3f.java, vector/Matrix4f.java,
-	  vector/Vector2f.java, vector/Vector3f.java, vector/Vector4f.java:
-	  First code import.
+	  opengl/GLConstants.java, opengl/OpenGLException.java: First code
+	  import.
 
 2002-08-06 17:10  cix_foo
 
@@ -7912,9 +9892,3 @@
 	  src/native/common/manifest.txt, src/native/win32/manifest.txt:
 	  Initial revision
 
-2002-07-23 22:11  root
-
-	* CVSROOT/: checkoutlist, commitinfo, config, cvswrappers,
-	  editinfo, loginfo, modules, notify, rcsinfo, taginfo, verifymsg:
-	  initial checkin
-

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

Modified Files:
	build.xml 
Log Message:
neeeed moooree fiiilleeessss

Index: build.xml
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- build.xml	6 Sep 2004 20:08:26 -0000	1.31
+++ build.xml	6 Sep 2004 20:31:22 -0000	1.32
@@ -20,11 +20,12 @@
 	
 	<!-- Files to include in the lwjgl.jar file -->
 	<fileset id="lwjgl.fileset" dir="${lwjgl.bin}">
-		<include name="**/*.java"/>
+		<include name="**"/>
 		<exclude name="**.*"/>
 		<exclude name="org/lwjgl/fmod3/**"/>		
 		<exclude name="org/lwjgl/test/**"/>
 		<exclude name="org/lwjgl/util/**"/>
+		<exclude name="org/lwjgl/examples/**"/>
 	</fileset>  
 	  
 	<!-- Files to include in the lwjgl_test.jar file -->

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

Modified Files:
	README 
Log Message:
updated to be in line with 0.92

Index: README
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/doc/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- README	13 Apr 2004 20:09:12 -0000	1.6
+++ README	6 Sep 2004 20:30:21 -0000	1.7
@@ -11,28 +11,54 @@
  Extract the archive, and cd into directory
  Extract the media files into lwjgl folder (only needed for openal tests)
 
-  java -cp .;lwjgl_test.jar;lwjgl.jar; DEMO
+  java -cp lwjgl.jar;lwjgl_media.jar;lwjgl_test.jar;lwjgl_util.jar;lwjgl_fmod3.jar; TEST
   or
-  java -cp .;lwjgl_test.jar;lwjgl.jar; -Djava.library.path=. DEMO 
-  (this specifies that the jvm should locate the lwjgl libs in current 
+  java -cp lwjgl.jar;lwjgl_media.jar;lwjgl_test.jar;lwjgl_util.jar;lwjgl_fmod3.jar; -Djava.library.path=. TEST 
+  (this specifies that the jvm should locate the lwjgl native libs in current 
   directory)
   
- where DEMO is one of the following: 
+ where TEST is one of the following: 
  
   org.lwjgl.test.input.ControllerCreationTest (Requires attached Controller)
   org.lwjgl.test.input.ControllerTest (Requires attached Controller)
+  org.lwjgl.test.input.ControllerFieldTest (Requires attached Controller)
   org.lwjgl.test.input.MouseCreationTest
   org.lwjgl.test.input.MouseTest
-  org.lwjgl.test.openal.ALCTest
+  org.lwjgl.test.input.HWCursorTest
+  org.lwjgl.test.input.KeyboardTest
+  
   org.lwjgl.test.openal.ALCTest
   org.lwjgl.test.openal.EAXTest (Requires EAX compatible hardware)
+  org.lwjgl.test.openal.OpenALCreationTest
   org.lwjgl.test.openal.MovingSoundTest
   org.lwjgl.test.openal.PlayTest
   org.lwjgl.test.openal.PlayTestMemory
   org.lwjgl.test.openal.SourceLimitTest
+  org.lwjgl.test.openal.PositionTest
   org.lwjgl.test.openal.StressTest
-  org.lwjgl.test.opengl.Grass (Requires nVidia hardware)
-  org.lwjgl.test.opengl.Game
+  org.lwjgl.test.openal.SourceLimitTest
+  
+  org.lwjgl.test.opengl.FullScreenWindowedTest
+  org.lwjgl.test.opengl.PbufferTest
+  org.lwjgl.test.opengl.VBOIndexTest
+  org.lwjgl.test.opengl.VBOTest
+  
+  org.lwjgl.test.opengl.pbuffers.PbufferTest
+  
+  org.lwjgl.test.opengl.shaders.ShadersTest
+
+  [requires fmod dll (fmod.org)]  
+  org.lwjgl.test.fmod3.CDDAPlayer
+  org.lwjgl.test.fmod3.CDPlayer
+  org.lwjgl.test.fmod3.DSPTest
+  org.lwjgl.test.fmod3.MusicPlayer
+  org.lwjgl.test.fmod3.NetTest
+  org.lwjgl.test.fmod3.StreamPlayer
+  org.lwjgl.test.fmod3.StreamTest
+  org.lwjgl.test.fmod3.SyncTest
+  
+You may also run the Space invaders demo by executing:
+  java -cp lwjgl.jar;lwjgl_media.jar;lwjgl_test.jar;lwjgl_util.jar; org.lwjgl.examples.spaceinvaders.Game
   
 Project Webpage: www.lwjgl.org
 Project Forum: forum.lwjgl.org

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

Modified Files:
	build.xml 
Log Message:
create media file too

Index: build.xml
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- build.xml	6 Sep 2004 19:51:11 -0000	1.30
+++ build.xml	6 Sep 2004 20:08:26 -0000	1.31
@@ -244,6 +244,11 @@
 		<jar destfile="${lwjgl.lib}/lwjgl_fmod3.jar" taskname="lwjgl_fmod3.jar">
 			<fileset refid="lwjgl_fmod3.fileset"/>
 		</jar>		
+		
+		<!-- Create lwjgl_media.jar -->
+		<jar destfile="${lwjgl.lib}/lwjgl_media.jar" taskname="lwjgl_media.jar">
+			<fileset refid="lwjgl.media.fileset"/>
+		</jar>		
 	</target>
   
 	<!-- Creates the Javadoc -->

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

Modified Files:
	resources.txt 
Log Message:
updated resource file

Index: resources.txt
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/res/resources.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- resources.txt	31 May 2004 12:49:57 -0000	1.1
+++ resources.txt	6 Sep 2004 20:05:26 -0000	1.2
@@ -1,10 +1,4 @@
 The following files are included in the resource archive:
-Wave1.WAV - from openal.org cvs
-Wave2.WAV - from openal.org cvs
-Wave3.WAV - from openal.org cvs
-Wave4.WAV - from openal.org cvs
-stereo.wav - from openal.org cvs
-mono.wav - from openal.org cvs
 Footsteps.wav - from openal.org cvs
 ding.wav - from openal.org cvs
 left.wav - sampled by matzon

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

Removed Files:
	mono.wav stereo.wav Wave1.WAV Wave2.WAV Wave3.WAV Wave4.WAV 
Log Message:
nuke media files not in use

--- mono.wav DELETED ---

--- Wave4.WAV DELETED ---

--- Wave2.WAV DELETED ---

--- Wave3.WAV DELETED ---

--- stereo.wav DELETED ---

--- Wave1.WAV DELETED ---

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

Modified Files:
	demos.php 
Log Message:
remove grass

Index: demos.php
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/www/demos.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- demos.php	21 Jun 2004 21:52:11 -0000	1.3
+++ demos.php	6 Sep 2004 19:53:04 -0000	1.4
@@ -46,7 +46,6 @@
     <pre>
       FullScreenWindowedTest    [<a href="jnlp/lwjgl-demo.php/test.opengl.FullScreenWindowedTest">launch</a> | <a href="jnlp/source.php?path=test/opengl/FullScreenWindowedTest.java" target="_blank">source</a>]
       Game                      [<a href="jnlp/lwjgl-demo.php/test.opengl.Game">launch</a> | <a href="jnlp/source.php?path=test/opengl/Game.java" target="_blank">source</a>]
-      Grass                     [<a href="jnlp/lwjgl-demo.php/test.opengl.Grass">launch</a> | <a href="jnlp/source.php?path=test/opengl/Grass.java" target="_blank">source</a>]
       PbufferTest               [<a href="jnlp/lwjgl-demo.php/test.opengl.PbufferTest">launch</a> | <a href="jnlp/source.php?path=test/opengl/PbufferTest.java" target="_blank">source</a>]
       VBOIndexTest              [<a href="jnlp/lwjgl-demo.php/test.opengl.VBOIndexTest">launch</a> | <a href="jnlp/source.php?path=test/opengl/VBOIndexTest.java" target="_blank">source</a>]
       VBOTest                   [<a href="jnlp/lwjgl-demo.php/test.opengl.VBOTest">launch</a> | <a href="jnlp/source.php?path=test/opengl/VBOTest.java" target="_blank">source</a>]

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

Modified Files:
	build.xml 
Log Message:
fixed some small build issues

Index: build.xml
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- build.xml	6 Sep 2004 16:36:08 -0000	1.29
+++ build.xml	6 Sep 2004 19:51:11 -0000	1.30
@@ -20,7 +20,7 @@
 	
 	<!-- Files to include in the lwjgl.jar file -->
 	<fileset id="lwjgl.fileset" dir="${lwjgl.bin}">
-		<include name="**"/>
+		<include name="**/*.java"/>
 		<exclude name="**.*"/>
 		<exclude name="org/lwjgl/fmod3/**"/>		
 		<exclude name="org/lwjgl/test/**"/>
@@ -89,6 +89,7 @@
 	<fileset id="lwjgl.source.fileset" dir=".">
 		<include name="build.xml"/>	
 		<include name="src/**"/>
+		<include name="platform_build/**"/>
 		<exclude name="**/*CVS*"/>
 		<exclude name="native/projb/**"/>
 	</fileset> 	
@@ -310,25 +311,14 @@
   
 	<!-- Creates a versioned distribution for all supported platforms -->
 	<target name="-distribution_application">
-		<!-- check each platform, and run their copy target -->
-        <condition property="lwjgl.platform.windows">
-          <os family="windows"/>
-        </condition>
-        <antcall target="-distribute_win32"/>
-
-        <condition property="lwjgl.platform.linux">
-          <os name="Linux"/>
-        </condition>
-        <antcall target="-distribute_linux"/>
-        
-        <condition property="lwjgl.platform.mac">
-          <os name="Mac OS X"/>
-        </condition>
-        <antcall target="-distribute_macosx"/>	
+    <!-- check each platform, and run their copy target -->
+    <antcall target="-distribute_win32"/>
+    <antcall target="-distribute_linux"/>
+    <antcall target="-distribute_macosx"/>	
 	</target>
 	
 	<!-- Distributes win32 files  -->
-	<target name="-distribute_win32" if="lwjgl.platform.windows">
+	<target name="-distribute_win32">
 		<!-- copy files from lib/platform to temp -->
 		<copy todir="${lwjgl.temp}/lwjgl-win32-${lwjgl.version}">
 			<fileset dir="${lwjgl.lib}">
@@ -339,11 +329,11 @@
 				<patternset refid="lwjgl-common.fileset"/>
 			</fileset>
 		</copy>	
-		<zip destfile="${lwjgl.dist}/lwjgl-win32-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="**"/>
+		<zip destfile="${lwjgl.dist}/lwjgl-win32-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="lwjgl-win32-${lwjgl.version}/**"/>
 	</target>	
 	
 	<!-- Distributes linux files  -->
-	<target name="-distribute_linux" if="lwjgl.platform.linux">
+	<target name="-distribute_linux">
 		<!-- copy files from lib/platform to temp -->
 		<copy todir="${lwjgl.temp}/lwjgl-linux-${lwjgl.version}">
 			<fileset dir="${lwjgl.lib}">
@@ -354,11 +344,11 @@
 				<patternset refid="lwjgl-common.fileset"/>
 			</fileset>
 		</copy>	
-		<zip destfile="${lwjgl.dist}/lwjgl-linux-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="**"/>
+		<zip destfile="${lwjgl.dist}/lwjgl-linux-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="lwjgl-linux-${lwjgl.version}/**"/>
 	</target>
 	
 	<!-- Distributes macosx files  -->
-	<target name="-distribute_macosx" if="lwjgl.platform.macosx">
+	<target name="-distribute_macosx">
 		<!-- copy files from lib/platform to temp -->
 		<copy todir="${lwjgl.temp}/lwjgl-macosx-${lwjgl.version}">
 			<fileset dir="${lwjgl.lib}">
@@ -369,7 +359,7 @@
 				<patternset refid="lwjgl-common.fileset"/>
 			</fileset>
 		</copy>	
-		<zip destfile="${lwjgl.dist}/lwjgl-macosx-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="**"/>		
+		<zip destfile="${lwjgl.dist}/lwjgl-macosx-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="lwjgl-macosx-${lwjgl.version}/**"/>		
 	</target>		
     
 	<!-- Creates a versioned distribution of javadocs -->

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

Modified Files:
	build-fmod.bat 
Log Message:
enable exception handling
copy to libs

Index: build-fmod.bat
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/platform_build/win32_ms_cmdline/build-fmod.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- build-fmod.bat	30 Jun 2004 23:26:54 -0000	1.3
+++ build-fmod.bat	6 Sep 2004 16:41:45 -0000	1.4
@@ -3,7 +3,7 @@
 set JAVAHOME=C:\Java\jdk1.5.0
 set FMODHOME="C:\Program Files\fmodapi373win\api\inc"
 set PLTSDKHOME="C:\Program Files\Microsoft SDK"
-set COPTIONS=/I%FMODHOME% /I%PLTSDKHOME%\include /I%JAVAHOME%\include /I%JAVAHOME%\include\win32 /I..\..\src\native\common /O2 /nologo /c
+set COPTIONS=/I%FMODHOME% /I%PLTSDKHOME%\include /I%JAVAHOME%\include /I%JAVAHOME%\include\win32 /I..\..\src\native\common /O2 /nologo /c /EHsc
 set LINKEROPTS=/link /LIBPATH:%PLTSDKHOME%\Lib
 set LIBS=user32.lib Gdi32.lib Advapi32.lib
 
@@ -12,4 +12,6 @@
 
 cl /LD /Felwjgl-fmod3.dll *.obj %LINKEROPTS% %LIBS%
 
-del *.obj *.exp *.lib
\ No newline at end of file
+del *.obj *.exp *.lib
+
+copy lwjgl-fmod3.dll ..\..\libs\

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

Modified Files:
	build.xml 
Log Message:
latest and greatest

Index: build.xml
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- build.xml	21 Jul 2004 09:25:52 -0000	1.28
+++ build.xml	6 Sep 2004 16:36:08 -0000	1.29
@@ -12,7 +12,7 @@
 	<property name="lwjgl.docs"           value="./doc"/>
 	<property name="lwjgl.temp"           value="./temp"/>
 	<property name="lwjgl.res"            value="./res"/>
-	<property name="lwjgl.version"        value="0.9"/>
+	<property name="lwjgl.version"        value="0.92"/>
  
 	<!-- ================================================================== -->  
 	<!-- Filesets used for targets 											-->
@@ -31,6 +31,7 @@
 	<fileset id="lwjgl_test.fileset" dir="${lwjgl.bin}">
 		<exclude name="**.*"/>
 		<include name="org/lwjgl/test/**"/>
+		<include name="org/lwjgl/examples/**"/>
 	</fileset>
 	
 	<!-- Files to include in the lwjgl_util.jar file -->
@@ -38,7 +39,7 @@
 		<exclude name="**.*"/>
 		<include name="org/lwjgl/util/**"/>
 	</fileset>
-	
+
 	<!-- Files to include in the lwjgl_fmod3.jar file -->
 	<fileset id="lwjgl_fmod3.fileset" dir="${lwjgl.bin}">
 		<exclude name="**.*"/>
@@ -64,7 +65,7 @@
 	<patternset id="lwjgl-win32.fileset">
 		<patternset refid="lwjgl-common.fileset"/>
 		<include name="lwjgl.dll"/>
-		<include name="lwjgl-fmod.dll"/>		
+		<include name="lwjgl-fmod3.dll"/>		
 		<include name="lwjglaudio.dll"/>
 	</patternset>  
   
@@ -72,7 +73,7 @@
 	<patternset id="lwjgl-linux.fileset">
 		<patternset refid="lwjgl-common.fileset"/>
 		<include name="liblwjgl.so"/>
-		<include name="liblwjgl-fmod.so"/>		
+		<include name="liblwjgl-fmod3.so"/>		
 		<include name="libopenal.so"/>
 	</patternset>  
 	
@@ -80,7 +81,7 @@
 	<patternset id="lwjgl-macosx.fileset">
 		<patternset refid="lwjgl-common.fileset"/>
 		<include name="liblwjgl.jnilib"/>
-		<include name="liblwjgl-fmod.jnilib"/>		
+		<include name="liblwjgl-fmod3.jnilib"/>		
 		<include name="openal.dylib"/>
 	</patternset>	
 	
@@ -106,7 +107,7 @@
   <!-- ================================================================== -->
 	<!-- Initialize build			 										-->
 	<!-- ================================================================== -->	
-	<target name="initialize">
+	<target name="-initialize">
 	  <mkdir dir="${lwjgl.bin}" taskname="initialiazing bin folder"/>
 	  <mkdir dir="${lwjgl.lib}" taskname="initialiazing lib folder"/>
 	  <mkdir dir="${lwjgl.dist}" taskname="initialiazing dist folder"/>
@@ -115,13 +116,8 @@
 	  <mkdir dir="${lwjgl.temp}" taskname="initialiazing temp folder"/>	
 	</target>
   
-  	<!-- Creates a splash screen -->
-	<target name="splash">
-		<splash imageurl="http://java-game-lib.sourceforge.net/images/logo.png" showduration="0" taskname="progressscreen"/>  
-	</target>
-  
 	<!-- Performs all the tasks needed for a distribution of LWJGL -->
-	<target name="all" depends="splash" description="compile. make jars. javadoc and distribute">
+	<target name="all" description="Compile. Make jars. Javadoc and distribute">
   
 	    <!-- Though we perform all targets, we do it in somewhat mixed. -->
 	    <!-- This is because we want the 'distribution_application' target to be -->
@@ -131,19 +127,19 @@
 	    <!-- the javadoc target, since the 'distribution' target will try to create the javadoc -->
 	    <!-- archive. -->
 		<antcall target="clean"/>
-		<antcall target="initialize"/>
+		<antcall target="-initialize"/>
 		<antcall target="compile_java"/>
 		<antcall target="compile_native"/>
-		<antcall target="jars"/>
-		<antcall target="distribution_application"/>
+		<antcall target="-jars"/>
+		<antcall target="-distribution_application"/>
 		<antcall target="javadoc"/>
-		<antcall target="distribution_javadoc"/>
-		<antcall target="distribution_source"/>
-		<antcall target="internal_clean"/>    
+		<antcall target="-distribution_javadoc"/>
+		<antcall target="-distribution_source"/>
+		<antcall target="-internal_clean"/>    
 	</target>
 
 	<!-- Cleans up any files created during the execution of this script -->
-	<target name="clean" description="Cleans the diectories controlled by this ant script (temp, dist, lib, javadoc, class files in bin)">
+	<target name="clean" description="Cleans the diectories controlled by this ant script">
 		<delete dir="${lwjgl.temp}" quiet="true" failonerror="false" taskname="cleaning temp folder"/>
 		<delete dir="${lwjgl.dist}" quiet="true" failonerror="false" taskname="cleaning dist folder"/>
 		<delete dir="${lwjgl.docs}/javadoc" quiet="true" failonerror="false" taskname="cleaning javadoc folder"/>
@@ -153,50 +149,63 @@
 		</delete>
 	</target>
 
-	<!-- Compiles the code for LWJGL -->
-	<target name="compile" depends="initialize" description="Compiles code">
-		<antcall target="compile_java"/>
-		<antcall target="compile_native"/>
-	</target>
-  
 	<!-- Compiles the Java source code -->
 	<target name="compile_java" description="Compiles the java source code">
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/**.java" source="1.4" taskname="lwjgl"/>
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/input/**" source="1.4" taskname="input"/>
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/openal/**" source="1.4" taskname="openal"/>
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" source="1.4" taskname="opengl"/>
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/vector/**" source="1.4" taskname="vector"/>
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/fmod3/**" source="1.4" taskname="fmod"/>
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/test/**" source="1.4" taskname="test"/>
-		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/**" source="1.4" taskname="util"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/**.java" taskname="lwjgl"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/input/**" taskname="input"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/openal/**" taskname="openal"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" taskname="opengl"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/vector/**" taskname="vector"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/fmod3/**" taskname="fmod"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/test/**" taskname="test"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/examples/**" taskname="examples"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/**" taskname="util"/>
 	</target>
 	
 	<!-- Compiles the native files -->
-	<target name="compile_native" description="Compiles the native files">
+	<target name="compile_native" depends="headers" description="Compiles the native files" unless="lwjgl.nocompile">
 		<!-- check each platform, and run their build target -->
         <condition property="lwjgl.platform.windows">
           <os family="windows"/>
         </condition>
-        <antcall target="compile_native_win32"/>
+        <antcall target="-compile_native_win32"/>
 
         <condition property="lwjgl.platform.linux">
           <os name="Linux"/>
         </condition>
-        <antcall target="compile_native_linux"/>
+        <antcall target="-compile_native_linux"/>
         
         <condition property="lwjgl.platform.mac">
           <os name="Mac OS X"/>
         </condition>
-        <antcall target="compile_native_mac"/>
+        <antcall target="-compile_native_mac"/>
 	</target>	
 	
 	<!-- Compiles LWJGL on Win32 platforms  -->
-	<target name="compile_native_win32" description="Compiles LWJGL on Win32 platforms" if="lwjgl.platform.windows">
-		<echo>Sorry, LWJGL does not yet allow compilation of the win32 version via commandline</echo>
+	<target name="-compile_native_win32" if="lwjgl.platform.windows">
+	  <echo>Compiling Win32 LWJGL version</echo>
+		<!-- build main -->
+		<exec dir="platform_build/win32_ms_cmdline" executable="cmd.exe" failonerror="true">
+			<arg line="/c build.bat"/>
+		</exec>
+		
+		<!-- build fmod -->
+		<exec dir="platform_build/win32_ms_cmdline" executable="cmd.exe" failonerror="true">
+			<arg line="/c build-fmod.bat"/>
+		</exec>
+		
+		<!-- optimize using upx -->
+		<!-- <exec dir="${lwjgl.lib}" executable="upx">
+			<arg line="-9 -f win32/*.dll"/>
+		</exec> -->
+		
+		<!-- copy to libs -->
+		<move file="platform_build/win32_ms_cmdline/lwjgl.dll" tofile="${lwjgl.lib}/lwjgl.dll"/>
+		<move file="platform_build/win32_ms_cmdline/lwjgl-fmod3.dll" tofile="${lwjgl.lib}/lwjgl-fmod3.dll"/>
 	</target>	
 	
-	<!-- Compiles LWJGL on Linux platforms  -->
-	<target name="compile_native_linux" description="Compiles LWJGL on Linux platforms" if="lwjgl.platform.linux">
+	<!-- Compiles LWJGL on Linux platforms -->
+	<target name="-compile_native_linux" if="lwjgl.platform.linux">
 		<echo>Compiling Linux LWJGL version</echo>
 		<apply executable="sh" dir="${lwjgl.src.native}">
 		  <fileset dir="${lwjgl.src.native}">
@@ -207,19 +216,14 @@
 	</target>	
 	
 	<!-- Compiles LWJGL on Mac OS X platforms  -->
-	<target name="compile_native_mac" description="Compiles LWJGL on Mac OS X platforms" if="lwjgl.platform.mac">
+	<target name="-compile_native_mac" if="lwjgl.platform.mac">
 		<echo>Compiling Mac OS X LWJGL version</echo>
-    <apply executable="sh" dir="${lwjgl.src.native}">
-		  <fileset dir="${lwjgl.src.native}">
-		    <include name="build.sh"/>
-		  </fileset>
-		</apply>
-		<move file="${lwjgl.src.native}/.libs/liblwjgl.0.0.0" tofile="${lwjgl.lib}/liblwjgl.jnilib"/>
-
+		<exec dir="platform_build/mac_xcode" executable="xcodebuild" failonerror="true"/>
+		<move file="platform_build/mac_xcode/build/liblwjgl.jnilib" tofile="${lwjgl.lib}/liblwjgl.jnilib"/>
 	</target>	
   	
-  	<!-- Packages the files -->
-	<target name="jars" description="packages the java source files">
+  	<!-- Packages the java files -->
+	<target name="-jars">
   		<!-- Create lwjgl.jar -->
 		<jar destfile="${lwjgl.lib}/lwjgl.jar" taskname="lwjgl.jar">
 			<fileset refid="lwjgl.fileset"/>
@@ -246,21 +250,21 @@
 		<javadoc destdir="${lwjgl.docs}/javadoc" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API">
 			<fileset refid="lwjgl.javadoc.fileset"/>
 			<doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
-			<bottom><![CDATA[<i>Copyright &#169; 2003-2004 lwjgl.org. All Rights Reserved.</i>]]></bottom>
+			<bottom><![CDATA[<i>Copyright &#169; 2002-2004 lwjgl.org. All Rights Reserved.</i>]]></bottom>
 		</javadoc>
 	</target>  
   
 	<!-- Creates a distribution from the compiled files -->
-	<target name="distribution" depends="jars" description="Creates a versioned distribution of lwjgl">  
-		<antcall target="distribution_application"/>
-		<antcall target="distribution_javadoc"/>
-		<antcall target="distribution_source"/>
-		<antcall target="distribution_resources"/>
-		<antcall target="internal_clean"/>
+	<target name="-distribution" depends="-jars">  
+		<antcall target="-distribution_application"/>
+		<antcall target="-distribution_javadoc"/>
+		<antcall target="-distribution_source"/>
+		<antcall target="-distribution_resources"/>
+		<antcall target="-internal_clean"/>
 	</target>
   
 	<!-- Creates a build of LWJGL directly from CVS -->
-	<target name="cvsbuild" description="Builds lwjgl, by exporting files from cvs into a LWJGL folder and executing the package target on that folders build file">
+	<target name="cvsbuild" description="Builds lwjgl from cvs">
 		<!-- Check that files do not exist BEFORE doing the CVS build -->
 		<available file="LWJGL/build.xml" property="lwjgl.preexistingfiles"/>
 		<available file="${lwjgl.src}/java/org/lwjgl/Sys.java" property="lwjgl.preexistingfiles"/>
@@ -274,7 +278,8 @@
 	</target>  
   
 	<!-- Generates the native headers from source files -->
-	<target name="headers" description="invokes javah on java classes, producing the headers needed for native compilation" depends="compile_java">
+	<target name="headers" description="invokes javah on java classes" depends="compile_java">
+	  <!-- lwjgl -->
 		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes">
 			<class name="org.lwjgl.Sys"/>
 			  
@@ -294,6 +299,8 @@
 			<class name="org.lwjgl.opengl.Display"/>
 			<class name="org.lwjgl.opengl.Pbuffer"/>
 		</javah>    
+		
+		<!-- fmod -->
 		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}/fmod3" force="yes">
 			<class name="org.lwjgl.fmod3.FMOD"/>
 			<class name="org.lwjgl.fmod3.FMusic"/>
@@ -302,26 +309,26 @@
 	</target>
   
 	<!-- Creates a versioned distribution for all supported platforms -->
-	<target name="distribution_application">
+	<target name="-distribution_application">
 		<!-- check each platform, and run their copy target -->
         <condition property="lwjgl.platform.windows">
           <os family="windows"/>
         </condition>
-        <antcall target="distribute_win32"/>
+        <antcall target="-distribute_win32"/>
 
         <condition property="lwjgl.platform.linux">
           <os name="Linux"/>
         </condition>
-        <antcall target="distribute_linux"/>
+        <antcall target="-distribute_linux"/>
         
         <condition property="lwjgl.platform.mac">
           <os name="Mac OS X"/>
         </condition>
-        <antcall target="distribute_macosx"/>	
+        <antcall target="-distribute_macosx"/>	
 	</target>
 	
 	<!-- Distributes win32 files  -->
-	<target name="distribute_win32" description="Distributes win32 files" if="lwjgl.platform.windows">
+	<target name="-distribute_win32" if="lwjgl.platform.windows">
 		<!-- copy files from lib/platform to temp -->
 		<copy todir="${lwjgl.temp}/lwjgl-win32-${lwjgl.version}">
 			<fileset dir="${lwjgl.lib}">
@@ -336,7 +343,7 @@
 	</target>	
 	
 	<!-- Distributes linux files  -->
-	<target name="distribute_linux" description="Distributes linux files" if="lwjgl.platform.linux">
+	<target name="-distribute_linux" if="lwjgl.platform.linux">
 		<!-- copy files from lib/platform to temp -->
 		<copy todir="${lwjgl.temp}/lwjgl-linux-${lwjgl.version}">
 			<fileset dir="${lwjgl.lib}">
@@ -351,7 +358,7 @@
 	</target>
 	
 	<!-- Distributes macosx files  -->
-	<target name="distribute_macosx" description="Distributes macosx files" if="lwjgl.platform.macosx">
+	<target name="-distribute_macosx" if="lwjgl.platform.macosx">
 		<!-- copy files from lib/platform to temp -->
 		<copy todir="${lwjgl.temp}/lwjgl-macosx-${lwjgl.version}">
 			<fileset dir="${lwjgl.lib}">
@@ -366,26 +373,26 @@
 	</target>		
     
 	<!-- Creates a versioned distribution of javadocs -->
-	<target name="distribution_javadoc">
+	<target name="-distribution_javadoc">
 		<zip destfile="${lwjgl.dist}/lwjgl-docs-${lwjgl.version}.zip" basedir="${lwjgl.docs}" includes="javadoc/**"/>
 	</target>
   
 	<!-- Creates a versioned distribution of the source code -->
-	<target name="distribution_source">
+	<target name="-distribution_source">
 		<zip destfile="${lwjgl.dist}/lwjgl-source-${lwjgl.version}.zip">
 			<fileset refid="lwjgl.source.fileset"/>
 		</zip>
 	</target>
 	
 	<!-- Creates a versioned distribution of the resource files -->
-	<target name="distribution_resources">
+	<target name="-distribution_resources">
 		<zip destfile="${lwjgl.dist}/lwjgl-media-${lwjgl.version}.zip">
 			<fileset refid="lwjgl.media.fileset"/>
 		</zip>
 	</target>	
   
   	<!-- clean internal temporary directories -->
-	<target name="internal_clean">
+	<target name="-internal_clean">
 		<delete dir="${lwjgl.temp}" taskname="cleanup"/>
 	</target>
 </project>

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

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
Removed commented out code

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.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- org_lwjgl_input_Mouse.cpp	23 Aug 2004 10:59:47 -0000	1.62
+++ org_lwjgl_input_Mouse.cpp	6 Sep 2004 10:21:34 -0000	1.63
@@ -196,8 +196,6 @@
 JNIEXPORT jint JNICALL Java_org_lwjgl_input_Mouse_nGetNativeCursorCaps
   (JNIEnv *env, jclass clazz) {
 	int caps = 0;
-/*	if (!isXcursorLoaded())
-		return caps;*/
 	XcursorBool argb_supported = XcursorSupportsARGB(getDisplay());
 	XcursorBool anim_supported = XcursorSupportsAnim(getDisplay());
 	if (argb_supported)
@@ -263,14 +261,12 @@
 	buffer_enabled = false;
 	updatePointerGrab();
 	initEventQueue(&event_queue);
-//	loadXcursor();
 	doWarpPointer();
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nDestroy
   (JNIEnv * env, jclass clazz)
 {
-//	closeXcursor();
 	ungrabPointer();
 	XFreeCursor(getDisplay(), blank_cursor);
 	created = false;

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

Modified Files:
	org_lwjgl_opengl_GLContext.h 
Log Message:
Removed commented out code

Index: org_lwjgl_opengl_GLContext.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLContext.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_opengl_GLContext.h	5 Jul 2004 14:34:47 -0000	1.6
+++ org_lwjgl_opengl_GLContext.h	6 Sep 2004 10:21:33 -0000	1.7
@@ -8,11 +8,12 @@
 extern "C" {
 #endif
 /* Inaccessible static: currentContext */
-/* Inaccessible static: GL_ARB_imaging */
 /* Inaccessible static: GL_ARB_depth_texture */
+/* Inaccessible static: GL_ARB_draw_buffers */
 /* Inaccessible static: GL_ARB_fragment_program */
 /* Inaccessible static: GL_ARB_fragment_program_shadow */
 /* Inaccessible static: GL_ARB_fragment_shader */
+/* Inaccessible static: GL_ARB_imaging */
 /* Inaccessible static: GL_ARB_matrix_palette */
 /* Inaccessible static: GL_ARB_multisample */
 /* Inaccessible static: GL_ARB_multitexture */
@@ -32,6 +33,7 @@
 /* Inaccessible static: GL_ARB_texture_env_dot3 */
 /* Inaccessible static: GL_ARB_texture_mirrored_repeat */
 /* Inaccessible static: GL_ARB_texture_non_power_of_two */
+/* Inaccessible static: GL_ARB_texture_rectangle */
 /* Inaccessible static: GL_ARB_transpose_matrix */
 /* Inaccessible static: GL_ARB_vertex_blend */
 /* Inaccessible static: GL_ARB_vertex_buffer_object */
@@ -123,6 +125,7 @@
 /* Inaccessible static: exts */
 /* Inaccessible static: gl_ref_count */
 /* Inaccessible static: did_auto_load */
+/* Inaccessible static: loaded_stubs */
 /* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024GLContext */
 /* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024GL11 */
 /*

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

Modified Files:
	Matrix4f.java Vector2f.java Vector3f.java Vector4f.java 
Log Message:
vector utils standardized to radians

Index: Vector2f.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/vector/Vector2f.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Vector2f.java	12 Jun 2004 20:28:29 -0000	1.3
+++ Vector2f.java	6 Sep 2004 08:50:53 -0000	1.4
@@ -44,7 +44,7 @@
  */
 
 public class Vector2f extends Vector implements Serializable, ReadableVector2f, WritableVector2f {
-	
+
 	public float x, y;
 
 	/**
@@ -53,7 +53,7 @@
 	public Vector2f() {
 		super();
 	}
-	
+
 	/**
 	 * Constructor
 	 */
@@ -86,14 +86,14 @@
 		y = src.getY();
 		return this;
 	}
-	
+
 	/**
 	 * @return the length squared of the vector
 	 */
 	public float lengthSquared() {
 		return x * x + y * y;
 	}
-	
+
 	/**
 	 * Translate a vector
 	 * @param x The translation in x
@@ -105,7 +105,7 @@
 		this.y += y;
 		return this;
 	}
-	
+
 	/**
 	 * Negate a vector
 	 * @return this
@@ -115,7 +115,7 @@
 		y = -y;
 		return this;
 	}
-	
+
 	/**
 	 * Negate a vector and place the result in a destination vector.
 	 * @param dest The destination vector or null if a new vector is to be created
@@ -128,8 +128,8 @@
 		dest.y = -y;
 		return dest;
 	}
-	
-	
+
+
 	/**
 	 * Normalise this vector and place the result in another vector.
 	 * @param dest The destination vector, or null if a new vector is to be created
@@ -137,12 +137,12 @@
 	 */
 	public Vector2f normalise(Vector2f dest) {
 		float l = length();
-		
+
 		if (dest == null)
 			dest = new Vector2f(x / l, y / l);
 		else
 			dest.set(x / l, y / l);
-		
+
 		return dest;
 	}
 
@@ -158,86 +158,86 @@
 	}
 
 
-	
+
 	/**
-	 * Calculate the angle between two vectors, in degrees
+	 * Calculate the angle between two vectors, in radians
 	 * @param a A vector
 	 * @param b The other vector
-	 * @return the angle between the two vectors, in degrees
+	 * @return the angle between the two vectors, in radians
 	 */
-    public static float angle(Vector2f a, Vector2f b) {
-        float dls = dot(a, b) / (a.length() * b.length());
-        if (dls < -1f)
-            dls = -1f;
-        else if (dls > 1.0f)
-            dls = 1.0f;
-        return (float) Math.toDegrees(Math.acos(dls));
-    }
-    
-    /**
-     * Add a vector to another vector and place the result in a destination
-     * vector.
-     * @param left The LHS vector
-     * @param right The RHS vector
-     * @param dest The destination vector, or null if a new vector is to be created
-     * @return the sum of left and right in dest
-     */
-    public static Vector2f add(Vector2f left, Vector2f right, Vector2f dest) {
-    	if (dest == null)
-    		return new Vector2f(left.x + right.x, left.y + right.y);
-    	else {
+	public static float angle(Vector2f a, Vector2f b) {
+		float dls = dot(a, b) / (a.length() * b.length());
+		if (dls < -1f)
+			dls = -1f;
+		else if (dls > 1.0f)
+			dls = 1.0f;
+		return (float)Math.acos(dls);
+	}
+
+	/**
+	 * Add a vector to another vector and place the result in a destination
+	 * vector.
+	 * @param left The LHS vector
+	 * @param right The RHS vector
+	 * @param dest The destination vector, or null if a new vector is to be created
+	 * @return the sum of left and right in dest
+	 */
+	public static Vector2f add(Vector2f left, Vector2f right, Vector2f dest) {
+		if (dest == null)
+			return new Vector2f(left.x + right.x, left.y + right.y);
+		else {
 			dest.set(left.x + right.x, left.y + right.y);
 			return dest;
-    	}
-    }
+		}
+	}
 
-    /**
-     * Subtract a vector from another vector and place the result in a destination
-     * vector.
-     * @param left The LHS vector
-     * @param right The RHS vector
-     * @param dest The destination vector, or null if a new vector is to be created
-     * @return left minus right in dest
-     */
-    public static Vector2f sub(Vector2f left, Vector2f right, Vector2f dest) {
-    	if (dest == null)
-    		return new Vector2f(left.x - right.x, left.y - right.y);
-    	else {
+	/**
+	 * Subtract a vector from another vector and place the result in a destination
+	 * vector.
+	 * @param left The LHS vector
+	 * @param right The RHS vector
+	 * @param dest The destination vector, or null if a new vector is to be created
+	 * @return left minus right in dest
+	 */
+	public static Vector2f sub(Vector2f left, Vector2f right, Vector2f dest) {
+		if (dest == null)
+			return new Vector2f(left.x - right.x, left.y - right.y);
+		else {
 			dest.set(left.x - right.x, left.y - right.y);
 			return dest;
-    	}
-    }
-      
-    /**
-     * Store this vector in a FloatBuffer
-     * @param buf The buffer to store it in, at the current position
-     * @return this
-     */
-    public Vector store(FloatBuffer buf) {
-    	buf.put(x);
-    	buf.put(y);
-    	return this;
-    }
-    
-    /**
-     * Load this vector from a FloatBuffer
-     * @param buf The buffer to load it from, at the current position
-     * @return this
-     */
-    public Vector load(FloatBuffer buf) {
-    	x = buf.get();
-    	y = buf.get();
-    	return this;
-    }
-	
+		}
+	}
+
+	/**
+	 * Store this vector in a FloatBuffer
+	 * @param buf The buffer to store it in, at the current position
+	 * @return this
+	 */
+	public Vector store(FloatBuffer buf) {
+		buf.put(x);
+		buf.put(y);
+		return this;
+	}
+
+	/**
+	 * Load this vector from a FloatBuffer
+	 * @param buf The buffer to load it from, at the current position
+	 * @return this
+	 */
+	public Vector load(FloatBuffer buf) {
+		x = buf.get();
+		y = buf.get();
+		return this;
+	}
+
 	/* (non-Javadoc)
 	 * @see org.lwjgl.vector.Vector#scale(float)
 	 */
 	public Vector scale(float scale) {
-		
+
 		x *= scale;
 		y *= scale;
-		
+
 		return this;
 	}
 
@@ -254,21 +254,21 @@
 		sb.append(']');
 		return sb.toString();
 	}
-	
+
 	/**
 	 * @return x
 	 */
 	public final float getX() {
 		return x;
 	}
-	
+
 	/**
 	 * @return y
 	 */
 	public final float getY() {
 		return y;
 	}
-	
+
 	/**
 	 * Set X
 	 * @param x
@@ -276,7 +276,7 @@
 	public final void setX(float x) {
 		this.x = x;
 	}
-	
+
 	/**
 	 * Set Y
 	 * @param y

Index: Matrix4f.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/vector/Matrix4f.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Matrix4f.java	12 Jun 2004 20:28:29 -0000	1.2
+++ Matrix4f.java	6 Sep 2004 08:50:53 -0000	1.3
@@ -487,7 +487,7 @@
 	
 	/**
 	 * Rotates the matrix around the given axis the specified angle
-	 * @param angle the angle, in degrees.
+	 * @param angle the angle, in radians.
 	 * @param axis The vector representing the rotation axis. Must be normalized.
 	 * @return this
 	 */
@@ -539,7 +539,7 @@
 
 	/**
 	 * Rotates the matrix around the given axis the specified angle, and stores it in the specified destination
-	 * @param angle the angle, in degrees.
+	 * @param angle the angle, in radians.
 	 * @param axis The vector representing the rotation axis. Must be normalized.
 	 * @param dest The destination matrix or null if a new matrix is to be created
 	 * @return The rotated matrix

Index: Vector3f.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/vector/Vector3f.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Vector3f.java	12 Jun 2004 20:28:29 -0000	1.3
+++ Vector3f.java	6 Sep 2004 08:50:53 -0000	1.4
@@ -53,14 +53,14 @@
 	public Vector3f() {
 		super();
 	}
-	
+
 	/**
 	 * Constructor
 	 */
 	public Vector3f(ReadableVector3f src) {
 		set(src);
 	}
-	
+
 	/**
 	 * Constructor
 	 */
@@ -96,14 +96,14 @@
 		z = src.getZ();
 		return this;
 	}
-	
+
 	/**
 	 * @return the length squared of the vector
 	 */
 	public float lengthSquared() {
 		return x * x + y * y + z * z;
 	}
-	
+
 	/**
 	 * Translate a vector
 	 * @param x The translation in x
@@ -116,41 +116,41 @@
 		this.z += z;
 		return this;
 	}
-	
-    /**
-     * Add a vector to another vector and place the result in a destination
-     * vector.
-     * @param left The LHS vector
-     * @param right The RHS vector
-     * @param dest The destination vector, or null if a new vector is to be created
-     * @return the sum of left and right in dest
-     */
-    public static Vector3f add(Vector3f left, Vector3f right, Vector3f dest) {
-    	if (dest == null)
-    		return new Vector3f(left.x + right.x, left.y + right.y, left.z + right.z);
-    	else {
+
+	/**
+	 * Add a vector to another vector and place the result in a destination
+	 * vector.
+	 * @param left The LHS vector
+	 * @param right The RHS vector
+	 * @param dest The destination vector, or null if a new vector is to be created
+	 * @return the sum of left and right in dest
+	 */
+	public static Vector3f add(Vector3f left, Vector3f right, Vector3f dest) {
+		if (dest == null)
+			return new Vector3f(left.x + right.x, left.y + right.y, left.z + right.z);
+		else {
 			dest.set(left.x + right.x, left.y + right.y, left.z + right.z);
 			return dest;
-    	}
-    }
+		}
+	}
 
-    /**
-     * Subtract a vector from another vector and place the result in a destination
-     * vector.
-     * @param left The LHS vector
-     * @param right The RHS vector
-     * @param dest The destination vector, or null if a new vector is to be created
-     * @return left minus right in dest
-     */
-    public static Vector3f sub(Vector3f left, Vector3f right, Vector3f dest) {
-    	if (dest == null)
-    		return new Vector3f(left.x - right.x, left.y - right.y, left.z - right.z);
-    	else {
+	/**
+	 * Subtract a vector from another vector and place the result in a destination
+	 * vector.
+	 * @param left The LHS vector
+	 * @param right The RHS vector
+	 * @param dest The destination vector, or null if a new vector is to be created
+	 * @return left minus right in dest
+	 */
+	public static Vector3f sub(Vector3f left, Vector3f right, Vector3f dest) {
+		if (dest == null)
+			return new Vector3f(left.x - right.x, left.y - right.y, left.z - right.z);
+		else {
 			dest.set(left.x - right.x, left.y - right.y, left.z - right.z);
 			return dest;
-    	}
-    }
-    
+		}
+	}
+
 	/**
 	 * The cross product of two vectors.
 	 * 
@@ -160,25 +160,25 @@
 	 * @return left cross right
 	 */
 	public static Vector3f cross(
-		Vector3f left,
-		Vector3f right,
-		Vector3f dest)
+			Vector3f left,
+			Vector3f right,
+			Vector3f dest)
 	{
 
 		if (dest == null)
 			dest = new Vector3f();
 
 		dest.set(
-			left.y * right.z - left.z * right.y,
-			right.x * left.z - right.z * left.x,
-			left.x * right.y - left.y * right.x
-			);
-		
+				left.y * right.z - left.z * right.y,
+				right.x * left.z - right.z * left.x,
+				left.x * right.y - left.y * right.x
+				);
+
 		return dest;
 	}    
-      
-	
-	
+
+
+
 	/**
 	 * Negate a vector
 	 * @return this
@@ -189,7 +189,7 @@
 		z = -z;
 		return this;
 	}
-	
+
 	/**
 	 * Negate a vector and place the result in a destination vector.
 	 * @param dest The destination vector or null if a new vector is to be created
@@ -203,8 +203,8 @@
 		dest.z = -z;
 		return dest;
 	}
-	
-	
+
+
 	/**
 	 * Normalise this vector and place the result in another vector.
 	 * @param dest The destination vector, or null if a new vector is to be created
@@ -212,12 +212,12 @@
 	 */
 	public Vector3f normalise(Vector3f dest) {
 		float l = length();
-		
+
 		if (dest == null)
 			dest = new Vector3f(x / l, y / l, z / l);
 		else
 			dest.set(x / l, y / l, z / l);
-		
+
 		return dest;
 	}
 
@@ -231,41 +231,41 @@
 	public static float dot(Vector3f left, Vector3f right) {
 		return left.x * right.x + left.y * right.y + left.z * right.z;
 	}
-	
+
 	/**
-	 * Calculate the angle between two vectors, in degrees
+	 * Calculate the angle between two vectors, in radians
 	 * @param a A vector
 	 * @param b The other vector
-	 * @return the angle between the two vectors, in degrees
+	 * @return the angle between the two vectors, in radians
 	 */
-    public static float angle(Vector3f a, Vector3f b) {
-        float dls = dot(a, b) / (a.length() * b.length());
-        if (dls < -1f)
-            dls = -1f;
-        else if (dls > 1.0f)
-            dls = 1.0f;
-        return (float) Math.toDegrees(Math.acos(dls));
-    }
-	
+	public static float angle(Vector3f a, Vector3f b) {
+		float dls = dot(a, b) / (a.length() * b.length());
+		if (dls < -1f)
+			dls = -1f;
+		else if (dls > 1.0f)
+			dls = 1.0f;
+		return (float)Math.acos(dls);
+	}
+
 	/* (non-Javadoc)
 	 * @see org.lwjgl.vector.Vector#load(FloatBuffer)
 	 */
 	public Vector load(FloatBuffer buf) {
-    	x = buf.get();
-    	y = buf.get();
-    	z = buf.get();
-    	return this;
+		x = buf.get();
+		y = buf.get();
+		z = buf.get();
+		return this;
 	}
 
 	/* (non-Javadoc)
 	 * @see org.lwjgl.vector.Vector#scale(float)
 	 */
 	public Vector scale(float scale) {
-		
+
 		x *= scale;
 		y *= scale;
 		z *= scale;
-		
+
 		return this;
 
 	}
@@ -274,20 +274,20 @@
 	 * @see org.lwjgl.vector.Vector#store(FloatBuffer)
 	 */
 	public Vector store(FloatBuffer buf) {
-		
+
 		buf.put(x);
 		buf.put(y);
 		buf.put(z);
-		
+
 		return this;
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */
 	public String toString() {
 		StringBuffer sb = new StringBuffer(64);
-		
+
 		sb.append("Vector3f[");
 		sb.append(x);
 		sb.append(", ");
@@ -304,14 +304,14 @@
 	public final float getX() {
 		return x;
 	}
-	
+
 	/**
 	 * @return y
 	 */
 	public final float getY() {
 		return y;
 	}
-	
+
 	/**
 	 * Set X
 	 * @param x
@@ -319,7 +319,7 @@
 	public final void setX(float x) {
 		this.x = x;
 	}
-	
+
 	/**
 	 * Set Y
 	 * @param y

Index: Vector4f.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/vector/Vector4f.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Vector4f.java	12 Jun 2004 20:28:29 -0000	1.3
+++ Vector4f.java	6 Sep 2004 08:50:53 -0000	1.4
@@ -53,14 +53,14 @@
 	public Vector4f() {
 		super();
 	}
-	
+
 	/**
 	 * Constructor
 	 */
 	public Vector4f(ReadableVector4f src) {
 		set(src);
 	}
-	
+
 	/**
 	 * Constructor
 	 */
@@ -107,14 +107,14 @@
 		w = src.getW();
 		return this;
 	}
-	
+
 	/**
 	 * @return the length squared of the vector
 	 */
 	public float lengthSquared() {
 		return x * x + y * y + z * z + w * w;
 	}
-	
+
 	/**
 	 * Translate a vector
 	 * @param x The translation in x
@@ -128,42 +128,42 @@
 		this.w += w;
 		return this;
 	}
-	
-    /**
-     * Add a vector to another vector and place the result in a destination
-     * vector.
-     * @param left The LHS vector
-     * @param right The RHS vector
-     * @param dest The destination vector, or null if a new vector is to be created
-     * @return the sum of left and right in dest
-     */
-    public static Vector4f add(Vector4f left, Vector4f right, Vector4f dest) {
-    	if (dest == null)
-    		return new Vector4f(left.x + right.x, left.y + right.y, left.z + right.z, left.w + right.w);
-    	else {
+
+	/**
+	 * Add a vector to another vector and place the result in a destination
+	 * vector.
+	 * @param left The LHS vector
+	 * @param right The RHS vector
+	 * @param dest The destination vector, or null if a new vector is to be created
+	 * @return the sum of left and right in dest
+	 */
+	public static Vector4f add(Vector4f left, Vector4f right, Vector4f dest) {
+		if (dest == null)
+			return new Vector4f(left.x + right.x, left.y + right.y, left.z + right.z, left.w + right.w);
+		else {
 			dest.set(left.x + right.x, left.y + right.y, left.z + right.z, left.w + right.w);
 			return dest;
-    	}
-    }
+		}
+	}
 
-    /**
-     * Subtract a vector from another vector and place the result in a destination
-     * vector.
-     * @param left The LHS vector
-     * @param right The RHS vector
-     * @param dest The destination vector, or null if a new vector is to be created
-     * @return left minus right in dest
-     */
-    public static Vector4f sub(Vector4f left, Vector4f right, Vector4f dest) {
-    	if (dest == null)
-    		return new Vector4f(left.x - right.x, left.y - right.y, left.z - right.z, left.w - right.w);
-    	else {
+	/**
+	 * Subtract a vector from another vector and place the result in a destination
+	 * vector.
+	 * @param left The LHS vector
+	 * @param right The RHS vector
+	 * @param dest The destination vector, or null if a new vector is to be created
+	 * @return left minus right in dest
+	 */
+	public static Vector4f sub(Vector4f left, Vector4f right, Vector4f dest) {
+		if (dest == null)
+			return new Vector4f(left.x - right.x, left.y - right.y, left.z - right.z, left.w - right.w);
+		else {
 			dest.set(left.x - right.x, left.y - right.y, left.z - right.z, left.w - right.w);
 			return dest;
-    	}
-    }
-      	
-	
+		}
+	}
+
+
 	/**
 	 * Negate a vector
 	 * @return this
@@ -175,7 +175,7 @@
 		w = -w;
 		return this;
 	}
-	
+
 	/**
 	 * Negate a vector and place the result in a destination vector.
 	 * @param dest The destination vector or null if a new vector is to be created
@@ -190,8 +190,8 @@
 		dest.w = -w;
 		return dest;
 	}
-	
-	
+
+
 	/**
 	 * Normalise this vector and place the result in another vector.
 	 * @param dest The destination vector, or null if a new vector is to be created
@@ -199,12 +199,12 @@
 	 */
 	public Vector4f normalise(Vector4f dest) {
 		float l = length();
-		
+
 		if (dest == null)
 			dest = new Vector4f(x / l, y / l, z / l, w / l);
 		else
 			dest.set(x / l, y / l, z / l, w / l);
-		
+
 		return dest;
 	}
 
@@ -218,31 +218,31 @@
 	public static float dot(Vector4f left, Vector4f right) {
 		return left.x * right.x + left.y * right.y + left.z * right.z + left.w * right.w;
 	}
-	
+
 	/**
-	 * Calculate the angle between two vectors, in degrees
+	 * Calculate the angle between two vectors, in radians
 	 * @param a A vector
 	 * @param b The other vector
-	 * @return the angle between the two vectors, in degrees
+	 * @return the angle between the two vectors, in radians
 	 */
-    public static float angle(Vector4f a, Vector4f b) {
-        float dls = dot(a, b) / (a.length() * b.length());
-        if (dls < -1f)
-            dls = -1f;
-        else if (dls > 1.0f)
-            dls = 1.0f;
-        return (float) Math.toDegrees(Math.acos(dls));
-    }
-	
+	public static float angle(Vector4f a, Vector4f b) {
+		float dls = dot(a, b) / (a.length() * b.length());
+		if (dls < -1f)
+			dls = -1f;
+		else if (dls > 1.0f)
+			dls = 1.0f;
+		return (float)Math.acos(dls);
+	}
+
 	/* (non-Javadoc)
 	 * @see org.lwjgl.vector.Vector#load(FloatBuffer)
 	 */
 	public Vector load(FloatBuffer buf) {
-    	x = buf.get();
-    	y = buf.get();
-    	z = buf.get();
-    	w = buf.get();
-    	return this;
+		x = buf.get();
+		y = buf.get();
+		z = buf.get();
+		w = buf.get();
+		return this;
 	}
 
 	/* (non-Javadoc)
@@ -260,33 +260,33 @@
 	 * @see org.lwjgl.vector.Vector#store(FloatBuffer)
 	 */
 	public Vector store(FloatBuffer buf) {
-		
+
 		buf.put(x);
 		buf.put(y);
 		buf.put(z);
 		buf.put(w);
-		
+
 		return this;
 	}
 
 	public String toString() {
 		return "Vector4f: " + x + " " + y + " " + z + " " + w;
 	}
-	
+
 	/**
 	 * @return x
 	 */
 	public final float getX() {
 		return x;
 	}
-	
+
 	/**
 	 * @return y
 	 */
 	public final float getY() {
 		return y;
 	}
-	
+
 	/**
 	 * Set X
 	 * @param x
@@ -294,7 +294,7 @@
 	public final void setX(float x) {
 		this.x = x;
 	}
-	
+
 	/**
 	 * Set Y
 	 * @param y
@@ -318,7 +318,7 @@
 	public float getZ() {
 		return z;
 	}
-	
+
 	/**
 	 * Set W
 	 * @param w
@@ -333,6 +333,6 @@
 	public float getW() {
 		return w;
 	}
-	
-		
+
+
 }

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

Modified Files:
	PbufferTest.java UniqueRenderer.java UniqueRendererRTT.java 
Removed Files:
	SharedRenderer.java SharedRendererRTT.java 
Log Message:
Removed shared pcontext buffer tests and updated unique context tests

Index: PbufferTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/pbuffers/PbufferTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PbufferTest.java	26 Jul 2004 19:14:19 -0000	1.1
+++ PbufferTest.java	5 Sep 2004 08:38:53 -0000	1.2
@@ -129,14 +129,6 @@
 					System.out.print("Creating render-to-texture pbuffer with unique context...");
 					texRenderer = new UniqueRendererRTT(TEXTURE_SIZE, TEXTURE_SIZE, texID);
 					break;
-				case 3:
-					System.out.print("Creating pbuffer with shared context...");
-					texRenderer = new SharedRenderer(TEXTURE_SIZE, TEXTURE_SIZE, texID);
-					break;
-				case 4:
-					System.out.print("Creating render-to-texture pbuffer with shared context...");
-					texRenderer = new SharedRendererRTT(TEXTURE_SIZE, TEXTURE_SIZE, texID);
-					break;
 			}
 
 			System.out.println("OK");
@@ -433,10 +425,8 @@
 		System.out.println("-------");
 		System.out.println("Usage: java org.lwjgl.test.opengl.pbuffer.PbufferTest <mode>");
 		System.out.println("\n<mode>\tA number in the range 1-4.");
-		System.out.println("\t1: Unique Context, no render-to-texture");
-		System.out.println("\t2: Unique Context, with render-to-texture");
-		System.out.println("\t3: Shared Context, no render-to-texture");
-		System.out.println("\t4: Shared Context, with render-to-texture");
+		System.out.println("\t1: no render-to-texture");
+		System.out.println("\t2: with render-to-texture");
 
 		System.exit(-1);
 	}

--- SharedRenderer.java DELETED ---

--- SharedRendererRTT.java DELETED ---

Index: UniqueRenderer.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/pbuffers/UniqueRenderer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- UniqueRenderer.java	26 Jul 2004 19:14:20 -0000	1.1
+++ UniqueRenderer.java	5 Sep 2004 08:38:53 -0000	1.2
@@ -47,7 +47,7 @@
 		Pbuffer pbuffer = null;
 
 		try {
-			pbuffer = Pbuffer.createPbufferUsingUniqueContext(width, height, new PixelFormat(16, 0, 0, 0, 0), null);
+			pbuffer = new Pbuffer(width, height, new PixelFormat(16, 0, 0, 0, 0), null);
 
 			// Initialise state of the pbuffer context.
 			pbuffer.makeCurrent();
@@ -69,4 +69,4 @@
 		GL11.glCopyTexImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_RGB, 0, 0, width, height, 0);
 	}
 
-}
\ No newline at end of file
+}

Index: UniqueRendererRTT.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/pbuffers/UniqueRendererRTT.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- UniqueRendererRTT.java	26 Jul 2004 22:25:02 -0000	1.2
+++ UniqueRendererRTT.java	5 Sep 2004 08:38:53 -0000	1.3
@@ -46,7 +46,7 @@
 
 		try {
 			final RenderTexture rt = new RenderTexture(true, false, false, false, RenderTexture.RENDER_TEXTURE_2D, 0);
-			pbuffer = Pbuffer.createPbufferUsingUniqueContext(width, height, new PixelFormat(16, 0, 0, 0, 0), rt);
+			pbuffer = new Pbuffer(width, height, new PixelFormat(16, 0, 0, 0, 0), rt);
 
 			// Initialise state of the pbuffer context.
 			pbuffer.makeCurrent();
@@ -75,4 +75,4 @@
 		pbuffer.bindTexImage(Pbuffer.FRONT_LEFT_BUFFER);
 	}
 
-}
\ No newline at end of file
+}

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

Modified Files:
	Makefile.am 
Log Message:
Fix linux makefiles

Index: Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	8 Feb 2004 20:31:01 -0000	1.3
+++ Makefile.am	3 Sep 2004 08:45:13 -0000	1.4
@@ -3,7 +3,6 @@
 libati_la_SOURCES = $(SRC)
 INCLUDES=-I..
 SRC=org_lwjgl_opengl_ATIElementArray.cpp \
-    org_lwjgl_opengl_ATIElementArray.cpp \
     org_lwjgl_opengl_ATIEnvmapBumpmap.cpp \
     org_lwjgl_opengl_ATIFragmentShader.cpp \
     org_lwjgl_opengl_ATIPnTriangles.cpp \

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

Modified Files:
	Makefile.am 
Log Message:
Fix linux makefiles

Index: Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	15 Aug 2004 23:03:54 -0000	1.7
+++ Makefile.am	3 Sep 2004 08:45:13 -0000	1.8
@@ -5,12 +5,10 @@
 SRC = org_lwjgl_opengl_ARBBufferObject.cpp \
 	org_lwjgl_opengl_ARBDrawBuffers.cpp \
 	org_lwjgl_opengl_ARBProgram.cpp \
-	org_lwjgl_opengl_ARBProgram.cpp \
 	org_lwjgl_opengl_ARBMatrixPalette.cpp \
 	org_lwjgl_opengl_ARBMultisample.cpp \
 	org_lwjgl_opengl_ARBMultitexture.cpp \
 	org_lwjgl_opengl_ARBPointParameters.cpp \
-	org_lwjgl_opengl_ARBProgram.cpp \
 	org_lwjgl_opengl_ARBTextureCompression.cpp \
 	org_lwjgl_opengl_ARBTransposeMatrix.cpp \
 	org_lwjgl_opengl_ARBVertexBlend.cpp \

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

Added Files:
	fmod.todo 
Log Message:
fmod todo

--- NEW FILE: fmod.todo ---
Missing implementations:
 FSOUND_File_SetCallbacks
 FSOUND_Stream_Create
 FSOUND_Stream_FindTagField
 FSOUND_Stream_GetTagField
 FSOUND_Stream_SetSubStreamSentence
 FSOUND_Reverb_SetProperties
 FSOUND_Reverb_GetProperties
 FSOUND_Reverb_SetChannelProperties
 FSOUND_Reverb_GetChannelProperties
 
 - all create methods needs to be verified
 - dynamic binding to vm
 - cleanup with opaque pointers/handles