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

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

Modified Files:
	Makefile.am autogen.sh configure.in 
Removed Files:
	config.h.in dummy.cpp 
Log Message:
Various org.lwjgl.vector bugs found by cfmdobbie fixed

Index: Makefile.am
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	29 Nov 2002 08:29:53 -0000	1.2
+++ Makefile.am	30 Aug 2003 14:25:09 -0000	1.3
@@ -1,16 +1,4 @@
 SUBDIRS = common linux
 
 lib_LTLIBRARIES = liblwjgl.la
-
-#liblwjgl_la_LDFLAGS = \
-#        -release $(LT_RELEASE)  \
-#        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-liblwjgl_la_SOURCES = \
-  dummy.cpp
-liblwjgl_la_CPPFLAGS = -D_DEBUG
-liblwjgl_la_LIBADD = \
-  common/libcommon.la \
-  linux/liblinux.la
-liblwjgl_la_DEPENDENCIES = \
-  common/libcommon.la \
-  linux/liblinux.la
+liblwjgl_LDADD

Index: autogen.sh
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/autogen.sh
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/autogen.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- autogen.sh	30 Nov 2002 21:36:12 -0000	1.3
+++ autogen.sh	30 Aug 2003 14:25:09 -0000	1.4
@@ -1,7 +1,8 @@
 #export WANT_AUTOCONF_2_5=1
 #WANT_AUTOMAKE_1_5=1
 
-autoheader linux
+#autoheader linux
+libtoolize --force
 aclocal
 automake --foreign --include-deps --add-missing --copy
 autoconf

Index: configure.in
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/configure.in
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/configure.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- configure.in	25 Aug 2003 09:07:04 -0000	1.25
+++ configure.in	30 Aug 2003 14:25:09 -0000	1.26
@@ -1,76 +1,42 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(dummy.cpp)
-
-dnl These should be changed =)
-LWJGL_MAJOR_VERSION=0
-LWJGL_MINOR_VERSION=0
-LWJGL_MICRO_VERSION=0
-LWJGL_INTERFACE_AGE=1
-LWJGL_BINARY_AGE=1
-LWJGL_VERSION=$LWJGL_MAJOR_VERSION.$LWJGL_MINOR_VERSION.$LWJGL_MICRO_VERSION
-
-AC_SUBST(LWJGL_MAJOR_VERSION)
-AC_SUBST(LWJGL_MINOR_VERSION)
-AC_SUBST(LWJGL_MICRO_VERSION)
-AC_SUBST(LWJGL_INTERFACE_AGE)
-AC_SUBST(LWJGL_BINARY_AGE)
-AC_SUBST(LWJGL_VERSION)
-
-# libtool versioning
-LT_RELEASE=$LWJGL_MAJOR_VERSION.$LWJGL_MINOR_VERSION
-LT_CURRENT=`expr $LWJGL_MICRO_VERSION - $LWJGL_INTERFACE_AGE`
-LT_REVISION=$LWJGL_INTERFACE_AGE
-LT_AGE=`expr $LWJGL_BINARY_AGE - $LWJGL_INTERFACE_AGE`
-
-AC_SUBST(LT_RELEASE)
-AC_SUBST(LT_CURRENT)
-AC_SUBST(LT_REVISION)
-AC_SUBST(LT_AGE)
-
-AC_CONFIG_AUX_DIR(admin)
-
-#AC_CONFIG_SRCDIR(common/org_lwjgl_opengl_CoreGL.cpp)
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
 
-AM_INIT_AUTOMAKE(lwjgl, $LWJGL_VERSION)
+AC_PREREQ(2.57)
+AC_INIT
+AM_INIT_AUTOMAKE(LWJGL, 0.7)
+AC_CONFIG_SRCDIR([autogen.sh])
 
-AM_CONFIG_HEADER(config.h)
+AC_DISABLE_STATIC
+AC_LIBTOOL_DLOPEN
 
-dnl Checks for programs.
-dnl AC_PROG_CC
-AC_PROG_RANLIB
-AM_PROG_LIBTOOL
-AC_PROG_MAKE_SET
-AC_PROG_CPP
+# Checks for programs.
 AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_LIBTOOL 
 
-AC_REQUIRE_CPP
 
-AC_MSG_CHECKING(for JAVA_HOME)
-if test "x$JAVA_HOME" = x; then
-  AC_MSG_ERROR([*** Please set the JAVA_HOME environment variable ])
-else
-  AC_MSG_RESULT($JAVA_HOME)
-  JAVA_HOME="$JAVA_HOME"
-  CPPFLAGS="$CPPFLAGS -D_DEBUG -fno-rtti -fno-exceptions -pthread -D_X11 -Wall -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
-  CFLAGS="$CFLAGS -D_DEBUG -pthread -D_X11 -Wall -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
-fi
+# Checks for libraries.
 
-dnl Checks for libraries.
-LIBS='-L/usr/X11R6/lib'
+# Checks for header files.
 AC_PATH_X
-dnl Replace `main' with a function in -lX11:
-AC_CHECK_LIB(X11, main,, AC_MSG_ERROR(X11 is required))
-dnl Replace `main' with a function in -lXext:
-AC_CHECK_LIB(Xext, main,, AC_MSG_ERROR(Xext is required))
-dnl Replace `main' with a function in -lXxf86vm:
-AC_CHECK_LIB(Xxf86vm, main,, AC_MSG_ERROR(Xxf86vm is required))
-dnl Replace `main' with a function in -tpthread:
-AC_CHECK_LIB(pthread, main,, AC_MSG_ERROR(pthread is required))
-
-dnl Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS([stddef.h stdlib.h string.h sys/time.h])
 
-dnl Checks for typedefs, structures, and compiler characteristics.
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_C_CONST
+AC_C_INLINE
+AC_HEADER_TIME
 
-dnl Checks for library functions.
+# Checks for library functions.
+AC_FUNC_MALLOC
+AC_CHECK_FUNCS([gettimeofday memset strchr strstr])
 
-AC_OUTPUT([Makefile common/Makefile linux/Makefile])
+AC_CONFIG_FILES([Makefile
+                 common/Makefile
+                 linux/Makefile])
+AC_OUTPUT

--- config.h.in DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/config.h.in

--- dummy.cpp DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/dummy.cpp

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

Modified Files:
	Matrix3f.java Matrix4f.java Vector.java Vector2f.java 
Log Message:
Various org.lwjgl.vector bugs found by cfmdobbie fixed

Index: Matrix3f.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Matrix3f.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Matrix3f.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Matrix3f.java	17 Aug 2003 16:38:57 -0000	1.18
+++ Matrix3f.java	30 Aug 2003 14:25:09 -0000	1.19
@@ -330,25 +330,22 @@
 	 * @return the transposed matrix
 	 */
 	public Matrix3f transpose(Matrix3f dest) {
-
-		if (dest == null)
+		if (dest == null) {
 			dest = new Matrix3f();
-
-		if (this != dest) {
-			m00 = dest.m00;
-			m01 = dest.m10;
-			m02 = dest.m20;
-			m10 = dest.m01;
-			m11 = dest.m11;
-			m12 = dest.m21;
-			m20 = dest.m02;
-			m21 = dest.m12;
-			m22 = dest.m22;
-		} else
+			dest.m00 = m00;
+			dest.m01 = m10;
+			dest.m02 = m20;
+			dest.m10 = m01;
+			dest.m11 = m11;
+			dest.m12 = m21;
+			dest.m20 = m02;
+			dest.m21 = m12;
+			dest.m22 = m22;
+			return dest;
+		} else {
 			transpose();
-
-		return this;
-
+			return this;
+		}
 	}
 
 	/**

Index: Matrix4f.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Matrix4f.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Matrix4f.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Matrix4f.java	17 Aug 2003 16:38:57 -0000	1.21
+++ Matrix4f.java	30 Aug 2003 14:25:09 -0000	1.22
@@ -635,28 +635,29 @@
 	 * @return the transposed matrix
 	 */
 	public Matrix4f transpose(Matrix4f dest) {
-
-		if (this != dest) {
-			m00 = dest.m00;
-			m01 = dest.m10;
-			m02 = dest.m20;
-			m03 = dest.m30;
-			m10 = dest.m01;
-			m11 = dest.m11;
-			m12 = dest.m21;
-			m13 = dest.m31;
-			m20 = dest.m02;
-			m21 = dest.m12;
-			m22 = dest.m22;
-			m23 = dest.m32;
-			m30 = dest.m03;
-			m31 = dest.m13;
-			m32 = dest.m23;
-			m33 = dest.m33;
-		} else
+		if (dest == null) {
+			dest = new Matrix4f();
+			dest.m00 = m00;
+			dest.m01 = m10;
+			dest.m02 = m20;
+			dest.m03 = m30;
+			dest.m10 = m01;
+			dest.m11 = m11;
+			dest.m12 = m21;
+			dest.m13 = m31;
+			dest.m20 = m02;
+			dest.m21 = m12;
+			dest.m22 = m22;
+			dest.m23 = m32;
+			dest.m30 = m03;
+			dest.m31 = m13;
+			dest.m32 = m23;
+			dest.m33 = m33;
+			return dest;
+		} else {
 			transpose();
-
-		return dest;
+			return this;
+		}
 	}
 
 	/**

Index: Vector.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Vector.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Vector.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Vector.java	17 Aug 2003 16:38:57 -0000	1.9
+++ Vector.java	30 Aug 2003 14:25:09 -0000	1.10
@@ -82,7 +82,7 @@
 	 * Normalise this vector
 	 * @return this
 	 */
-	public final Vector normalize() {
+	public final Vector normalise() {
 		float len = length();
 		if (len != 0.0f) {
 			float l = 1.0f / len;

Index: Vector2f.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Vector2f.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Vector2f.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Vector2f.java	17 Aug 2003 16:38:57 -0000	1.12
+++ Vector2f.java	30 Aug 2003 14:25:09 -0000	1.13
@@ -60,7 +60,7 @@
 	public Vector2f(Vector2f src) {
 		set(src);
 	}
-	
+
 	/**
 	 * Constructor
 	 */
@@ -241,4 +241,17 @@
 		return this;
 	}
 
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer sb = new StringBuffer(64);
+
+		sb.append("Vector2f[");
+		sb.append(x);
+		sb.append(", ");
+		sb.append(y);
+		sb.append(']');
+		return sb.toString();
+	}
 }

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

Modified Files:
	Makefile.am 
Log Message:
Various org.lwjgl.vector bugs found by cfmdobbie fixed

Index: Makefile.am
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	2 Aug 2003 12:53:25 -0000	1.8
+++ Makefile.am	30 Aug 2003 14:25:10 -0000	1.9
@@ -1,14 +1,7 @@
-#SUBDIRS = callbacks
-
 noinst_LTLIBRARIES = libcommon.la
 
 libcommon_la_SOURCES = $(COMMON)
 libcommon_la_CPPFLAGS = -D_DEBUG
-
-#libcommon_la_LIBADD = \
-#  callbacks/libcallbacks.la
-#libcommon_la_DEPENDENCIES = \
-#  callbacks/libcallbacks.la
 
 COMMON = \
   extal.cpp \

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

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
Committed spelling fixes

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- org_lwjgl_input_Mouse.cpp	11 Aug 2003 16:35:45 -0000	1.31
+++ org_lwjgl_input_Mouse.cpp	29 Aug 2003 08:00:44 -0000	1.32
@@ -198,7 +198,7 @@
 	XcursorBool argb_supported = XcursorSupportsARGB(getCurrentDisplay());
 	XcursorBool anim_supported = XcursorSupportsAnim(getCurrentDisplay());
         if (argb_supported)
-		caps |= org_lwjgl_input_Mouse_CURSOR_8_BIT_ALPHA | org_lwjgl_input_Mouse_CURSOR_ONE_BIT_TRANSPARANCY;
+		caps |= org_lwjgl_input_Mouse_CURSOR_8_BIT_ALPHA | org_lwjgl_input_Mouse_CURSOR_ONE_BIT_TRANSPARENCY;
 	if (anim_supported)
 		caps |= org_lwjgl_input_Mouse_CURSOR_ANIMATION;
 	return caps;

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

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
Committed spelling fixes

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- org_lwjgl_input_Mouse.cpp	11 Aug 2003 16:35:45 -0000	1.26
+++ org_lwjgl_input_Mouse.cpp	29 Aug 2003 08:00:44 -0000	1.27
@@ -155,7 +155,7 @@
 JNIEXPORT jint JNICALL Java_org_lwjgl_input_Mouse_nGetNativeCursorCaps
   (JNIEnv *env, jclass clazz)
 {
-	return org_lwjgl_input_Mouse_CURSOR_ONE_BIT_TRANSPARANCY;
+	return org_lwjgl_input_Mouse_CURSOR_ONE_BIT_TRANSPARENCY;
 }
 
 /*

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

Modified Files:
	Mouse.java 
Log Message:
Committed spelling fixes

Index: Mouse.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Mouse.java	17 Aug 2003 16:32:53 -0000	1.23
+++ Mouse.java	29 Aug 2003 08:00:43 -0000	1.24
@@ -51,7 +51,7 @@
  * @version $Revision$
  */
 public class Mouse {
-	public final static int CURSOR_ONE_BIT_TRANSPARANCY = 1;
+	public final static int CURSOR_ONE_BIT_TRANSPARENCY = 1;
 	public final static int CURSOR_8_BIT_ALPHA = 2;
 	public final static int CURSOR_ANIMATION = 4;
 
@@ -135,7 +135,7 @@
          * @throws Exception if the cursor could not be set for any reason
 	 */
 	public static Cursor setNativeCursor(Cursor cursor) throws Exception {
-		assert created && ((getNativeCursorCaps() | CURSOR_ONE_BIT_TRANSPARANCY) != 0);
+		assert created && ((getNativeCursorCaps() | CURSOR_ONE_BIT_TRANSPARENCY) != 0);
 		Cursor oldCursor = currentCursor;
 		currentCursor = cursor;
 		if (currentCursor != null) {

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

Modified Files:
	org_lwjgl_input_Mouse.h 
Log Message:
Committed spelling fixes

Index: org_lwjgl_input_Mouse.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Mouse.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Mouse.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_input_Mouse.h	20 May 2003 12:20:12 -0000	1.5
+++ org_lwjgl_input_Mouse.h	29 Aug 2003 08:00:44 -0000	1.6
@@ -8,8 +8,8 @@
 extern "C" {
 #endif
 /* Inaccessible static: _00024assertionsDisabled */
-#undef org_lwjgl_input_Mouse_CURSOR_ONE_BIT_TRANSPARANCY
-#define org_lwjgl_input_Mouse_CURSOR_ONE_BIT_TRANSPARANCY 1L
+#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
 #define org_lwjgl_input_Mouse_CURSOR_8_BIT_ALPHA 2L
 #undef org_lwjgl_input_Mouse_CURSOR_ANIMATION
@@ -22,6 +22,8 @@
 /* Inaccessible static: buttonCount */
 /* Inaccessible static: hasWheel */
 /* Inaccessible static: currentCursor */
+/* Inaccessible static: buttonName */
+/* Inaccessible static: buttonMap */
 /* Inaccessible static: class_00024org_00024lwjgl_00024input_00024Mouse */
 /*
  * Class:     org_lwjgl_input_Mouse

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

Modified Files:
      Tag: macosx-gcc
	org_lwjgl_Display.cpp 
Log Message:
testing 1 2 3

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_Display.cpp,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -d -r1.15 -r1.15.2.1
--- org_lwjgl_Display.cpp	23 May 2003 03:07:46 -0000	1.15
+++ org_lwjgl_Display.cpp	28 Aug 2003 19:06:43 -0000	1.15.2.1
@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2002 Light Weight Java Game Library Project
+ * Copyright (c) 2002 Lightweight Java Game Library Project
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without

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

Modified Files:
	ATISeparateStencil.java 
Log Message:
Added missing ATI_separate_stencil functionality

Index: ATISeparateStencil.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATISeparateStencil.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATISeparateStencil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ATISeparateStencil.java	25 Aug 2003 09:07:04 -0000	1.1
+++ ATISeparateStencil.java	25 Aug 2003 09:10:51 -0000	1.2
@@ -40,8 +40,8 @@
 package org.lwjgl.opengl.ati;
 
 public interface ATISeparateStencil {
-	public static final int STENCIL_BACK_FUNC_ATI				= 0x8800;
-	public static final int STENCIL_BACK_FAIL_ATI				= 0x8801;
-	public static final int STENCIL_BACK_PASS_DEPTH_FAIL_ATI		= 0x8802;
-	public static final int STENCIL_BACK_PASS_DEPTH_PASS_ATI		= 0x8803;
+	public static final int GL_STENCIL_BACK_FUNC_ATI			= 0x8800;
+	public static final int GL_STENCIL_BACK_FAIL_ATI			= 0x8801;
+	public static final int GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI		= 0x8802;
+	public static final int GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI		= 0x8803;
 }

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

Modified Files:
	GLCaps.java GLConstants.java 
Log Message:
Added missing ATI_separate_stencil functionality

Index: GLCaps.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLCaps.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLCaps.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- GLCaps.java	17 Aug 2003 16:38:55 -0000	1.6
+++ GLCaps.java	25 Aug 2003 09:07:03 -0000	1.7
@@ -108,6 +108,7 @@
 	public static boolean GL_ATI_texture_mirror_once;
 	public static boolean GL_ATI_vertex_array_object;
 	public static boolean GL_ATI_vertex_streams;
+	public static boolean GL_ATI_separate_stencil;
 	public static boolean GL_ATIX_point_sprites;
 	public static boolean GL_ATIX_texture_env_route;
 	public static boolean GL_HP_occlusion_test;

Index: GLConstants.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLConstants.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLConstants.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- GLConstants.java	17 Aug 2003 16:38:55 -0000	1.15
+++ GLConstants.java	25 Aug 2003 09:07:03 -0000	1.16
@@ -83,6 +83,7 @@
 		ATITextureMirrorOnce,
 		ATIVertexArrayObject,
 		ATIVertexStreams,
+		ATISeparateStencil,
 		ATIXPointSprites,
 		ATIXTextureEnvRoute,
 		EXTAbgr,

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

Modified Files:
	configure.in 
Log Message:
Added missing ATI_separate_stencil functionality

Index: configure.in
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/configure.in
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/configure.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- configure.in	17 Aug 2003 18:40:58 -0000	1.24
+++ configure.in	25 Aug 2003 09:07:04 -0000	1.25
@@ -51,8 +51,8 @@
 else
   AC_MSG_RESULT($JAVA_HOME)
   JAVA_HOME="$JAVA_HOME"
-  CPPFLAGS="$CPPFLAGS -fno-rtti -fno-exceptions -pthread -D_X11 -Wall -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
-  CFLAGS="$CFLAGS -pthread -D_X11 -Wall -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
+  CPPFLAGS="$CPPFLAGS -D_DEBUG -fno-rtti -fno-exceptions -pthread -D_X11 -Wall -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
+  CFLAGS="$CFLAGS -D_DEBUG -pthread -D_X11 -Wall -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
 fi
 
 dnl Checks for libraries.

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

Added Files:
	ATISeparateStencil.java 
Log Message:
Added missing ATI_separate_stencil functionality

--- NEW FILE: ATISeparateStencil.java ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ati/ATISeparateStencil.java
/* 
 * Copyright (c) 2002 Lightweight Java Game Library Project
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are 
 * met:
 * 
 * * Redistributions of source code must retain the above copyright 
 *   notice, this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * * Neither the name of 'Light Weight Java Game Library' nor the names of 
 *   its contributors may be used to endorse or promote products derived 
 *   from this software without specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
/*
 * Created by IntelliJ IDEA.
 * User: nj
 * Date: 12-08-2002
 * Time: 15:31:14
 * To change template for new interface use
 * Code Style | Class Templates options (Tools | IDE Options).
 */
package org.lwjgl.opengl.ati;

public interface ATISeparateStencil {
	public static final int STENCIL_BACK_FUNC_ATI				= 0x8800;
	public static final int STENCIL_BACK_FAIL_ATI				= 0x8801;
	public static final int STENCIL_BACK_PASS_DEPTH_FAIL_ATI		= 0x8802;
	public static final int STENCIL_BACK_PASS_DEPTH_PASS_ATI		= 0x8803;
}

Update of /cvsroot/java-game-lib/LWJGL/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv2381

Modified Files:
	README 
Log Message:
preparing for 0.7

Index: README
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/doc/README
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/doc/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- README	2 Mar 2003 22:09:15 -0000	1.3
+++ README	24 Aug 2003 20:53:52 -0000	1.4
@@ -11,24 +11,6 @@
  Extract the archive, and cd into directory
  Extract the media files into lwjgl folder (only needed for openal tests)
 
- NeHe ports:
-  java -cp .;examples.jar;lwjgl.jar; DEMO 
- where DEMO is one of the following: 
-  BitmapFonts
-  Blending
-  DisplayLists
-  FiltersLightingAndControl
-  FirstPersonWorld
-  FlagEffect
-  Fog
-  MovingStarBitmaps
-  Polygon
-  PolygonColored
-  PolygonColoredRotating3D
-  PolygonColoredRotating
-  Quadrics
-  TextureMapping
-  
  LWJGL Tests:
   java -cp .;lwjgl_test.jar;lwjgl.jar; DEMO
  where DEMO is one of the following: 
@@ -37,7 +19,6 @@
   org.lwjgl.test.input.MouseCreationTest
   org.lwjgl.test.input.MouseTest
   org.lwjgl.test.openal.ALCTest
-  org.lwjgl.test.openal.ALTest
   org.lwjgl.test.openal.ALCTest
   org.lwjgl.test.openal.EAXTest (Requires EAX compatible hardware)
   org.lwjgl.test.openal.MovingSoundTest
@@ -47,6 +28,8 @@
   org.lwjgl.test.openal.StressTest
   org.lwjgl.test.opengl.Grass (Requires nVidia hardware)
   org.lwjgl.test.opengl.Game
-  org.lwjgl.test.vector.MathTest
   
-Project Webpage: http://sourceforge.net/projects/java-game-lib
\ No newline at end of file
+Please read this thread, for upgrading issues:
+http://www.puppygames.net/forums/viewtopic.php?t=204
+  
+Project Webpage: www.lwjgl.org
\ No newline at end of file

Update of /cvsroot/java-game-lib/LWJGL/website/documents/tutorials/openal
In directory sc8-pr-cvs1:/tmp/cvs-serv1788

Modified Files:
	openal_basics.html 
Log Message:
preparing for 0.7

Index: openal_basics.html
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/website/documents/tutorials/openal/openal_basics.html
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/website/documents/tutorials/openal/openal_basics.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- openal_basics.html	27 Apr 2003 21:25:35 -0000	1.4
+++ openal_basics.html	24 Aug 2003 20:48:36 -0000	1.5
@@ -17,7 +17,7 @@
 <br>
 <b>1.0.1 Ingredients</b><br>
 Head on over to Creatives <a
- href="http://developer.creative.com/scripts/DC_D&amp;H_Games-Downloads.asp?opt=2">site</a>
+ href="http://developer.creative.com/landing.asp?cat=1&sbcat=31&top=38">site</a>
 and snag a copy of the OpenAL specification along with a copy of the Programmers
 reference.<br>
 If you haven't already done so, get a copy of the OpenAL runtime environment
@@ -30,65 +30,59 @@
 <b>1.2 Basic setup</b><br>
 Lets start out by creating a skeleton class for some very basic sound. We'll
 start of by creating the required OpenAL object<br>
-<p
- style="border-style: solid; border-width: 1px; padding: 3px; background-color: rgb(255,255,204);"><tt>import
-org.lwjgl.openal.AL;<br>
-<br>
-public class PlayTest {<br>
-    <br>
-  /** OpenAL instance */<br>
-  protected AL al;<br>
-  <br>
+<pre>
+<p style="border-style: solid; border-width: 1px; padding: 3px; background-color: rgb(255,255,204);">
+public class PlayTest {
+  /**
+   * Creates an instance of PlayTest
+   */
+  public PlayTest() {
+    try {
+    	//create using defaults
+      AL.create();
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+}
 
-  /**<br>
-   * Creates an instance of PlayTest<br>
-   */<br>
-  public PlayTest() {<br>
-    try {<br>
-</tt>          
-<tt> al = new AL();<br>
-      al.create();<br>
-   } catch (Exception e) {<br>
-      e.printStackTrace();<br>
-    }</tt><tt><br>
-  }<br>
-}</tt></p>
+</p></pre>
 <p><b>1.3 Buffer and Source creation</b><br>
-Now that we have created the AL instance, we need to create
+Now that we have created the (static) AL instance, we need to create
 two things to actually get some sound. We need to create a buffer to hold
 sound data, and a source that is to play the sound data.<br>
 Lets start of by creating one source, and one buffer:</p>
+<pre>
 <p style="border-style: solid; border-width: 1px; padding: 3px; background-color: rgb(255,255,204);">
-<tt>
-&nbsp;&nbsp;//create one IntBuffer as buffer and one as source<br>
-&nbsp;&nbsp;//createIntBuffer is a utility method which allocates a direct ByteBuffer in native order<br>
-  IntBuffer buffers = createIntBuffer(1);<br>
-  IntBuffer sources = createIntBuffer(1);<br>
-<br>
-  //generate buffers and sources<br>
-  al.genBuffers(1, Sys.getDirectBufferAddress(buffers));<br>
-  al.genSources(1, Sys.getDirectBufferAddress(sources));
-</tt>
-</p>
-<p>There, all set for actually loading some sound data into the buffer.<br>
-</p>
+  //create one IntBuffer as buffer and one as source
+  //createIntBuffer is a utility method which allocates a direct ByteBuffer in native order
+  IntBuffer buffers = createIntBuffer(1);
+  IntBuffer sources = createIntBuffer(1);
+
+  //generate buffers and sources
+  AL.alGenBuffers(1, buffers);
+  AL.alGenSources(1, sources);
+
+</p></pre>
+There, all set for actually loading some sound data into the buffer.<br><br>
 <b>1.4 Loading sound data and setting up a buffer</b><br>
 Now that we have a buffer, we need to load some sound data into this buffer.
 This is done using the <tt>al.bufferData</tt> method. In our example we will
 "cheat" a bit, by using the <tt>WaveData</tt> class to load
 a wave file, and copy this into the buffer:<br>
-<p
- style="border-style: solid; border-width: 1px; padding: 3px; background-color: rgb(255,255,204);"><tt> 
-//load wave data<br>
-  WaveData wavefile = WaveData.create("mywavefile.wav");<br>
-        <br>
-  //copy to buffer<br>
-  al.bufferData(buffers.get(0), wavefile.format, Sys.getDirectBufferAddress(wavefile.data), wavefile.data.capacity(), wavefile.samplerate);<br>
-        <br>
-  //unload file again<br>
-  wavefile.dispose();        <br>
-</tt></p>
-Having loaded the data, we pass it to <tt>bufferData</tt>. Once the buffer
+<pre>
+<p style="border-style: solid; border-width: 1px; padding: 3px; background-color: rgb(255,255,204);">
+  //load wave data
+  WaveData wavefile = WaveData.create("mywavefile.wav");
+
+  //copy to buffer
+  AL.alBufferData(buffers.get(0), wavefile.format, wavefile.data, wavefile.data.capacity(), wavefile.samplerate);
+
+  //unload file again
+  wavefile.dispose();
+
+</p></pre>
+Having loaded the data, we pass it to <tt>alBufferData</tt>. Once the buffer
 has been filled with sound data, we unload it from the system using <tt>wavefile.dispose()</tt>.
 Don't worry about deleting it this soon - the sound data has been <b>copied</b>
 to the buffer.<br>
@@ -96,38 +90,42 @@
 <b>1.5 Associating sources and buffers</b><br>
 To associate a source to a buffer we set the integer BUFFER attribute on
 the source, and assign it a value of the buffer to play:<br>
-<p
- style="border-style: solid; border-width: 1px; padding: 3px; background-color: rgb(255,255,204);"><tt> 
-//set up source input<br>
-  al.sourcei(sources.get(0), AL.BUFFER, buffers.get(0));</tt><tt><br>
-</tt></p>
+<pre>
+<p style="border-style: solid; border-width: 1px; padding: 3px; background-color: rgb(255,255,204);">
+  //set up source input
+  AL.alSourcei(sources.get(0), AL.AL_BUFFER, buffers.get(0));
+
+</p></pre>
 <b>1.6 Setting source properties</b><br>
 Having set up the source, it is time to set some attributes on the source
 - there are many that can be set, but in this example we only set the looping
 attribute to true by doing the following:<br>
-<p
- style="border-style: solid; border-width: 1px; padding: 3px; background-color: rgb(255,255,204);"><tt> 
-//loop source<br>
-  al.sourcei(sources.get(0), AL.LOOPING, AL.TRUE);</tt><tt><br>
-</tt></p>
+<pre>
+<p style="border-style: solid; border-width: 1px; padding: 3px; background-color: rgb(255,255,204);">
+  //loop source
+  AL.alSourcei(sources.get(0), AL.AL_LOOPING, AL.AL_TRUE);
+
+</p></pre>
 <b>1.7 Sound...<br>
-</b>There, ready to play the sound, do this using the <tt>sourcePlay </tt>method
-of the <tt>AL </tt>class. to stop and pause use <tt>sourcePause </tt>and
-<tt>sourceStop </tt>respectively, and supply the source to affect:<br>
-<p
- style="border-style: solid; border-width: 1px; padding: 3px; background-color: rgb(255,255,204);"><tt> 
-//play source 0<br>
-  al.sourcePlay(sources.get(0));<br>
-        <br>
-  //wait 5 secs<br>
-  try {<br>
-    System.out.println("Waiting 5 seconds for sound to complete");<br>
-    Thread.sleep(5000);<br>
-  } catch (InterruptedException inte) {<br>
-  }<br>
-        <br>
-  //stop source 0<br>
-  al.sourceStop(sources.get(0));</tt></p>
+</b>There, ready to play the sound, do this using the <tt>alSourcePlay </tt>method
+of the <tt>AL </tt>class. to stop and pause use <tt>alSourcePause </tt>and
+<tt>alSourceStop </tt>respectively, and supply the source to affect:<br>
+<pre>
+<p style="border-style: solid; border-width: 1px; padding: 3px; background-color: rgb(255,255,204);">
+  //play source 0
+  AL.alSourcePlay(sources.get(0));
+
+  //wait 5 secs
+  try {
+    System.out.println("Waiting 5 seconds for sound to complete");
+    Thread.sleep(5000);
+  } catch (InterruptedException inte) {
+  }
+
+  //stop source 0
+  AL.alSourceStop(sources.get(0));
+
+</p></pre>
 <b>1.8 Cleaning up<br>
 </b>Having had loads of fun playing a sound (!), it is now time to do some
 house chores. We need to clean up what we have created, this amounts to:<br>
@@ -135,16 +133,16 @@
  - destroying AL<br>
 as is shown here:<b><br>
 </b>
-<p
- style="border-style: solid; border-width: 1px; padding: 3px; background-color: rgb(255,255,204);"><tt> 
-//delete buffers and sources<br>
-  al.deleteSources(1, Sys.getDirectBufferAddress(sources));<br>
-  al.deleteBuffers(1, Sys.getDirectBufferAddress(buffers));<br>
-        <br>
-  //shutdown<br>
-  al.destroy();<br>
-</tt>
-</p>
+<pre>
+<p style="border-style: solid; border-width: 1px; padding: 3px; background-color: rgb(255,255,204);">
+  //delete buffers and sources
+  AL.alDeleteSources(1, sources);
+  AL.alDeleteBuffers(1, buffers);
+
+  //shutdown
+  AL.destroy();
+
+</p></pre>
 There, all set. Now you should be able to play some basic sound!<br>
 This tutorial is rather short, and the above examples feature no error checking.
 For the complete source code, look at the classes in the <br>

Update of /cvsroot/java-game-lib/LWJGL
In directory sc8-pr-cvs1:/tmp/cvs-serv1527

Modified Files:
	build.xml 
Log Message:
preparing for 0.7

Index: build.xml
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/build.xml
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- build.xml	4 May 2003 20:53:37 -0000	1.9
+++ build.xml	24 Aug 2003 20:47:00 -0000	1.10
@@ -8,8 +8,7 @@
   <property name="lwjgl.docs"           value="./doc"/>
   <property name="lwjgl.temp"           value="./temp"/>
   <property name="lwjgl.res"            value="./res"/>
-  <property name="lwjgl.examples"       value="./examples"/>
-  <property name="lwjgl.version"        value="0.6"/>
+  <property name="lwjgl.version"        value="0.7"/>
   <property name="lwjgl.src.headers"    value="${lwjgl.src}/native/common"/>
   
   <!-- Creates a splash screen -->
@@ -66,7 +65,6 @@
        <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/test/**" source="1.4" taskname="test"/>
        <javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/vector/**" source="1.4" taskname="vector"/>
-       <javac srcdir="${lwjgl.examples}" destdir="${lwjgl.bin}/" includes="**" source="1.4" taskname="examples"/>
   </target>
 
   <target name="package" depends="compile" description="packages the java source files">
@@ -86,26 +84,6 @@
           <include name="org/lwjgl/test/**"/>
         </fileset>
       </jar>
-      
-      <!-- Create examples.jar -->
-      <jar destfile="${lwjgl.lib}/examples.jar" taskname="examples.jar">
-        <fileset dir="${lwjgl.bin}">
-          <include name="**.class"/>
-        </fileset>
-        <fileset dir="${lwjgl.res}">
-          <include name="data/**"/>
-        </fileset>
-      </jar>
-      
-      <!-- copy dll/so to lib directory -->
-      <copy todir="${lwjgl.lib}" taskname="libraries">
-        <fileset dir="${lwjgl.bin}">
-            <include name="win32/lwjgl.dll"/>
-            <include name="win32/lwjgl_d.dll"/>
-            <include name="linux/liblwjgl.so"/>
-            <include name="linux/liblwjgl_d.so"/>
-        </fileset>
-      </copy>
   </target>
   
   <target name="javadoc" description="Creates javadoc from java source code">
@@ -134,7 +112,6 @@
     <fail if="lwjgl.preexistingfiles" message="Cannot perform webbuild from nonempty folder"/>
     <cvs command="export -D 'now'" compressionlevel="3" cvsRoot=":pserver:ano...@cv...:/cvsroot/java-game-lib" package="LWJGL/build.xml" dest="."/>
     <cvs command="export -D 'now'" compressionlevel="3" cvsRoot=":pserver:ano...@cv...:/cvsroot/java-game-lib" package="LWJGL/src" dest="."/>
-    <cvs command="export -D 'now'" compressionlevel="3" cvsRoot=":pserver:ano...@cv...:/cvsroot/java-game-lib" package="LWJGL/examples" dest="."/>
     <cvs command="export -D 'now'" compressionlevel="3" cvsRoot=":pserver:ano...@cv...:/cvsroot/java-game-lib" package="LWJGL/doc" dest="."/>
     <ant dir="LWJGL" target="package"/>
   </target>  
@@ -143,23 +120,13 @@
     <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes">
       <class name="org.lwjgl.Display"/>
       <class name="org.lwjgl.Sys"/>
+      <class name="org.lwjgl.Window"/>
+      
       <class name="org.lwjgl.input.Controller"/>
+      <class name="org.lwjgl.input.Cursor"/>
       <class name="org.lwjgl.input.Keyboard"/>
       <class name="org.lwjgl.input.Mouse"/>
-      <class name="org.lwjgl.Math$MatrixOpAdd$MatrixOpSafe"/>
-      <class name="org.lwjgl.Math$MatrixOpAdd$MatrixOpDirect"/>
-      <class name="org.lwjgl.Math$MatrixOpCopy$MatrixOpSafe"/>
-      <class name="org.lwjgl.Math$MatrixOpCopy$MatrixOpDirect"/>
-      <class name="org.lwjgl.Math$MatrixOpInvert$MatrixOpSafe"/>
-      <class name="org.lwjgl.Math$MatrixOpInvert$MatrixOpDirect"/>
-      <class name="org.lwjgl.Math$MatrixOpMultiply$MatrixOpSafe"/>
-      <class name="org.lwjgl.Math$MatrixOpMultiply$MatrixOpDirect"/>
-      <class name="org.lwjgl.Math$MatrixOpNegate$MatrixOpSafe"/>
-      <class name="org.lwjgl.Math$MatrixOpNegate$MatrixOpDirect"/>
-      <class name="org.lwjgl.Math$MatrixOpNormalise$MatrixOpSafe"/>
-      <class name="org.lwjgl.Math$MatrixOpNormalise$MatrixOpDirect"/>
-      <class name="org.lwjgl.Math$MatrixOpSubtract$MatrixOpSafe"/>
-      <class name="org.lwjgl.Math$MatrixOpSubtract$MatrixOpDirect"/>
+      
       <class name="org.lwjgl.openal.ALC"/>
       <class name="org.lwjgl.openal.BaseAL"/>
       <class name="org.lwjgl.openal.CoreAL"/>
@@ -167,18 +134,24 @@
       <class name="org.lwjgl.openal.eax.CoreEAX"/>
       <class name="org.lwjgl.openal.eax.EAXBufferProperties"/>
       <class name="org.lwjgl.openal.eax.EAXListenerProperties"/>
-      <class name="org.lwjgl.opengl.BaseGL"/>
-      <class name="org.lwjgl.opengl.CoreGL"/>
+      
+      <class name="org.lwjgl.opengl.CoreGL11"/>
+      <class name="org.lwjgl.opengl.CoreGL12"/>
+      <class name="org.lwjgl.opengl.CoreGL13"/>
+      <class name="org.lwjgl.opengl.CoreGL14"/>
       <class name="org.lwjgl.opengl.GL"/>
       <class name="org.lwjgl.opengl.GLU"/>
+      <class name="org.lwjgl.opengl.GLCaps"/>
+      <class name="org.lwjgl.opengl.GLWindow"/>
+      <class name="org.lwjgl.opengl.Pbuffer"/>
     </javah>    
   </target>
   
   <!-- Creates a versioned distribution for all supported platforms -->
   <target name="distribution_application">
     <!-- check for file presence -->
-    <available file="${lwjgl.lib}/OpenAL32.dll" property="lwjgl.OpenAL32_dll.exists"/>
-    <fail unless="lwjgl.OpenAL32_dll.exists" message="Missing OpenAL32.dll in lib directory"/>
+    <available file="${lwjgl.lib}/lwjglaudio.dll" property="lwjgl.lwjglaudio_dll.exists"/>
+    <fail unless="lwjgl.lwjglaudio_dll.exists" message="Missing lwjglaudio.dll in lib directory"/>
     
     <available file="${lwjgl.lib}/libopenal.so" property="lwjgl.libopenal_so.exists"/>
     <fail unless="lwjgl.libopenal_so.exists" message="Missing libopenal.so in lib directory"/>    
@@ -200,9 +173,6 @@
 
     <available file="${lwjgl.lib}/lwjgl_test.jar" property="lwjgl.lwjgl_test_jar.exists"/>
     <fail unless="lwjgl.lwjgl_test_jar.exists" message="Missing lwjgl_test.jar in lib directory"/>
-
-    <available file="${lwjgl.lib}/examples.jar" property="lwjgl.examples_jar.exists"/>
-    <fail unless="lwjgl.examples_jar.exists" message="Missing examples.jar in lib directory"/>
     
     <mkdir dir="${lwjgl.temp}/lwjgl-${lwjgl.version}"/>
     
@@ -211,13 +181,12 @@
       <fileset dir="${lwjgl.lib}/">
         <include name="lwjgl.dll"/>
         <include name="lwjgl_d.dll"/>
-        <include name="OpenAL32.dll"/>
+        <include name="lwjglaudio.dll"/>
         <include name="liblwjgl.so"/>
         <include name="liblwjgl_d.so"/>
         <include name="libopenal.so"/>        
         <include name="lwjgl.jar"/>
         <include name="lwjgl_test.jar"/>
-        <include name="examples.jar"/>
       </fileset>
       <fileset dir="${lwjgl.docs}">
         <include name="CREDITS"/>
@@ -233,8 +202,8 @@
   <!-- Creates a versioned distribution for win32 -->
   <target name="distribution_application_win32">
     <!-- check for file presence -->
-    <available file="${lwjgl.lib}/OpenAL32.dll" property="lwjgl.OpenAL32_dll.exists"/>
-    <fail unless="lwjgl.OpenAL32_dll.exists" message="Missing OpenAL32.dll in lib directory"/>
+    <available file="${lwjgl.lib}/lwjglaudio.dll" property="lwjgl.lwjglaudio_dll.exists"/>
+    <fail unless="lwjgl.lwjglaudio_dll.exists" message="Missing lwjglaudio.dll in lib directory"/>
     
     <available file="${lwjgl.lib}/lwjgl.dll" property="lwjgl.lwjgl_dll.exists"/>
     <fail unless="lwjgl.lwjgl_dll.exists" message="Missing lwjgl.dll in lib directory"/>
@@ -247,9 +216,6 @@
 
     <available file="${lwjgl.lib}/lwjgl_test.jar" property="lwjgl.lwjgl_test_jar.exists"/>
     <fail unless="lwjgl.lwjgl_test_jar.exists" message="Missing lwjgl_test.jar in lib directory"/>
-
-    <available file="${lwjgl.lib}/examples.jar" property="lwjgl.examples_jar.exists"/>
-    <fail unless="lwjgl.examples_jar.exists" message="Missing examples.jar in lib directory"/>
     
     <mkdir dir="${lwjgl.temp}/lwjgl-${lwjgl.version}"/>
     
@@ -258,10 +224,9 @@
       <fileset dir="${lwjgl.lib}/">
         <include name="lwjgl.dll"/>
         <include name="lwjgl_d.dll"/>
-        <include name="OpenAL32.dll"/>
+        <include name="lwjglaudio.dll"/>
         <include name="lwjgl.jar"/>
         <include name="lwjgl_test.jar"/>
-        <include name="examples.jar"/>
       </fileset>
       <fileset dir="${lwjgl.docs}">
         <include name="CREDITS"/>
@@ -291,9 +256,6 @@
 
     <available file="${lwjgl.lib}/lwjgl_test.jar" property="lwjgl.lwjgl_test_jar.exists"/>
     <fail unless="lwjgl.lwjgl_test_jar.exists" message="Missing lwjgl_test.jar in lib directory"/>
-
-    <available file="${lwjgl.lib}/examples.jar" property="lwjgl.examples_jar.exists"/>
-    <fail unless="lwjgl.examples_jar.exists" message="Missing examples.jar in lib directory"/>
     
     <mkdir dir="${lwjgl.temp}/lwjgl-${lwjgl.version}"/>
     
@@ -305,7 +267,6 @@
         <include name="libopenal.so"/>
         <include name="lwjgl.jar"/>
         <include name="lwjgl_test.jar"/>
-        <include name="examples.jar"/>
       </fileset>
       <fileset dir="${lwjgl.docs}">
         <include name="CREDITS"/>
@@ -337,13 +298,6 @@
           <exclude name="**/.*"/>
         </patternset>        
       </fileset>    
-		<fileset dir=".">
-        <patternset>
-          <include name="examples/*.java"/>
-          <exclude name="**/*CVS*"/>
-          <exclude name="**/.*"/>
-        </patternset>        
-      </fileset>          
     </zip>
   </target>
   

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

Modified Files:
	GL.java 
Log Message:
ATI_separate_stencil support added

Index: GL.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- GL.java	19 Aug 2003 10:26:51 -0000	1.41
+++ GL.java	23 Aug 2003 11:34:14 -0000	1.42
@@ -813,6 +813,10 @@
 
 	public static native void glPNTrianglesiATI(int pname, int param);
 
+	public static native void glStencilOpSeparateATI(int face, int sfail, int dpfail, int dppass);
+
+	public static native void glStencilFuncSeparateATI(int frontfunc, int backfunc, int ref, int mask);
+
 	public static native void glPointParameterfARB(int pname, float param);
 
 	public static native void glPointParameterfEXT(int pname, float param);

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

Modified Files:
	extgl.c extgl.h org_lwjgl_opengl_GL.cpp org_lwjgl_opengl_GL.h 
Log Message:
ATI_separate_stencil support added

Index: extgl.c
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- extgl.c	16 May 2003 18:39:45 -0000	1.17
+++ extgl.c	23 Aug 2003 11:34:14 -0000	1.18
@@ -936,6 +936,13 @@
 glEvalMapsNVPROC glEvalMapsNV = NULL;
 #endif /* GL_NV_evaluators */
 
+/* ATI_separate_stencil */
+
+#ifdef GL_ATI_separate_stencil
+glStencilOpSeparateATIPROC glStencilOpSeparateATI = NULL;
+glStencilFuncSeparateATIPROC glStencilFuncSeparateATI = NULL;
+#endif /* GL_ATI_separate_stencil */
+
 /* ATI_pn_triangles */
 
 #ifdef GL_ATI_pn_triangles 
@@ -2094,6 +2101,16 @@
 #endif
 }
 
+void extgl_InitATISeparateStencil()
+{
+#ifdef GL_ATI_separate_stencil
+    if (!extgl_Extensions.ATI_separate_stencil)
+        return;
+    glStencilOpSeparateATI = (glStencilOpSeparateATIPROC)extgl_GetProcAddress("glStencilOpSeparateATI");
+    glStencilFuncSeparateATI = (glStencilFuncSeparateATIPROC)extgl_GetProcAddress("glStencilFuncSeparateATI");
+#endif
+}
+
 void extgl_InitNVEvaluators()
 {
 #ifdef GL_NV_evaluators
@@ -3163,6 +3180,7 @@
     extgl_Extensions.ATI_fragment_shader = GLQueryExtension("GL_ATI_fragment_shader");
     extgl_Extensions.ATI_pn_triangles = GLQueryExtension("GL_ATI_pn_triangles");
     extgl_Extensions.ATI_point_cull_mode = GLQueryExtension("GL_ATI_point_cull_mode");
+    extgl_Extensions.ATI_separate_stencil = GLQueryExtension("GL_ATI_separate_stencil");
     extgl_Extensions.ATI_text_fragment_shader = GLQueryExtension("GL_ATI_text_fragment_shader");
     extgl_Extensions.ATI_texture_mirror_once = GLQueryExtension("GL_ATI_texture_mirror_once");
     extgl_Extensions.ATI_vertex_array_object = GLQueryExtension("GL_ATI_vertex_array_object");
@@ -3228,6 +3246,7 @@
     extgl_InitNVFence();
     extgl_InitNVRegisterCombiners2();
     extgl_InitATIPNTriangles();
+    extgl_InitATISeparateStencil();
     extgl_InitARBPointParameters();
     extgl_InitARBVertexBlend();
     extgl_InitEXTMultiDrawArrays();

Index: extgl.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- extgl.h	4 Aug 2003 23:00:48 -0000	1.12
+++ extgl.h	23 Aug 2003 11:34:14 -0000	1.13
@@ -5444,6 +5444,26 @@
 #endif /* GL_ARB_fragment_program */
 
 /*-------------------------------------------------------------------*/
+/*------------ATI_separate_stencil---------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ATI_separate_stencil
+#define GL_ATI_separate_stencil 1
+
+#define GL_STENCIL_BACK_FUNC_ATI				0x8800
+#define GL_STENCIL_BACK_FAIL_ATI				0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI			0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI			0x8803
+
+typedef void (APIENTRY * glStencilOpSeparateATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRY * glStencilFuncSeparateATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+
+extern glStencilOpSeparateATIPROC glStencilOpSeparateATI;
+extern glStencilFuncSeparateATIPROC glStencilFuncSeparateATI;
+
+#endif /* GL_ATI_separate_stencil */
+
+/*-------------------------------------------------------------------*/
 /*------------GL_ATI_TEXT_FRAGMENT_SHADER----------------------------*/
 /*-------------------------------------------------------------------*/
 
@@ -5883,6 +5903,7 @@
     int ATI_fragment_shader;
     int ATI_pn_triangles;
     int ATI_point_cull_mode;
+    int ATI_separate_stencil;
     int ATI_text_fragment_shader;
     int ATI_texture_mirror_once;
     int ATI_vertex_array_object;

Index: org_lwjgl_opengl_GL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- org_lwjgl_opengl_GL.cpp	4 Aug 2003 23:00:49 -0000	1.17
+++ org_lwjgl_opengl_GL.cpp	23 Aug 2003 11:34:14 -0000	1.18
@@ -1912,6 +1912,32 @@
 
 /*
  * Class:     org_lwjgl_opengl_GL
+ * Method:    glStencilOpSeparateATI
+ * Signature: (IIII)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glStencilOpSeparateATI
+  (JNIEnv *env, jclass clazz, jint p0, jint p1, jint p2, jint p3)
+{
+	CHECK_EXISTS(glStencilOpSeparateATI)
+	glStencilOpSeparateATI(p0, p1, p2, p3);
+	CHECK_GL_ERROR
+}
+
+/*
+ * Class:     org_lwjgl_opengl_GL
+ * Method:    glStencilFuncSeparateATI
+ * Signature: (IIII)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glStencilFuncSeparateATI
+  (JNIEnv *env, jclass clazz, jint p0, jint p1, jint p2, jint p3)
+{
+	CHECK_EXISTS(glStencilFuncSeparateATI)
+	glStencilFuncSeparateATI(p0, p1, p2, p3);
+	CHECK_GL_ERROR
+}
+
+/*
+ * Class:     org_lwjgl_opengl_GL
  * Method:    glPointParameterfARB
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glPointParameterfARB(JNIEnv * env, jclass clazz, jint p0, jfloat p1)

Index: org_lwjgl_opengl_GL.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- org_lwjgl_opengl_GL.h	4 Aug 2003 23:00:49 -0000	1.13
+++ org_lwjgl_opengl_GL.h	23 Aug 2003 11:34:14 -0000	1.14
@@ -1281,6 +1281,22 @@
 
 /*
  * Class:     org_lwjgl_opengl_GL
+ * Method:    glStencilOpSeparateATI
+ * Signature: (IIII)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glStencilOpSeparateATI
+  (JNIEnv *, jclass, jint, jint, jint, jint);
+
+/*
+ * Class:     org_lwjgl_opengl_GL
+ * Method:    glStencilFuncSeparateATI
+ * Signature: (IIII)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glStencilFuncSeparateATI
+  (JNIEnv *, jclass, jint, jint, jint, jint);
+
+/*
+ * Class:     org_lwjgl_opengl_GL
  * Method:    glPointParameterfARB
  * Signature: (IF)V
  */

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

Modified Files:
	org_lwjgl_input_Keyboard.cpp 
Log Message:


Index: org_lwjgl_input_Keyboard.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- org_lwjgl_input_Keyboard.cpp	24 Jun 2003 12:24:55 -0000	1.25
+++ org_lwjgl_input_Keyboard.cpp	23 Aug 2003 09:47:58 -0000	1.26
@@ -320,3 +320,13 @@
 	buffer_enabled = true;
 	return KEYBOARD_BUFFER_SIZE;
 }
+
+/*
+ * Class:     org_lwjgl_input_Keyboard
+ * Method:    nisStateKeySet
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL Java_org_lwjgl_input_Keyboard_nisStateKeySet(JNIEnv *env, jclass clazz, jint key)
+{
+  return org_lwjgl_input_Keyboard_STATE_UNKNOWN;
+}

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

Modified Files:
	org_lwjgl_input_Keyboard.h 
Log Message:
fix: isStateKeySet now returning int

Index: org_lwjgl_input_Keyboard.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Keyboard.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Keyboard.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_input_Keyboard.h	19 Aug 2003 15:15:00 -0000	1.5
+++ org_lwjgl_input_Keyboard.h	23 Aug 2003 09:45:22 -0000	1.6
@@ -258,7 +258,16 @@
 #define org_lwjgl_input_Keyboard_KEY_POWER 222L
 #undef org_lwjgl_input_Keyboard_KEY_SLEEP
 #define org_lwjgl_input_Keyboard_KEY_SLEEP 223L
+#undef org_lwjgl_input_Keyboard_STATE_ON
+#define org_lwjgl_input_Keyboard_STATE_ON 0L
+#undef org_lwjgl_input_Keyboard_STATE_OFF
+#define org_lwjgl_input_Keyboard_STATE_OFF 1L
+#undef org_lwjgl_input_Keyboard_STATE_UNKNOWN
+#define org_lwjgl_input_Keyboard_STATE_UNKNOWN 2L
 /* Inaccessible static: keyName */
+/* Inaccessible static: keyMap */
+/* Inaccessible static: counter */
+/* Inaccessible static: keyCount */
 /* Inaccessible static: created */
 /* Inaccessible static: keyDownBuffer */
 /* Inaccessible static: readBuffer */
@@ -267,7 +276,8 @@
 /* Inaccessible static: character */
 /* Inaccessible static: key */
 /* Inaccessible static: state */
-/* Inaccessible static: class_00024org_00024lwjgl_00024input_00024Keyboard */
+/* Inaccessible static: class_000240 */
+/* Inaccessible static: class_000241 */
 /*
  * Class:     org_lwjgl_input_Keyboard
  * Method:    initIDs
@@ -323,13 +333,13 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_input_Keyboard_nEnableBuffer
   (JNIEnv *, jclass);
-  
+
 /*
  * Class:     org_lwjgl_input_Keyboard
  * Method:    nisStateKeySet
- * Signature: (I)Z
+ * Signature: (I)I
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Keyboard_nisStateKeySet
+JNIEXPORT jint JNICALL Java_org_lwjgl_input_Keyboard_nisStateKeySet
   (JNIEnv *, jclass, jint);
 
 #ifdef __cplusplus

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

Modified Files:
	Keyboard.java 
Log Message:
fix: isStateKeySet now returning int

Index: Keyboard.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Keyboard.java	19 Aug 2003 19:35:22 -0000	1.27
+++ Keyboard.java	23 Aug 2003 09:45:21 -0000	1.28
@@ -188,6 +188,10 @@
 	public static final int KEY_APPS            = 0xDD; /* AppMenu key */
 	public static final int KEY_POWER           = 0xDE;
 	public static final int KEY_SLEEP           = 0xDF;
+  
+  public static final int STATE_ON              = 0;
+  public static final int STATE_OFF             = 1;
+  public static final int STATE_UNKNOWN         = 2;
 	
 	/** Key names */
 	private static final String[] keyName = new String[255];
@@ -402,13 +406,13 @@
    * Checks whether one of the state keys are "active"
    * 
    * @param key State key to test (KEY_CAPITAL | KEY_NUMLOCK | KEY_SYSRQ)
-   * @return true if state key is on
+   * @return STATE_ON if on, STATE_OFF if off and STATE_UNKNOWN if the state is unknown
    */
-  public static boolean isStateKeySet(int key) {
+  public static int isStateKeySet(int key) {
     assert created : "The keyboard has not been created.";
     return nisStateKeySet(key);
   }
-  private static native boolean nisStateKeySet(int key);
+  private static native int nisStateKeySet(int key);
 	
 	/**
 	 * Gets a key's name

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

Modified Files:
	org_lwjgl_input_Keyboard.cpp 
Log Message:
fix: isStateKeySet now returning int

Index: org_lwjgl_input_Keyboard.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- org_lwjgl_input_Keyboard.cpp	19 Aug 2003 15:15:00 -0000	1.21
+++ org_lwjgl_input_Keyboard.cpp	23 Aug 2003 09:45:22 -0000	1.22
@@ -335,13 +335,22 @@
 /*
  * Class:     org_lwjgl_input_Keyboard
  * Method:    nisStateKeySet
- * Signature: (I)Z
+ * Signature: (I)I
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Keyboard_nisStateKeySet(JNIEnv *env, jclass clazz, jint key)
+JNIEXPORT jint JNICALL Java_org_lwjgl_input_Keyboard_nisStateKeySet(JNIEnv *env, jclass clazz, jint key)
 {
+  int state = org_lwjgl_input_Keyboard_STATE_UNKNOWN;
   switch(key) {
-    case org_lwjgl_input_Keyboard_KEY_CAPITAL: return GetKeyState(VK_CAPITAL);
-    case org_lwjgl_input_Keyboard_KEY_NUMLOCK: return GetKeyState(VK_NUMLOCK);
-    case org_lwjgl_input_Keyboard_KEY_SCROLL: return GetKeyState(VK_SCROLL);    
+    case org_lwjgl_input_Keyboard_KEY_CAPITAL: 
+      state = GetKeyState(VK_CAPITAL) ? org_lwjgl_input_Keyboard_STATE_ON : org_lwjgl_input_Keyboard_STATE_OFF;
+      break;
+    case org_lwjgl_input_Keyboard_KEY_NUMLOCK: 
+      state = GetKeyState(VK_NUMLOCK) ? org_lwjgl_input_Keyboard_STATE_ON : org_lwjgl_input_Keyboard_STATE_OFF;
+      break;
+    case org_lwjgl_input_Keyboard_KEY_SCROLL: 
+      state = GetKeyState(VK_SCROLL) ? org_lwjgl_input_Keyboard_STATE_ON : org_lwjgl_input_Keyboard_STATE_OFF;
+      break;
   }
+  
+  return state;
 }

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

Modified Files:
	KeyboardTest.java 
Log Message:
fix: isStateKeySet now returning int

Index: KeyboardTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- KeyboardTest.java	19 Aug 2003 15:15:00 -0000	1.12
+++ KeyboardTest.java	23 Aug 2003 09:45:22 -0000	1.13
@@ -159,15 +159,15 @@
           position.y -= 1;
         }
         
-        if(Keyboard.isStateKeySet(Keyboard.KEY_SCROLL)) {
+        if(Keyboard.isStateKeySet(Keyboard.KEY_SCROLL) == Keyboard.STATE_ON) {
           System.out.println("SCROLL lock on");
         }
         
-        if(Keyboard.isStateKeySet(Keyboard.KEY_CAPITAL)) {
+        if(Keyboard.isStateKeySet(Keyboard.KEY_CAPITAL) == Keyboard.STATE_ON) {
           System.out.println("CAPS lock on");
         }
         
-        if(Keyboard.isStateKeySet(Keyboard.KEY_NUMLOCK)) {
+        if(Keyboard.isStateKeySet(Keyboard.KEY_NUMLOCK) == Keyboard.STATE_ON) {
           System.out.println("NUM lock on");
         }
       }

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

Modified Files:
	Keyboard.java 
Log Message:


Index: Keyboard.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Keyboard.java	19 Aug 2003 15:15:00 -0000	1.26
+++ Keyboard.java	19 Aug 2003 19:35:22 -0000	1.27
@@ -359,7 +359,7 @@
 		assert created : "The keyboard has not been created.";
 		assert readBuffer != null : "Keyboard buffering has not been enabled.";
         
-        translationEnabled = nEnableTranslation();
+		translationEnabled = nEnableTranslation();
 		return translationEnabled;
 	}
 	

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

Modified Files:
	Keyboard.java 
Log Message:
added isStateKeySet for checking LOCK keys

Index: Keyboard.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Keyboard.java	17 Aug 2003 16:32:53 -0000	1.25
+++ Keyboard.java	19 Aug 2003 15:15:00 -0000	1.26
@@ -397,6 +397,18 @@
 		assert created : "The keyboard has not been created.";
 		return keyDownBuffer.get(key) != 0;
 	}
+  
+  /**
+   * Checks whether one of the state keys are "active"
+   * 
+   * @param key State key to test (KEY_CAPITAL | KEY_NUMLOCK | KEY_SYSRQ)
+   * @return true if state key is on
+   */
+  public static boolean isStateKeySet(int key) {
+    assert created : "The keyboard has not been created.";
+    return nisStateKeySet(key);
+  }
+  private static native boolean nisStateKeySet(int key);
 	
 	/**
 	 * Gets a key's name

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

Modified Files:
	KeyboardTest.java 
Log Message:
added isStateKeySet for checking LOCK keys

Index: KeyboardTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- KeyboardTest.java	17 Aug 2003 18:40:58 -0000	1.11
+++ KeyboardTest.java	19 Aug 2003 15:15:00 -0000	1.12
@@ -133,7 +133,6 @@
       Keyboard.read();
 
       int count = Keyboard.getNumKeyboardEvents();
-      System.out.println("Read " + count + " events");
       while(Keyboard.next()) {
         System.out.println("Checking key:" + Keyboard.getKeyName(Keyboard.key));
         if(Keyboard.key == Keyboard.KEY_ESCAPE) {
@@ -160,6 +159,17 @@
           position.y -= 1;
         }
         
+        if(Keyboard.isStateKeySet(Keyboard.KEY_SCROLL)) {
+          System.out.println("SCROLL lock on");
+        }
+        
+        if(Keyboard.isStateKeySet(Keyboard.KEY_CAPITAL)) {
+          System.out.println("CAPS lock on");
+        }
+        
+        if(Keyboard.isStateKeySet(Keyboard.KEY_NUMLOCK)) {
+          System.out.println("NUM lock on");
+        }
       }
       if (count > 0) {
         System.out.println();