java-game-lib-cvs — Commits to the repository will be send to this list.

[Java-game-lib-cvs] CVS: LWJGL/src/native/common org_lwjgl_openal_eax_CoreEAX.cpp,1.1,1.2

[Caspian Rychlik-P. <ci...@us...>]

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

Modified Files:
	org_lwjgl_openal_eax_CoreEAX.cpp 
Log Message:
Fixed include error

Index: org_lwjgl_openal_eax_CoreEAX.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_openal_eax_CoreEAX.cpp	25 Nov 2002 13:52:23 -0000	1.1
+++ org_lwjgl_openal_eax_CoreEAX.cpp	26 Nov 2002 23:31:14 -0000	1.2
@@ -39,9 +39,8 @@
  * @version $Revision$
  */
 #include "org_lwjgl_openal_eax_CoreEAX.h"
-#include "checkALerror.h"
-
 #include "extal.h"
+#include "checkALerror.h"
 
 /**
  * Throws an OAL exception with the specified message

[Java-game-lib-cvs] CVS: LWJGL/src/native/common org_lwjgl_openal_CoreAL.cpp,1.1,1.2

[Caspian Rychlik-P. <ci...@us...>]

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

Modified Files:
	org_lwjgl_openal_CoreAL.cpp 
Log Message:
Fixed include error

Index: org_lwjgl_openal_CoreAL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_CoreAL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_CoreAL.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_openal_CoreAL.cpp	25 Nov 2002 13:52:23 -0000	1.1
+++ org_lwjgl_openal_CoreAL.cpp	26 Nov 2002 23:30:39 -0000	1.2
@@ -40,10 +40,10 @@
  * @version $Revision$
  */
 #include "org_lwjgl_openal_CoreAL.h"
+/* OpenAL includes */
+#include "extal.h"
 #include "checkALerror.h"
 
-/* OpenAL includes */
-#include <AL/al.h>
 
 /**
  * This function enables a feature of the OpenAL driver.

[Java-game-lib-cvs] CVS: LWJGL/src/native/common org_lwjgl_openal_ALUT.cpp,1.1,1.2

[Caspian Rychlik-P. <ci...@us...>]

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

Modified Files:
	org_lwjgl_openal_ALUT.cpp 
Log Message:
Fixed include error

Index: org_lwjgl_openal_ALUT.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALUT.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALUT.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_openal_ALUT.cpp	25 Nov 2002 13:52:23 -0000	1.1
+++ org_lwjgl_openal_ALUT.cpp	26 Nov 2002 23:29:59 -0000	1.2
@@ -40,10 +40,11 @@
  * @version $Revision$
  */
 #include "org_lwjgl_openal_ALUT.h"
+/* OpenAL includes */
+#include "extal.h"
+
 #include "checkALerror.h"
 
-/* OpenAL includes */
-#include <AL/alut.h>
 
 #include <stdlib.h>
 

[Java-game-lib-cvs] CVS: LWJGL/src/native/common org_lwjgl_openal_ALC.cpp,1.1,1.2

[Caspian Rychlik-P. <ci...@us...>]

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

Modified Files:
	org_lwjgl_openal_ALC.cpp 
Log Message:
Fixed include error

Index: org_lwjgl_openal_ALC.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALC.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALC.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_openal_ALC.cpp	25 Nov 2002 13:52:23 -0000	1.1
+++ org_lwjgl_openal_ALC.cpp	26 Nov 2002 23:28:48 -0000	1.2
@@ -39,10 +39,8 @@
  * @version $Revision$
  */
 #include "org_lwjgl_openal_ALC.h"
+#include "extal.h"
 #include "checkALerror.h"
-
-/* OpenAL includes */
-#include <AL/alc.h>
 
 /*
  * Class:     org_lwjgl_openal_ALC

[Java-game-lib-cvs] CVS: LWJGL/src/native/common checkALerror.h,1.3,1.4

[Caspian Rychlik-P. <ci...@us...>]

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

Modified Files:
	checkALerror.h 
Log Message:
Fixed include error

Index: checkALerror.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/checkALerror.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/checkALerror.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- checkALerror.h	25 Nov 2002 13:39:44 -0000	1.3
+++ checkALerror.h	26 Nov 2002 23:26:00 -0000	1.4
@@ -1,19 +1,19 @@
 /*
-	checkGLerror.h
+	checkALerror.h
 
 	Author:		C. Prince
 	Created:	8 November 2001
 
-	Error checking for OpenGL bindings
+	Error checking for OpenAL bindings
 */
 
-#ifndef _CHECKGLERROR_H_INCLUDED_
-#define _CHECKGLERROR_H_INCLUDED_
+#ifndef _CHECKALERROR_H_INCLUDED_
+#define _CHECKALERROR_H_INCLUDED_
 
 #ifdef _DEBUG
 
 #include <jni.h>
-#include <AL/al.h>
+#include "extal.h"
 
 #define CHECK_AL_ERROR \
 	{ \
@@ -42,4 +42,4 @@
 
 #endif /* _DEBUG */
 
-#endif /* _CHECKGLERROR_H_INCLUDED_ */
+#endif /* _CHECKALERROR_H_INCLUDED_ */

[Java-game-lib-cvs] CVS: LWJGL/src/native/win32 org_lwjgl_input_Joystick.cpp,1.5,1.6 org_lwjgl_input_GamePad.cpp,1.1,1.2

[Caspian Rychlik-P. <ci...@us...>]

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

Modified Files:
	org_lwjgl_input_Joystick.cpp org_lwjgl_input_GamePad.cpp 
Log Message:
*** keyword substitution change ***

Index: org_lwjgl_input_Joystick.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Joystick.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Joystick.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6

Index: org_lwjgl_input_GamePad.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_GamePad.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_GamePad.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_input_GamePad.cpp	19 Oct 2002 14:27:26 -0000	1.1
+++ org_lwjgl_input_GamePad.cpp	26 Nov 2002 23:23:31 -0000	1.2
@@ -1,126 +1,126 @@
-/* 
- * Copyright (c) 2002 Light Weight 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.
- */
- 
-/**
- * $Id$
- *
- * Win32 digital (Atari) joystick handling. These days it's a gamepad.
- *
- * @author cix_foo <ci...@us...>
- * @version $Revision$
- */
-
-
-#define WIN32_LEAN_AND_MEAN
-
-#include <windows.h>
-#include "org_lwjgl_input_GamePad.h"
-#undef  DIRECTINPUT_VERSION
-#define DIRECTINPUT_VERSION 0x0300
-#include <dinput.h>
-
-extern LPDIRECTINPUT	lpdi;
-LPDIRECTINPUTDEVICE		lpdiGamePad;
-extern HWND				hwnd; // The display, which must have been created
-/*
- * Class:     org_lwjgl_input_GamePad
- * Method:    initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_input_GamePad_initIDs
-  (JNIEnv * env, jclass clazz) {}
-
-/*
- * Class:     org_lwjgl_input_GamePad
- * Method:    nCreate
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_GamePad_nCreate
-  (JNIEnv * env, jclass clazz)
-{
-	printf("GamePad not implemented yet!\n");
-	return JNI_FALSE;
-}
-
-/*
- * Class:     org_lwjgl_input_GamePad
- * Method:    nDestroy
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_input_GamePad_nDestroy
-  (JNIEnv * env, jclass clazz)
-{
-}
-
-/*
- * Class:     org_lwjgl_input_GamePad
- * Method:    nPoll
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_input_GamePad_nPoll
-  (JNIEnv * env, jclass clazz, jint buf)
-{
-}
-
-/*
- * Class:     org_lwjgl_input_GamePad
- * Method:    nRead
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_org_lwjgl_input_GamePad_nRead
-  (JNIEnv * env, jclass clazz, jint buf)
-{
-	return 0;
-}
-
-/*
- * Class:     org_lwjgl_input_GamePad
- * Method:    nEnableBuffer
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_lwjgl_input_GamePad_nEnableBuffer
-  (JNIEnv * env, jclass clazz)
-{
-	return 0;
-}
-
-/*
- * Class:     org_lwjgl_input_GamePad
- * Method:    nGetNumButtons
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_lwjgl_input_GamePad_nGetNumButtons
-  (JNIEnv * env, jclass clazz)
-{
-	return 0;
-}
-
+/* 
+ * Copyright (c) 2002 Light Weight 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.
+ */
+ 
+/**
+ * $Id$
+ *
+ * Win32 digital (Atari) joystick handling. These days it's a gamepad.
+ *
+ * @author cix_foo <ci...@us...>
+ * @version $Revision$
+ */
+
+
+#define WIN32_LEAN_AND_MEAN
+
+#include <windows.h>
+#include "org_lwjgl_input_GamePad.h"
+#undef  DIRECTINPUT_VERSION
+#define DIRECTINPUT_VERSION 0x0300
+#include <dinput.h>
+
+extern LPDIRECTINPUT	lpdi;
+LPDIRECTINPUTDEVICE		lpdiGamePad;
+extern HWND				hwnd; // The display, which must have been created
+/*
+ * Class:     org_lwjgl_input_GamePad
+ * Method:    initIDs
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_input_GamePad_initIDs
+  (JNIEnv * env, jclass clazz) {}
+
+/*
+ * Class:     org_lwjgl_input_GamePad
+ * Method:    nCreate
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_GamePad_nCreate
+  (JNIEnv * env, jclass clazz)
+{
+	printf("GamePad not implemented yet!\n");
+	return JNI_FALSE;
+}
+
+/*
+ * Class:     org_lwjgl_input_GamePad
+ * Method:    nDestroy
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_input_GamePad_nDestroy
+  (JNIEnv * env, jclass clazz)
+{
+}
+
+/*
+ * Class:     org_lwjgl_input_GamePad
+ * Method:    nPoll
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_input_GamePad_nPoll
+  (JNIEnv * env, jclass clazz, jint buf)
+{
+}
+
+/*
+ * Class:     org_lwjgl_input_GamePad
+ * Method:    nRead
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL Java_org_lwjgl_input_GamePad_nRead
+  (JNIEnv * env, jclass clazz, jint buf)
+{
+	return 0;
+}
+
+/*
+ * Class:     org_lwjgl_input_GamePad
+ * Method:    nEnableBuffer
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_lwjgl_input_GamePad_nEnableBuffer
+  (JNIEnv * env, jclass clazz)
+{
+	return 0;
+}
+
+/*
+ * Class:     org_lwjgl_input_GamePad
+ * Method:    nGetNumButtons
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_lwjgl_input_GamePad_nGetNumButtons
+  (JNIEnv * env, jclass clazz)
+{
+	return 0;
+}
+

[Java-game-lib-cvs] CVS: LWJGL/src/native/common org_lwjgl_Math_MatrixOpAdd_MatrixOpSafe.h,1.1,1.2 org_lwjgl_Math_MatrixOpNegate_MatrixOpDirect.h,1.1,1.2 org_lwjgl_Math_MatrixOpMultiply_MatrixOpSafe.h,1.1,1.2 org_lwjgl_Math_MatrixOpSubtract_MatrixOpDirect.h,1.1,1.2 org_lwjgl_input_Joystick.h,1.4,1.5 org_lwjgl_Math_MatrixOpInvert_MatrixOpDirect.h,1.1,1.2 org_lwjgl_Math_MatrixOpNormalise_MatrixOpDirect.h,1.1,1.2 org_lwjgl_Math_MatrixOpNormalise_MatrixOpSafe.h,1.1,1.2 org_lwjgl_opengl_CoreGL.h,1.5,1.6 org_lwjgl_Math_MatrixOpAdd_MatrixOpDirect.h,1.1,1.2 org_lwjgl_Math_MatrixOpInvert_MatrixOpSafe.h,1.1,1.2 org_lwjgl_Math_MatrixOpMultiply_MatrixOpDirect.h,1.1,1.2 org_lwjgl_Math_MatrixOpNegate_MatrixOpSafe.h,1.1,1.2 org_lwjgl_Math_MatrixOpCopy_MatrixOpDirect.h,1.1,1.2 org_lwjgl_input_GamePad.h,1.1,1.2 org_lwjgl_Math_MatrixOpSubtract_MatrixOpSafe.h,1.1,1.2 org_lwjgl_Math_MatrixOpCopy_MatrixOpSafe.h,1.1,1.2

[Caspian Rychlik-P. <ci...@us...>]

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

Modified Files:
	org_lwjgl_Math_MatrixOpAdd_MatrixOpSafe.h 
	org_lwjgl_Math_MatrixOpNegate_MatrixOpDirect.h 
	org_lwjgl_Math_MatrixOpMultiply_MatrixOpSafe.h 
	org_lwjgl_Math_MatrixOpSubtract_MatrixOpDirect.h 
	org_lwjgl_input_Joystick.h 
	org_lwjgl_Math_MatrixOpInvert_MatrixOpDirect.h 
	org_lwjgl_Math_MatrixOpNormalise_MatrixOpDirect.h 
	org_lwjgl_Math_MatrixOpNormalise_MatrixOpSafe.h 
	org_lwjgl_opengl_CoreGL.h 
	org_lwjgl_Math_MatrixOpAdd_MatrixOpDirect.h 
	org_lwjgl_Math_MatrixOpInvert_MatrixOpSafe.h 
	org_lwjgl_Math_MatrixOpMultiply_MatrixOpDirect.h 
	org_lwjgl_Math_MatrixOpNegate_MatrixOpSafe.h 
	org_lwjgl_Math_MatrixOpCopy_MatrixOpDirect.h 
	org_lwjgl_input_GamePad.h 
	org_lwjgl_Math_MatrixOpSubtract_MatrixOpSafe.h 
	org_lwjgl_Math_MatrixOpCopy_MatrixOpSafe.h 
Log Message:
*** keyword substitution change ***

Index: org_lwjgl_Math_MatrixOpAdd_MatrixOpSafe.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpAdd_MatrixOpSafe.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpAdd_MatrixOpSafe.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_Math_MatrixOpAdd_MatrixOpSafe.h	24 Aug 2002 09:32:01 -0000	1.1
+++ org_lwjgl_Math_MatrixOpAdd_MatrixOpSafe.h	26 Nov 2002 23:22:48 -0000	1.2
@@ -1,21 +1,21 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class org_lwjgl_Math_MatrixOpAdd_MatrixOpSafe */
 
 #ifndef _Included_org_lwjgl_Math_MatrixOpAdd_MatrixOpSafe
-#define _Included_org_lwjgl_Math_MatrixOpAdd_MatrixOpSafe
+#define _Included_org_lwjgl_Math_MatrixOpAdd_MatrixOpSafe
 #ifdef __cplusplus
 extern "C" {
-#endif
-/*
- * Class:     org_lwjgl_Math_MatrixOpAdd_MatrixOpSafe
- * Method:    execute
- * Signature: (IIIIIZIIIIIZIIZ)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpAdd_00024MatrixOpSafe_execute
+#endif
+/*
+ * Class:     org_lwjgl_Math_MatrixOpAdd_MatrixOpSafe
+ * Method:    execute
+ * Signature: (IIIIIZIIIIIZIIZ)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpAdd_00024MatrixOpSafe_execute
   (JNIEnv *, jobject, jint, jint, jint, jint, jint, jboolean, jint, jint, jint, jint, jint, jboolean, jint, jint, jboolean);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

Index: org_lwjgl_Math_MatrixOpNegate_MatrixOpDirect.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpNegate_MatrixOpDirect.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpNegate_MatrixOpDirect.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_Math_MatrixOpNegate_MatrixOpDirect.h	24 Aug 2002 09:32:01 -0000	1.1
+++ org_lwjgl_Math_MatrixOpNegate_MatrixOpDirect.h	26 Nov 2002 23:22:48 -0000	1.2
@@ -1,21 +1,21 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class org_lwjgl_Math_MatrixOpNegate_MatrixOpDirect */
 
 #ifndef _Included_org_lwjgl_Math_MatrixOpNegate_MatrixOpDirect
-#define _Included_org_lwjgl_Math_MatrixOpNegate_MatrixOpDirect
+#define _Included_org_lwjgl_Math_MatrixOpNegate_MatrixOpDirect
 #ifdef __cplusplus
 extern "C" {
-#endif
-/*
- * Class:     org_lwjgl_Math_MatrixOpNegate_MatrixOpDirect
- * Method:    execute
- * Signature: (IIIIIZIIZ)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpNegate_00024MatrixOpDirect_execute
+#endif
+/*
+ * Class:     org_lwjgl_Math_MatrixOpNegate_MatrixOpDirect
+ * Method:    execute
+ * Signature: (IIIIIZIIZ)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpNegate_00024MatrixOpDirect_execute
   (JNIEnv *, jobject, jint, jint, jint, jint, jint, jboolean, jint, jint, jboolean);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

Index: org_lwjgl_Math_MatrixOpMultiply_MatrixOpSafe.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpMultiply_MatrixOpSafe.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpMultiply_MatrixOpSafe.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_Math_MatrixOpMultiply_MatrixOpSafe.h	24 Aug 2002 09:32:01 -0000	1.1
+++ org_lwjgl_Math_MatrixOpMultiply_MatrixOpSafe.h	26 Nov 2002 23:22:48 -0000	1.2
@@ -1,21 +1,21 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class org_lwjgl_Math_MatrixOpMultiply_MatrixOpSafe */
 
 #ifndef _Included_org_lwjgl_Math_MatrixOpMultiply_MatrixOpSafe
-#define _Included_org_lwjgl_Math_MatrixOpMultiply_MatrixOpSafe
+#define _Included_org_lwjgl_Math_MatrixOpMultiply_MatrixOpSafe
 #ifdef __cplusplus
 extern "C" {
-#endif
-/*
- * Class:     org_lwjgl_Math_MatrixOpMultiply_MatrixOpSafe
- * Method:    execute
- * Signature: (IIIIIZIIIIIZIIZ)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpMultiply_00024MatrixOpSafe_execute
+#endif
+/*
+ * Class:     org_lwjgl_Math_MatrixOpMultiply_MatrixOpSafe
+ * Method:    execute
+ * Signature: (IIIIIZIIIIIZIIZ)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpMultiply_00024MatrixOpSafe_execute
   (JNIEnv *, jobject, jint, jint, jint, jint, jint, jboolean, jint, jint, jint, jint, jint, jboolean, jint, jint, jboolean);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

Index: org_lwjgl_Math_MatrixOpSubtract_MatrixOpDirect.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpSubtract_MatrixOpDirect.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpSubtract_MatrixOpDirect.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_Math_MatrixOpSubtract_MatrixOpDirect.h	24 Aug 2002 09:32:01 -0000	1.1
+++ org_lwjgl_Math_MatrixOpSubtract_MatrixOpDirect.h	26 Nov 2002 23:22:48 -0000	1.2
@@ -1,21 +1,21 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class org_lwjgl_Math_MatrixOpSubtract_MatrixOpDirect */
 
 #ifndef _Included_org_lwjgl_Math_MatrixOpSubtract_MatrixOpDirect
-#define _Included_org_lwjgl_Math_MatrixOpSubtract_MatrixOpDirect
+#define _Included_org_lwjgl_Math_MatrixOpSubtract_MatrixOpDirect
 #ifdef __cplusplus
 extern "C" {
-#endif
-/*
- * Class:     org_lwjgl_Math_MatrixOpSubtract_MatrixOpDirect
- * Method:    execute
- * Signature: (IIIIIZIIIIIZIIZ)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpSubtract_00024MatrixOpDirect_execute
+#endif
+/*
+ * Class:     org_lwjgl_Math_MatrixOpSubtract_MatrixOpDirect
+ * Method:    execute
+ * Signature: (IIIIIZIIIIIZIIZ)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpSubtract_00024MatrixOpDirect_execute
   (JNIEnv *, jobject, jint, jint, jint, jint, jint, jboolean, jint, jint, jint, jint, jint, jboolean, jint, jint, jboolean);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

Index: org_lwjgl_input_Joystick.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Joystick.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Joystick.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5

Index: org_lwjgl_Math_MatrixOpInvert_MatrixOpDirect.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpInvert_MatrixOpDirect.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpInvert_MatrixOpDirect.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_Math_MatrixOpInvert_MatrixOpDirect.h	24 Aug 2002 09:32:01 -0000	1.1
+++ org_lwjgl_Math_MatrixOpInvert_MatrixOpDirect.h	26 Nov 2002 23:22:49 -0000	1.2
@@ -1,21 +1,21 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class org_lwjgl_Math_MatrixOpInvert_MatrixOpDirect */
 
 #ifndef _Included_org_lwjgl_Math_MatrixOpInvert_MatrixOpDirect
-#define _Included_org_lwjgl_Math_MatrixOpInvert_MatrixOpDirect
+#define _Included_org_lwjgl_Math_MatrixOpInvert_MatrixOpDirect
 #ifdef __cplusplus
 extern "C" {
-#endif
-/*
- * Class:     org_lwjgl_Math_MatrixOpInvert_MatrixOpDirect
- * Method:    execute
- * Signature: (IIIIIZIIZ)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpInvert_00024MatrixOpDirect_execute
+#endif
+/*
+ * Class:     org_lwjgl_Math_MatrixOpInvert_MatrixOpDirect
+ * Method:    execute
+ * Signature: (IIIIIZIIZ)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpInvert_00024MatrixOpDirect_execute
   (JNIEnv *, jobject, jint, jint, jint, jint, jint, jboolean, jint, jint, jboolean);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

Index: org_lwjgl_Math_MatrixOpNormalise_MatrixOpDirect.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpNormalise_MatrixOpDirect.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpNormalise_MatrixOpDirect.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_Math_MatrixOpNormalise_MatrixOpDirect.h	24 Aug 2002 09:32:01 -0000	1.1
+++ org_lwjgl_Math_MatrixOpNormalise_MatrixOpDirect.h	26 Nov 2002 23:22:49 -0000	1.2
@@ -1,21 +1,21 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class org_lwjgl_Math_MatrixOpNormalise_MatrixOpDirect */
 
 #ifndef _Included_org_lwjgl_Math_MatrixOpNormalise_MatrixOpDirect
-#define _Included_org_lwjgl_Math_MatrixOpNormalise_MatrixOpDirect
+#define _Included_org_lwjgl_Math_MatrixOpNormalise_MatrixOpDirect
 #ifdef __cplusplus
 extern "C" {
-#endif
-/*
- * Class:     org_lwjgl_Math_MatrixOpNormalise_MatrixOpDirect
- * Method:    execute
- * Signature: (IIIIIZIIZ)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpNormalise_00024MatrixOpDirect_execute
+#endif
+/*
+ * Class:     org_lwjgl_Math_MatrixOpNormalise_MatrixOpDirect
+ * Method:    execute
+ * Signature: (IIIIIZIIZ)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpNormalise_00024MatrixOpDirect_execute
   (JNIEnv *, jobject, jint, jint, jint, jint, jint, jboolean, jint, jint, jboolean);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

Index: org_lwjgl_Math_MatrixOpNormalise_MatrixOpSafe.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpNormalise_MatrixOpSafe.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpNormalise_MatrixOpSafe.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_Math_MatrixOpNormalise_MatrixOpSafe.h	24 Aug 2002 09:32:01 -0000	1.1
+++ org_lwjgl_Math_MatrixOpNormalise_MatrixOpSafe.h	26 Nov 2002 23:22:49 -0000	1.2
@@ -1,21 +1,21 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class org_lwjgl_Math_MatrixOpNormalise_MatrixOpSafe */
 
 #ifndef _Included_org_lwjgl_Math_MatrixOpNormalise_MatrixOpSafe
-#define _Included_org_lwjgl_Math_MatrixOpNormalise_MatrixOpSafe
+#define _Included_org_lwjgl_Math_MatrixOpNormalise_MatrixOpSafe
 #ifdef __cplusplus
 extern "C" {
-#endif
-/*
- * Class:     org_lwjgl_Math_MatrixOpNormalise_MatrixOpSafe
- * Method:    execute
- * Signature: (IIIIIZIIZ)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpNormalise_00024MatrixOpSafe_execute
+#endif
+/*
+ * Class:     org_lwjgl_Math_MatrixOpNormalise_MatrixOpSafe
+ * Method:    execute
+ * Signature: (IIIIIZIIZ)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpNormalise_00024MatrixOpSafe_execute
   (JNIEnv *, jobject, jint, jint, jint, jint, jint, jboolean, jint, jint, jboolean);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

Index: org_lwjgl_opengl_CoreGL.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6

Index: org_lwjgl_Math_MatrixOpAdd_MatrixOpDirect.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpAdd_MatrixOpDirect.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpAdd_MatrixOpDirect.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_Math_MatrixOpAdd_MatrixOpDirect.h	24 Aug 2002 09:32:01 -0000	1.1
+++ org_lwjgl_Math_MatrixOpAdd_MatrixOpDirect.h	26 Nov 2002 23:22:49 -0000	1.2
@@ -1,21 +1,21 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class org_lwjgl_Math_MatrixOpAdd_MatrixOpDirect */
 
 #ifndef _Included_org_lwjgl_Math_MatrixOpAdd_MatrixOpDirect
-#define _Included_org_lwjgl_Math_MatrixOpAdd_MatrixOpDirect
+#define _Included_org_lwjgl_Math_MatrixOpAdd_MatrixOpDirect
 #ifdef __cplusplus
 extern "C" {
-#endif
-/*
- * Class:     org_lwjgl_Math_MatrixOpAdd_MatrixOpDirect
- * Method:    execute
- * Signature: (IIIIIZIIIIIZIIZ)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpAdd_00024MatrixOpDirect_execute
+#endif
+/*
+ * Class:     org_lwjgl_Math_MatrixOpAdd_MatrixOpDirect
+ * Method:    execute
+ * Signature: (IIIIIZIIIIIZIIZ)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpAdd_00024MatrixOpDirect_execute
   (JNIEnv *, jobject, jint, jint, jint, jint, jint, jboolean, jint, jint, jint, jint, jint, jboolean, jint, jint, jboolean);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

Index: org_lwjgl_Math_MatrixOpInvert_MatrixOpSafe.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpInvert_MatrixOpSafe.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpInvert_MatrixOpSafe.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_Math_MatrixOpInvert_MatrixOpSafe.h	24 Aug 2002 09:32:01 -0000	1.1
+++ org_lwjgl_Math_MatrixOpInvert_MatrixOpSafe.h	26 Nov 2002 23:22:49 -0000	1.2
@@ -1,21 +1,21 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class org_lwjgl_Math_MatrixOpInvert_MatrixOpSafe */
 
 #ifndef _Included_org_lwjgl_Math_MatrixOpInvert_MatrixOpSafe
-#define _Included_org_lwjgl_Math_MatrixOpInvert_MatrixOpSafe
+#define _Included_org_lwjgl_Math_MatrixOpInvert_MatrixOpSafe
 #ifdef __cplusplus
 extern "C" {
-#endif
-/*
- * Class:     org_lwjgl_Math_MatrixOpInvert_MatrixOpSafe
- * Method:    execute
- * Signature: (IIIIIZIIZ)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpInvert_00024MatrixOpSafe_execute
+#endif
+/*
+ * Class:     org_lwjgl_Math_MatrixOpInvert_MatrixOpSafe
+ * Method:    execute
+ * Signature: (IIIIIZIIZ)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpInvert_00024MatrixOpSafe_execute
   (JNIEnv *, jobject, jint, jint, jint, jint, jint, jboolean, jint, jint, jboolean);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

Index: org_lwjgl_Math_MatrixOpMultiply_MatrixOpDirect.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpMultiply_MatrixOpDirect.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpMultiply_MatrixOpDirect.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_Math_MatrixOpMultiply_MatrixOpDirect.h	24 Aug 2002 09:32:01 -0000	1.1
+++ org_lwjgl_Math_MatrixOpMultiply_MatrixOpDirect.h	26 Nov 2002 23:22:49 -0000	1.2
@@ -1,21 +1,21 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class org_lwjgl_Math_MatrixOpMultiply_MatrixOpDirect */
 
 #ifndef _Included_org_lwjgl_Math_MatrixOpMultiply_MatrixOpDirect
-#define _Included_org_lwjgl_Math_MatrixOpMultiply_MatrixOpDirect
+#define _Included_org_lwjgl_Math_MatrixOpMultiply_MatrixOpDirect
 #ifdef __cplusplus
 extern "C" {
-#endif
-/*
- * Class:     org_lwjgl_Math_MatrixOpMultiply_MatrixOpDirect
- * Method:    execute
- * Signature: (IIIIIZIIIIIZIIZ)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpMultiply_00024MatrixOpDirect_execute
+#endif
+/*
+ * Class:     org_lwjgl_Math_MatrixOpMultiply_MatrixOpDirect
+ * Method:    execute
+ * Signature: (IIIIIZIIIIIZIIZ)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpMultiply_00024MatrixOpDirect_execute
   (JNIEnv *, jobject, jint, jint, jint, jint, jint, jboolean, jint, jint, jint, jint, jint, jboolean, jint, jint, jboolean);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

Index: org_lwjgl_Math_MatrixOpNegate_MatrixOpSafe.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpNegate_MatrixOpSafe.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpNegate_MatrixOpSafe.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_Math_MatrixOpNegate_MatrixOpSafe.h	24 Aug 2002 09:32:01 -0000	1.1
+++ org_lwjgl_Math_MatrixOpNegate_MatrixOpSafe.h	26 Nov 2002 23:22:49 -0000	1.2
@@ -1,21 +1,21 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class org_lwjgl_Math_MatrixOpNegate_MatrixOpSafe */
 
 #ifndef _Included_org_lwjgl_Math_MatrixOpNegate_MatrixOpSafe
-#define _Included_org_lwjgl_Math_MatrixOpNegate_MatrixOpSafe
+#define _Included_org_lwjgl_Math_MatrixOpNegate_MatrixOpSafe
 #ifdef __cplusplus
 extern "C" {
-#endif
-/*
- * Class:     org_lwjgl_Math_MatrixOpNegate_MatrixOpSafe
- * Method:    execute
- * Signature: (IIIIIZIIZ)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpNegate_00024MatrixOpSafe_execute
+#endif
+/*
+ * Class:     org_lwjgl_Math_MatrixOpNegate_MatrixOpSafe
+ * Method:    execute
+ * Signature: (IIIIIZIIZ)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpNegate_00024MatrixOpSafe_execute
   (JNIEnv *, jobject, jint, jint, jint, jint, jint, jboolean, jint, jint, jboolean);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

Index: org_lwjgl_Math_MatrixOpCopy_MatrixOpDirect.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpCopy_MatrixOpDirect.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpCopy_MatrixOpDirect.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_Math_MatrixOpCopy_MatrixOpDirect.h	24 Aug 2002 09:32:01 -0000	1.1
+++ org_lwjgl_Math_MatrixOpCopy_MatrixOpDirect.h	26 Nov 2002 23:22:49 -0000	1.2
@@ -1,21 +1,21 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class org_lwjgl_Math_MatrixOpCopy_MatrixOpDirect */
 
 #ifndef _Included_org_lwjgl_Math_MatrixOpCopy_MatrixOpDirect
-#define _Included_org_lwjgl_Math_MatrixOpCopy_MatrixOpDirect
+#define _Included_org_lwjgl_Math_MatrixOpCopy_MatrixOpDirect
 #ifdef __cplusplus
 extern "C" {
-#endif
-/*
- * Class:     org_lwjgl_Math_MatrixOpCopy_MatrixOpDirect
- * Method:    execute
- * Signature: (IIIIIZIIZ)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpCopy_00024MatrixOpDirect_execute
+#endif
+/*
+ * Class:     org_lwjgl_Math_MatrixOpCopy_MatrixOpDirect
+ * Method:    execute
+ * Signature: (IIIIIZIIZ)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpCopy_00024MatrixOpDirect_execute
   (JNIEnv *, jobject, jint, jint, jint, jint, jint, jboolean, jint, jint, jboolean);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

Index: org_lwjgl_input_GamePad.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_GamePad.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_GamePad.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_input_GamePad.h	24 Aug 2002 21:17:37 -0000	1.1
+++ org_lwjgl_input_GamePad.h	26 Nov 2002 23:22:49 -0000	1.2
@@ -1,91 +1,91 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class org_lwjgl_input_GamePad */
 
 #ifndef _Included_org_lwjgl_input_GamePad
-#define _Included_org_lwjgl_input_GamePad
+#define _Included_org_lwjgl_input_GamePad
 #ifdef __cplusplus
 extern "C" {
-#endif
-/* Inaccessible static: _00024assertionsDisabled */
-/* Inaccessible static: PAD_UP */
-/* Inaccessible static: PAD_DOWN */
-/* Inaccessible static: PAD_LEFT */
-/* Inaccessible static: PAD_RIGHT */
-/* Inaccessible static: PAD_BUTTON0 */
-/* Inaccessible static: PAD_BUTTON1 */
-/* Inaccessible static: PAD_BUTTON2 */
-/* Inaccessible static: PAD_BUTTON3 */
-/* Inaccessible static: PAD_BUTTON4 */
-/* Inaccessible static: PAD_BUTTON5 */
-/* Inaccessible static: PAD_BUTTON6 */
-/* Inaccessible static: PAD_BUTTON7 */
-/* Inaccessible static: PAD_BUTTON8 */
-/* Inaccessible static: created */
-/* Inaccessible static: buttonDownBuffer */
-/* Inaccessible static: buttonDownAddress */
-/* Inaccessible static: readBuffer */
-/* Inaccessible static: readBufferAddress */
-/* Inaccessible static: button */
-/* Inaccessible static: state */
-/* Inaccessible static: class_000240 */
-/*
- * Class:     org_lwjgl_input_GamePad
- * Method:    initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_input_GamePad_initIDs
+#endif
+/* Inaccessible static: _00024assertionsDisabled */
+/* Inaccessible static: PAD_UP */
+/* Inaccessible static: PAD_DOWN */
+/* Inaccessible static: PAD_LEFT */
+/* Inaccessible static: PAD_RIGHT */
+/* Inaccessible static: PAD_BUTTON0 */
+/* Inaccessible static: PAD_BUTTON1 */
+/* Inaccessible static: PAD_BUTTON2 */
+/* Inaccessible static: PAD_BUTTON3 */
+/* Inaccessible static: PAD_BUTTON4 */
+/* Inaccessible static: PAD_BUTTON5 */
+/* Inaccessible static: PAD_BUTTON6 */
+/* Inaccessible static: PAD_BUTTON7 */
+/* Inaccessible static: PAD_BUTTON8 */
+/* Inaccessible static: created */
+/* Inaccessible static: buttonDownBuffer */
+/* Inaccessible static: buttonDownAddress */
+/* Inaccessible static: readBuffer */
+/* Inaccessible static: readBufferAddress */
+/* Inaccessible static: button */
+/* Inaccessible static: state */
+/* Inaccessible static: class_000240 */
+/*
+ * Class:     org_lwjgl_input_GamePad
+ * Method:    initIDs
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_input_GamePad_initIDs
   (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_input_GamePad
- * Method:    nCreate
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_GamePad_nCreate
+
+/*
+ * Class:     org_lwjgl_input_GamePad
+ * Method:    nCreate
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_GamePad_nCreate
   (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_input_GamePad
- * Method:    nDestroy
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_input_GamePad_nDestroy
+
+/*
+ * Class:     org_lwjgl_input_GamePad
+ * Method:    nDestroy
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_input_GamePad_nDestroy
   (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_input_GamePad
- * Method:    nPoll
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_input_GamePad_nPoll
+
+/*
+ * Class:     org_lwjgl_input_GamePad
+ * Method:    nPoll
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_input_GamePad_nPoll
   (JNIEnv *, jclass, jint);
-
-/*
- * Class:     org_lwjgl_input_GamePad
- * Method:    nRead
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_org_lwjgl_input_GamePad_nRead
+
+/*
+ * Class:     org_lwjgl_input_GamePad
+ * Method:    nRead
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL Java_org_lwjgl_input_GamePad_nRead
   (JNIEnv *, jclass, jint);
-
-/*
- * Class:     org_lwjgl_input_GamePad
- * Method:    nEnableBuffer
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_lwjgl_input_GamePad_nEnableBuffer
+
+/*
+ * Class:     org_lwjgl_input_GamePad
+ * Method:    nEnableBuffer
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_lwjgl_input_GamePad_nEnableBuffer
   (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_input_GamePad
- * Method:    nGetNumButtons
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_lwjgl_input_GamePad_nGetNumButtons
+
+/*
+ * Class:     org_lwjgl_input_GamePad
+ * Method:    nGetNumButtons
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_lwjgl_input_GamePad_nGetNumButtons
   (JNIEnv *, jclass);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

Index: org_lwjgl_Math_MatrixOpSubtract_MatrixOpSafe.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpSubtract_MatrixOpSafe.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpSubtract_MatrixOpSafe.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_Math_MatrixOpSubtract_MatrixOpSafe.h	24 Aug 2002 09:32:01 -0000	1.1
+++ org_lwjgl_Math_MatrixOpSubtract_MatrixOpSafe.h	26 Nov 2002 23:22:49 -0000	1.2
@@ -1,21 +1,21 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class org_lwjgl_Math_MatrixOpSubtract_MatrixOpSafe */
 
 #ifndef _Included_org_lwjgl_Math_MatrixOpSubtract_MatrixOpSafe
-#define _Included_org_lwjgl_Math_MatrixOpSubtract_MatrixOpSafe
+#define _Included_org_lwjgl_Math_MatrixOpSubtract_MatrixOpSafe
 #ifdef __cplusplus
 extern "C" {
-#endif
-/*
- * Class:     org_lwjgl_Math_MatrixOpSubtract_MatrixOpSafe
- * Method:    execute
- * Signature: (IIIIIZIIIIIZIIZ)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpSubtract_00024MatrixOpSafe_execute
+#endif
+/*
+ * Class:     org_lwjgl_Math_MatrixOpSubtract_MatrixOpSafe
+ * Method:    execute
+ * Signature: (IIIIIZIIIIIZIIZ)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpSubtract_00024MatrixOpSafe_execute
   (JNIEnv *, jobject, jint, jint, jint, jint, jint, jboolean, jint, jint, jint, jint, jint, jboolean, jint, jint, jboolean);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

Index: org_lwjgl_Math_MatrixOpCopy_MatrixOpSafe.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpCopy_MatrixOpSafe.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math_MatrixOpCopy_MatrixOpSafe.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_Math_MatrixOpCopy_MatrixOpSafe.h	24 Aug 2002 09:32:01 -0000	1.1
+++ org_lwjgl_Math_MatrixOpCopy_MatrixOpSafe.h	26 Nov 2002 23:22:49 -0000	1.2
@@ -1,21 +1,21 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class org_lwjgl_Math_MatrixOpCopy_MatrixOpSafe */
 
 #ifndef _Included_org_lwjgl_Math_MatrixOpCopy_MatrixOpSafe
-#define _Included_org_lwjgl_Math_MatrixOpCopy_MatrixOpSafe
+#define _Included_org_lwjgl_Math_MatrixOpCopy_MatrixOpSafe
 #ifdef __cplusplus
 extern "C" {
-#endif
-/*
- * Class:     org_lwjgl_Math_MatrixOpCopy_MatrixOpSafe
- * Method:    execute
- * Signature: (IIIIIZIIZ)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpCopy_00024MatrixOpSafe_execute
+#endif
+/*
+ * Class:     org_lwjgl_Math_MatrixOpCopy_MatrixOpSafe
+ * Method:    execute
+ * Signature: (IIIIIZIIZ)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Math_00024MatrixOpCopy_00024MatrixOpSafe_execute
   (JNIEnv *, jobject, jint, jint, jint, jint, jint, jboolean, jint, jint, jboolean);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

[Java-game-lib-cvs] CVS: LWJGL/src/native/linux org_lwjgl_input_Keyboard.cpp,1.8,1.9

[Elias N. <eli...@us...>]

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

Modified Files:
	org_lwjgl_input_Keyboard.cpp 
Log Message:
Increased poll buffer size

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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- org_lwjgl_input_Keyboard.cpp	26 Nov 2002 20:07:06 -0000	1.8
+++ org_lwjgl_input_Keyboard.cpp	26 Nov 2002 20:07:49 -0000	1.9
@@ -47,7 +47,7 @@
 
 #define KEYBOARD_BUFFER_SIZE 50
 #define KEYBOARD_SIZE 256
-#define KEY_EVENT_BACKLOG 5
+#define KEY_EVENT_BACKLOG 20
 
 unsigned char readBuffer[KEYBOARD_BUFFER_SIZE * 2];
 jfieldID fid_readBuffer;

[Java-game-lib-cvs] CVS: LWJGL/src/native/linux org_lwjgl_input_Keyboard.cpp,1.7,1.8

[Elias N. <eli...@us...>]

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

Modified Files:
	org_lwjgl_input_Keyboard.cpp 
Log Message:
Added poll() logic so behavior looks like DX

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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- org_lwjgl_input_Keyboard.cpp	26 Nov 2002 08:15:17 -0000	1.7
+++ org_lwjgl_input_Keyboard.cpp	26 Nov 2002 20:07:06 -0000	1.8
@@ -47,12 +47,23 @@
 
 #define KEYBOARD_BUFFER_SIZE 50
 #define KEYBOARD_SIZE 256
+#define KEY_EVENT_BACKLOG 5
+
 unsigned char readBuffer[KEYBOARD_BUFFER_SIZE * 2];
 jfieldID fid_readBuffer;
 jfieldID fid_readBufferAddress;
 unsigned char key_buf[KEYBOARD_SIZE];
 unsigned char key_map[KEYBOARD_SIZE];
 
+typedef struct {
+	unsigned char keycode;
+	unsigned char state;
+} input_event;
+
+input_event saved_key_events[KEY_EVENT_BACKLOG];
+int list_start = 0;
+int list_end = 0;
+
 bool keyboard_grabbed;
 
 extern Display *disp;
@@ -159,16 +170,44 @@
 		ungrabKeyboard();
 }
 
-int checkKeyEvents(unsigned char *result_buf) {
+input_event *nextEventElement(void) {
+	if (list_start == list_end)
+		return NULL;
+	input_event *result = &(saved_key_events[list_start]);
+	list_start = (list_start + 1)%KEY_EVENT_BACKLOG;
+	return result;
+}
+
+void putEventElement(unsigned char keycode, unsigned char state) {
+	int next_index = (list_end + 1)%KEY_EVENT_BACKLOG;
+	if (next_index == list_start)
+		return;
+	saved_key_events[list_end].keycode = keycode;
+	saved_key_events[list_end].state = state;
+	list_end = next_index;
+}
+
+unsigned char getKeycode(XEvent *event) {
+	unsigned char keycode = (unsigned char)((event->xkey.keycode - 8) & 0xff);
+	keycode = key_map[keycode];
+	return keycode;
+}
+
+/*
+ * Class:     org_lwjgl_input_Keyboard
+ * Method:    nPoll
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nPoll
+  (JNIEnv * env, jclass clazz, jint buf)
+{
 	XEvent event;
-	int count = 0;
-	int buf_count = 0;
 	int state;
+	
 	updateKeyboardGrab();
+
 	while (XCheckMaskEvent(disp, KeyPressMask | KeyReleaseMask, &event)) {
-		count++;
-		unsigned char keycode = (unsigned char)((event.xkey.keycode - 8) & 0xff);
-		keycode = key_map[keycode];
+		unsigned char keycode = getKeycode(&event);
 		if (event.type == KeyPress) {
 			state = 1;
 		} else if (event.type == KeyRelease) {
@@ -176,25 +215,8 @@
 		} else
 			assert(0);
 		key_buf[keycode] = state;
-		if (result_buf != NULL) {
-			result_buf[buf_count++] = keycode;
-			result_buf[buf_count++] = state;
-			if (buf_count >= KEYBOARD_BUFFER_SIZE * 2)
-				break;
-		}
+		putEventElement(keycode, state);
 	}
-	return count;
-}
-
-/*
- * Class:     org_lwjgl_input_Keyboard
- * Method:    nPoll
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nPoll
-  (JNIEnv * env, jclass clazz, jint buf)
-{
-	checkKeyEvents(NULL);
 	memcpy((unsigned char*)buf, key_buf, KEYBOARD_SIZE*sizeof(unsigned char));
 }
 
@@ -206,7 +228,40 @@
 JNIEXPORT jint JNICALL Java_org_lwjgl_input_Keyboard_nRead
   (JNIEnv * env, jclass clazz, jint keys)
 {
-	return checkKeyEvents((unsigned char *)keys);
+	XEvent event;
+	int count = 0;
+	int buf_count = 0;
+	int state;
+	input_event *input_ev;
+	unsigned char *result_buf = (unsigned char *)keys;
+
+	updateKeyboardGrab();
+
+	while ((input_ev = nextEventElement()) != NULL) {
+		count++;
+//		printf("Reading a key %d %d count %d\n", (int)input_ev->keycode, (int)input_ev->state, count);
+		result_buf[buf_count++] = input_ev->keycode;
+		result_buf[buf_count++] = input_ev->state;
+		if (buf_count >= KEYBOARD_BUFFER_SIZE * 2)
+			return count;
+	}
+
+	while (XCheckMaskEvent(disp, KeyPressMask | KeyReleaseMask, &event)) {
+		count++;
+		unsigned char keycode = getKeycode(&event);
+		if (event.type == KeyPress) {
+			state = 1;
+		} else if (event.type == KeyRelease) {
+			state = 0;
+		} else
+			assert(0);
+		key_buf[keycode] = state;
+		result_buf[buf_count++] = keycode;
+		result_buf[buf_count++] = state;
+		if (buf_count >= KEYBOARD_BUFFER_SIZE * 2)
+			return count;
+	}
+	return count;
 }
 
 /*

[Java-game-lib-cvs] CVS: LWJGL/src/native/common checkGLerror.h,1.4,1.5

[Caspian Rychlik-P. <ci...@us...>]

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

Modified Files:
	checkGLerror.h 
Log Message:
*** keyword substitution change ***

Index: checkGLerror.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/checkGLerror.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/checkGLerror.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- checkGLerror.h	19 Nov 2002 07:42:54 -0000	1.4
+++ checkGLerror.h	26 Nov 2002 17:34:26 -0000	1.5
@@ -13,6 +13,7 @@
 #ifdef _DEBUG
 
 #include <jni.h>
+#include "extgl.h"
 #include <GL/glu.h>
 
 #define CHECK_GL_ERROR \

[Java-game-lib-cvs] CVS: LWJGL/src/native/linux org_lwjgl_input_Keyboard.cpp,1.6,1.7

[Elias N. <eli...@us...>]

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

Modified Files:
	org_lwjgl_input_Keyboard.cpp 
Log Message:
Reverted the Keyboard.poll() change

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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_input_Keyboard.cpp	25 Nov 2002 22:10:07 -0000	1.6
+++ org_lwjgl_input_Keyboard.cpp	26 Nov 2002 08:15:17 -0000	1.7
@@ -194,7 +194,7 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nPoll
   (JNIEnv * env, jclass clazz, jint buf)
 {
-	//checkKeyEvents(NULL);
+	checkKeyEvents(NULL);
 	memcpy((unsigned char*)buf, key_buf, KEYBOARD_SIZE*sizeof(unsigned char));
 }
 

[Java-game-lib-cvs] CVS: LWJGL/examples/nehe/lesson05 Lesson5.java,1.1,1.2

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson05
In directory sc8-pr-cvs1:/tmp/cvs-serv29914/lesson05

Modified Files:
	Lesson5.java 
Log Message:

now using timers, packages... most packages extend lesson1 or 6-7.
lessons 10-17 will be broken for the rest of the night. going to bed...
They will be done tomarrow =)


Index: Lesson5.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson05/Lesson5.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson05/Lesson5.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Lesson5.java	25 Nov 2002 06:24:09 -0000	1.1
+++ Lesson5.java	26 Nov 2002 07:05:21 -0000	1.2
@@ -29,10 +29,14 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package lesson05;
+
 import org.lwjgl.*;
 import org.lwjgl.opengl.*;
 import org.lwjgl.input.*;
 
+import lesson01.Lesson1;
+
 /**
  * $Id$
  *
@@ -43,13 +47,7 @@
  * @author Luke Holden
  * @version $Revision$
  */
-public class Lesson5 {
-    private GL gl;
-    private GLU glu;
-    
-    private boolean done = false;
-    private boolean fullscreen = true;
-    
+public class Lesson5 extends Lesson1 {
     /* Angle For The Triangle */
     float rtri;
     /* Angle For The Quad */
@@ -60,45 +58,7 @@
 
     }
     
-    private void resizeGLScene(int width, int height) {
-        /* Reset The Current Viewport */
-        gl.viewport(0, 0, width, height);
-        /* Select The Projection Matrix */
-        
-        gl.matrixMode(GL.PROJECTION);
-        /* Reset The Projection Matrix */
-        gl.loadIdentity();
-        
-        /* Calculate The Aspect Ratio Of The Window */
-        glu.perspective(45.0f, ((float) Display.getWidth()) / ((float) Display.getHeight()), 0.1f, 100.0f);
-        
-        /* Select The Modelview Matrix */
-        gl.matrixMode(GL.MODELVIEW);
-        /* Reset The Modelview Matrix */
-        gl.loadIdentity();
-    }
-    
-    private boolean initGL() {    
-        
-        /* Enables Smooth Shading */
-        gl.shadeModel(GL.SMOOTH);
-        
-        /* Black Background */
-        gl.clearColor(0.0f, 0.0f, 0.0f, 0.0f);
-        
-        /* Depth Buffer Setup */
-        gl.clearDepth(1.0f);
-        /* Enables Depth Testing */
-	gl.enable(GL.DEPTH_TEST);
-        /* The Type Of Depth Test To Do */
-	gl.depthFunc(GL.LEQUAL);
-
-        /* Really Nice Perspective Calculations */
-        gl.hint(GL.PERSPECTIVE_CORRECTION_HINT, GL.NICEST);
-        return true;
-    }
-    
-    private boolean drawGLScene() {
+    protected boolean drawGLScene(float frameTime) {
         /* Clear The Screen And The Depth Buffer */
         gl.clear(GL.COLOR_BUFFER_BIT | GL.DEPTH_BUFFER_BIT);
 
@@ -230,72 +190,20 @@
             gl.vertex3f( 1.0f,-1.0f,-1.0f);
         gl.end();
         
-        /* Increase The Rotation Variable For The Triangle */
-        rtri+=0.2f; // (new)
-        /* Decrease The Rotation Variable For The Quad */
-        rquad-=0.15f; // (new)
+        /* Rotate Pyramid 20 pps */
+        rtri += frameTime * 20f;
+        /* Rotate Cube 15 pps  */
+        rquad -= frameTime * 15f;
         
 	return true;
     }
     
-    public void killGLWindow() {
-        Keyboard.destroy();
-        gl.destroy();
-        Display.destroy();
-    }
-    
-    public void createGLWindow(int width, int height, int bits, boolean fullscreenflag) throws Exception {
-        fullscreen = fullscreenflag;
-        try {
-            Display.create(new DisplayMode(width, height, bits, 60), fullscreenflag);
-            gl = new GL(bits, 0, bits, 8);
-            gl.create();
-            glu = new GLU(gl);
-            Keyboard.create();
-            Keyboard.enableBuffer();
-            
-            resizeGLScene(Display.getWidth(), Display.getHeight());
-            
-            initGL();
-        }
-        catch (Exception e) {
-            throw new Exception("Problem initialising Lesson", e);
-        }  
-    }
-    
-    public void start() throws Exception {
-        try {           
-            createGLWindow(640, 480, 16, fullscreen);
-
-            while (!done) {
-                loop();
-            }
-            killGLWindow();
-        }
-        catch (Exception e) {
-            throw new Exception("Problem starting loop", e);
-        }
-    }
-
-    private void loop() {       
-        drawGLScene();
-        gl.swapBuffers();
-
-        /* Keys that have a toggle effect */
-        Keyboard.read();
-        for (int i = 0; i < Keyboard.getNumKeyboardEvents(); i++) {
-            Keyboard.next();
-            if (Keyboard.key == Keyboard.KEY_ESCAPE && Keyboard.state) {
-                done = true;
-            }
-        }
-    }
-    
+     
     public static void main(String[] arguments) {
         int err = 0;
         Lesson5 lesson = new Lesson5();
         try {
-            lesson.start();            
+            lesson.start(640, 480, 16, false);            
         }
         catch (Exception e) {
             err = 1;

[Java-game-lib-cvs] CVS: LWJGL/examples/nehe/lesson01 Lesson1.java,1.2,1.3

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson01
In directory sc8-pr-cvs1:/tmp/cvs-serv29914/lesson01

Modified Files:
	Lesson1.java 
Log Message:

now using timers, packages... most packages extend lesson1 or 6-7.
lessons 10-17 will be broken for the rest of the night. going to bed...
They will be done tomarrow =)


Index: Lesson1.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson01/Lesson1.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson01/Lesson1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Lesson1.java	26 Nov 2002 05:44:49 -0000	1.2
+++ Lesson1.java	26 Nov 2002 07:05:20 -0000	1.3
@@ -49,8 +49,8 @@
     protected GL gl;
     protected GLU glu;
     
-    protected boolean done = false;
     protected boolean fullscreen = true;
+    protected boolean done = false;
     protected long timerRes;
 
     /** Creates a new instance of Lesson */
@@ -127,7 +127,7 @@
         }  
     }
     
-    protected void start() throws Exception {
+    protected void start(int width, int height, int bpp, boolean fullscreen) throws Exception {
         long frameTime = 0;
         
         timerRes = Sys.getTimerResolution();
@@ -136,7 +136,7 @@
         }
         
         try {           
-            createGLWindow(640, 480, 16, fullscreen);
+            createGLWindow(width, height, bpp, fullscreen);
             
             do {
                 /* The frameTime is how much time it takes to draw a single frame.
@@ -187,7 +187,7 @@
         int err = 0;
         Lesson1 lesson = new Lesson1();
         try {
-            lesson.start();            
+            lesson.start(640, 480, 16, false);            
         }
         catch (Exception e) {
             err = 1;

[Java-game-lib-cvs] CVS: LWJGL/examples/nehe/lesson03 Lesson3.java,1.2,1.3

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson03
In directory sc8-pr-cvs1:/tmp/cvs-serv29914/lesson03

Modified Files:
	Lesson3.java 
Log Message:

now using timers, packages... most packages extend lesson1 or 6-7.
lessons 10-17 will be broken for the rest of the night. going to bed...
They will be done tomarrow =)


Index: Lesson3.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson03/Lesson3.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson03/Lesson3.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Lesson3.java	26 Nov 2002 05:51:58 -0000	1.2
+++ Lesson3.java	26 Nov 2002 07:05:21 -0000	1.3
@@ -98,7 +98,7 @@
         int err = 0;
         Lesson3 lesson = new Lesson3();
         try {
-            lesson.start();            
+            lesson.start(640, 480, 16, false);            
         }
         catch (Exception e) {
             err = 1;

[Java-game-lib-cvs] CVS: LWJGL/examples/nehe/lesson04 Lesson4.java,1.2,1.3

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson04
In directory sc8-pr-cvs1:/tmp/cvs-serv29914/lesson04

Modified Files:
	Lesson4.java 
Log Message:

now using timers, packages... most packages extend lesson1 or 6-7.
lessons 10-17 will be broken for the rest of the night. going to bed...
They will be done tomarrow =)


Index: Lesson4.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson04/Lesson4.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson04/Lesson4.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Lesson4.java	26 Nov 2002 05:56:01 -0000	1.2
+++ Lesson4.java	26 Nov 2002 07:05:21 -0000	1.3
@@ -114,7 +114,7 @@
         int err = 0;
         Lesson4 lesson = new Lesson4();
         try {
-            lesson.start();            
+            lesson.start(640, 480, 16, false);            
         }
         catch (Exception e) {
             err = 1;

[Java-game-lib-cvs] CVS: LWJGL/examples/nehe/lesson02 Lesson2.java,1.2,1.3

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson02
In directory sc8-pr-cvs1:/tmp/cvs-serv29914/lesson02

Modified Files:
	Lesson2.java 
Log Message:

now using timers, packages... most packages extend lesson1 or 6-7.
lessons 10-17 will be broken for the rest of the night. going to bed...
They will be done tomarrow =)


Index: Lesson2.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson02/Lesson2.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson02/Lesson2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Lesson2.java	26 Nov 2002 05:49:25 -0000	1.2
+++ Lesson2.java	26 Nov 2002 07:05:20 -0000	1.3
@@ -94,7 +94,7 @@
         int err = 0;
         Lesson2 lesson = new Lesson2();
         try {
-            lesson.start();            
+            lesson.start(640, 480, 16, false);            
         }
         catch (Exception e) {
             err = 1;

[Java-game-lib-cvs] CVS: LWJGL/examples/nehe/lesson16 Texture.java,1.1,NONE

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson16
In directory sc8-pr-cvs1:/tmp/cvs-serv29914/lesson16

Removed Files:
	Texture.java 
Log Message:

now using timers, packages... most packages extend lesson1 or 6-7.
lessons 10-17 will be broken for the rest of the night. going to bed...
They will be done tomarrow =)


--- Texture.java DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson16/Texture.java

[Java-game-lib-cvs] CVS: LWJGL/examples/nehe/lesson12 Texture.java,1.1,NONE

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson12
In directory sc8-pr-cvs1:/tmp/cvs-serv29914/lesson12

Removed Files:
	Texture.java 
Log Message:

now using timers, packages... most packages extend lesson1 or 6-7.
lessons 10-17 will be broken for the rest of the night. going to bed...
They will be done tomarrow =)


--- Texture.java DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson12/Texture.java

[Java-game-lib-cvs] CVS: LWJGL/examples/nehe/lesson17 Texture.java,1.1,NONE

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson17
In directory sc8-pr-cvs1:/tmp/cvs-serv29914/lesson17

Removed Files:
	Texture.java 
Log Message:

now using timers, packages... most packages extend lesson1 or 6-7.
lessons 10-17 will be broken for the rest of the night. going to bed...
They will be done tomarrow =)


--- Texture.java DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson17/Texture.java

[Java-game-lib-cvs] CVS: LWJGL/examples/nehe/lesson11 Texture.java,1.1,NONE

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson11
In directory sc8-pr-cvs1:/tmp/cvs-serv29914/lesson11

Removed Files:
	Texture.java 
Log Message:

now using timers, packages... most packages extend lesson1 or 6-7.
lessons 10-17 will be broken for the rest of the night. going to bed...
They will be done tomarrow =)


--- Texture.java DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson11/Texture.java

[Java-game-lib-cvs] CVS: LWJGL/examples/nehe/lesson10 Lesson10.java,1.1,1.2 Texture.java,1.1,NONE

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson10
In directory sc8-pr-cvs1:/tmp/cvs-serv29914/lesson10

Modified Files:
	Lesson10.java 
Removed Files:
	Texture.java 
Log Message:

now using timers, packages... most packages extend lesson1 or 6-7.
lessons 10-17 will be broken for the rest of the night. going to bed...
They will be done tomarrow =)


Index: Lesson10.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson10/Lesson10.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson10/Lesson10.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Lesson10.java	25 Nov 2002 06:53:09 -0000	1.1
+++ Lesson10.java	26 Nov 2002 07:05:22 -0000	1.2
@@ -29,6 +29,8 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package lesson10;
+
 import java.nio.*;
 import java.io.*;
 import java.awt.image.BufferedImage;
@@ -40,23 +42,20 @@
 import org.lwjgl.opengl.*;
 import org.lwjgl.input.*;
 
+import lesson06.Texture;
+import lesson07.Lesson7;
+
 /**
  * $Id$
  *
  * Loading And Moving Through A 3D World
  *
- * Credit goes to Lionel Brits (ßetelgeuse) and Jeff Molofee (NeHe) whos tutorial this is based on
+ * Credit goes to Lionel Brits (?etelgeuse) and Jeff Molofee (NeHe) whos tutorial this is based on
  *
  * @author Luke Holden
  * @version $Revision$
  */
-public class Lesson10 {
-    private GL gl;
-    private GLU glu;
-    
-    private boolean done = false;
-    private boolean fullscreen = true;
-    
+public class Lesson10 extends Lesson7 {
     /* Blending OFF/ON? */
     private boolean blend;
     
@@ -152,32 +151,7 @@
             throw new Exception("Problem setting up the world", e);
         }
     }
-    
-    /* A javafied version of AUX_RGBImageRec *LoadBMP(char*); */
-    private Texture loadImage(String filename) throws Exception {
-        Texture texture = null;
-        BufferedImage tmpImg = null;
-        
-        /* normally I would use StringUtils.isValid(String) from the 
-           jakarta commons lib, but thats beyond the scope of this lesson */
-        if ((filename != null) && (filename.trim() != "")) {
-            try {
-                InputStream is = getClass().getResourceAsStream(filename);
-                tmpImg = (BufferedImage) ImageIO.read(is);
-                if (tmpImg == null) {
-                    throw new Exception("Error: Got null from ImageIO.read()");
-                }
-                texture = new Texture(tmpImg);
-            }
-            catch ( Exception e ) {
-                throw new Exception("Problem loading bitmap", e);
-            }
-        } else {
-            throw new Exception("Error: file name is not valid!");
-        }
-        return texture;
-    }
-    
+       
     /* Load Bitmaps And Convert To Textures */
     private void loadGLTextures() throws Exception {
         /* Create Storage Space For The Texture */

--- Texture.java DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson10/Texture.java

[Java-game-lib-cvs] CVS: LWJGL/examples/nehe/lesson09 Lesson9.java,1.1,1.2 Texture.java,1.1,NONE

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson09
In directory sc8-pr-cvs1:/tmp/cvs-serv29914/lesson09

Modified Files:
	Lesson9.java 
Removed Files:
	Texture.java 
Log Message:

now using timers, packages... most packages extend lesson1 or 6-7.
lessons 10-17 will be broken for the rest of the night. going to bed...
They will be done tomarrow =)


Index: Lesson9.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson09/Lesson9.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson09/Lesson9.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Lesson9.java	25 Nov 2002 06:53:08 -0000	1.1
+++ Lesson9.java	26 Nov 2002 07:05:22 -0000	1.2
@@ -29,6 +29,8 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package lesson09;
+
 import java.nio.*;
 import java.io.*;
 import java.awt.image.BufferedImage;
@@ -40,6 +42,8 @@
 import org.lwjgl.opengl.*;
 import org.lwjgl.input.*;
 
+import lesson06.*;
+
 /**
  * $Id$
  *
@@ -50,17 +54,12 @@
  * @author Luke Holden
  * @version $Revision$
  */
-public class Lesson9 {
+public class Lesson9 extends Lesson6 {
    /* Number Of Stars To Draw */
     public static int NUM = 50;
 
-    private GL gl;
-    private GLU glu;
     private Random rand = new Random();
-    
-    private boolean done = false;
-    private boolean fullscreen = true;
-    
+        
     /* Twinkling Stars */
     private boolean twinkle = false;
       
@@ -92,33 +91,8 @@
 
     }
     
-    /* A javafied version of AUX_RGBImageRec *LoadBMP(char*); */
-    private Texture loadImage(String filename) throws Exception {
-        Texture texture = null;
-        BufferedImage tmpImg = null;
-        
-        /* normally I would use StringUtils.isValid(String) from the 
-           jakarta commons lib, but thats beyond the scope of this lesson */
-        if ((filename != null) && (filename.trim() != "")) {
-            try {
-                InputStream is = getClass().getResourceAsStream(filename);
-                tmpImg = (BufferedImage) ImageIO.read(is);
-                if (tmpImg == null) {
-                    throw new Exception("Error: Got null from ImageIO.read()");
-                }
-                texture = new Texture(tmpImg);
-            }
-            catch ( Exception e ) {
-                throw new Exception("Problem loading bitmap", e);
-            }
-        } else {
-            throw new Exception("Error: file name is not valid!");
-        }
-        return texture;
-    }
-    
     /* Load Bitmaps And Convert To Textures */
-    private void loadGLTextures() throws Exception {
+    protected void loadGLTextures() throws Exception {
         /* Create Storage Space For The Texture */
         Texture[] textureImage = new Texture[1];
         
@@ -152,42 +126,16 @@
         }
     }
     
-    private void resizeGLScene(int width, int height) {
-        /* Reset The Current Viewport */
-        gl.viewport(0, 0, width, height);
-        /* Select The Projection Matrix */
-        
-        gl.matrixMode(GL.PROJECTION);
-        /* Reset The Projection Matrix */
-        gl.loadIdentity();
-        
-        /* Calculate The Aspect Ratio Of The Window */
-        glu.perspective(45.0f, ((float) Display.getWidth()) / ((float) Display.getHeight()), 0.1f, 100.0f);
-        
-        /* Select The Modelview Matrix */
-        gl.matrixMode(GL.MODELVIEW);
-        /* Reset The Modelview Matrix */
-        gl.loadIdentity();
-    }
     
-    private void initGL() throws Exception {
+    protected void initGL() throws Exception {
         try {
-            loadGLTextures();
-            /* Enable Texture Mapping */
-            gl.enable(GL.TEXTURE_2D);
-            /* Enables Smooth Shading */
-            gl.shadeModel(GL.SMOOTH);
-            /* Black Background */
-            gl.clearColor(0.0f, 0.0f, 0.0f, 0.5f);
-            /* Depth Buffer Setup */
-            gl.clearDepth(1.0f);
-            /* Really Nice Perspective Calculations */
-            gl.hint(GL.PERSPECTIVE_CORRECTION_HINT, GL.NICEST);
+            super.initGL();
+
             /* Blending Function For Translucency Based On Source Alpha Value */
             gl.blendFunc(GL.SRC_ALPHA, GL.ONE);
             /* Enable Blending */
             gl.enable(GL.BLEND);
-            
+
             /* Create A Loop That Goes Through All The Stars */
             for (curStar = 0; curStar < NUM; curStar++) {
                 star[curStar] = new Stars();
@@ -205,7 +153,7 @@
         }
     }
     
-    private boolean drawGLScene() {
+    protected boolean drawGLScene(float frameTime) {
         /* Clear The Screen And The Depth Buffer */
         gl.clear(GL.COLOR_BUFFER_BIT | GL.DEPTH_BUFFER_BIT);
         /* Select our Texture */
@@ -262,11 +210,11 @@
             gl.end();
 
             /* Used To Spin The Stars */
-            spin+=0.01f;
+            spin+=frameTime * 2f;
             /* Changes The Angle Of A Star */
-            star[curStar].angle += ((float)curStar)/NUM;
+            star[curStar].angle += frameTime * ((float)curStar)/NUM * 300 ;
             /* Changes The Distance Of A Star */
-            star[curStar].dist -= 0.01f;
+            star[curStar].dist -= frameTime * 0.4f;
             
             /* Is The Star In The Middle Yet */
             if (star[curStar].dist < 0.0f) {
@@ -281,62 +229,21 @@
 	return true;
     }
     
-    public void killGLWindow() {
-        Keyboard.destroy();
-        gl.destroy();
-        Display.destroy();
-    }
-    
-    public void createGLWindow(int width, int height, int bits, boolean fullscreenflag) throws Exception {
-        fullscreen = fullscreenflag;
-        try {
-            Display.create(new DisplayMode(width, height, bits, 60), fullscreenflag);
-            gl = new GL(bits, 0, bits, 8);
-            gl.create();
-            glu = new GLU(gl);
-            Keyboard.create();
-            Keyboard.enableBuffer();
-            
-            resizeGLScene(Display.getWidth(), Display.getHeight());
-            
-            initGL();
-        }
-        catch (Exception e) {
-            throw new Exception("Problem initialising Lesson", e);
-        }  
-    }
-    
-    public void start() throws Exception {
-        try {           
-            createGLWindow(640, 480, 16, fullscreen);
-
-            while (!done) {
-                loop();
-            }
-            killGLWindow();
-        }
-        catch (Exception e) {
-            throw new Exception("Problem starting loop", e);
-        }
-    }
-
-    private void loop() {       
-        drawGLScene();
-        gl.swapBuffers();
 
+    protected void input(float frameTime) {  
         /* Keys that have a constant effect */
         Keyboard.poll();
         if (Keyboard.isKeyDown(Keyboard.KEY_UP)) {
-            tilt -= 0.5f;
+            tilt -= frameTime * 20f;
         }
         if (Keyboard.isKeyDown(Keyboard.KEY_DOWN)) {
-            tilt += 0.5f;
+            tilt += frameTime * 20f;
         }
         if (Keyboard.isKeyDown(Keyboard.KEY_PRIOR)) {
-            zoom -= 0.2f;
+            zoom -= frameTime * 10f;
         }
         if (Keyboard.isKeyDown(Keyboard.KEY_NEXT)) {
-            zoom += 0.2f;
+            zoom += frameTime * 10f;
         }
 
         
@@ -353,18 +260,11 @@
         }
     }
     
-    private IntBuffer createIntBuffer(int size) {
-        ByteBuffer temp = ByteBuffer.allocateDirect(4 * size);
-        temp.order(ByteOrder.nativeOrder());
-        
-        return temp.asIntBuffer();
-    }
-    
     public static void main(String[] arguments) {
         int err = 0;
         Lesson9 lesson = new Lesson9();
         try {
-            lesson.start();            
+            lesson.start(640, 480, 16, false);            
         }
         catch (Exception e) {
             err = 1;

--- Texture.java DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson09/Texture.java

[Java-game-lib-cvs] CVS: LWJGL/examples/nehe/lesson08 Lesson8.java,1.1,1.2 Texture.java,1.1,NONE

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson08
In directory sc8-pr-cvs1:/tmp/cvs-serv29914/lesson08

Modified Files:
	Lesson8.java 
Removed Files:
	Texture.java 
Log Message:

now using timers, packages... most packages extend lesson1 or 6-7.
lessons 10-17 will be broken for the rest of the night. going to bed...
They will be done tomarrow =)


Index: Lesson8.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson08/Lesson8.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson08/Lesson8.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Lesson8.java	25 Nov 2002 06:53:08 -0000	1.1
+++ Lesson8.java	26 Nov 2002 07:05:22 -0000	1.2
@@ -29,6 +29,8 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package lesson08;
+
 import java.nio.*;
 import java.io.*;
 import java.awt.image.BufferedImage;
@@ -39,6 +41,9 @@
 import org.lwjgl.opengl.*;
 import org.lwjgl.input.*;
 
+import lesson06.Texture;
+import lesson07.Lesson7;
+
 /**
  * $Id$
  *
@@ -49,13 +54,7 @@
  * @author Luke Holden
  * @version $Revision$
  */
-public class Lesson8 {
-    private GL gl;
-    private GLU glu;
-    
-    private boolean done = false;
-    private boolean fullscreen = true;
-    
+public class Lesson8 extends Lesson7 {
     /* Lighting ON / OFF */
     private boolean light;
     /* Blending OFF/ON? ( NEW ) */
@@ -84,33 +83,9 @@
 
     }
     
-    /* A javafied version of AUX_RGBImageRec *LoadBMP(char*); */
-    private Texture loadImage(String filename) throws Exception {
-        Texture texture = null;
-        BufferedImage tmpImg = null;
-        
-        /* normally I would use StringUtils.isValid(String) from the 
-           jakarta commons lib, but thats beyond the scope of this lesson */
-        if ((filename != null) && (filename.trim() != "")) {
-            try {
-                InputStream is = getClass().getResourceAsStream(filename);
-                tmpImg = (BufferedImage) ImageIO.read(is);
-                if (tmpImg == null) {
-                    throw new Exception("Error: Got null from ImageIO.read()");
-                }
-                texture = new Texture(tmpImg);
-            }
-            catch ( Exception e ) {
-                throw new Exception("Problem loading bitmap", e);
-            }
-        } else {
-            throw new Exception("Error: file name is not valid!");
-        }
-        return texture;
-    }
     
     /* Load Bitmaps And Convert To Textures */
-    private void loadGLTextures() throws Exception {
+    protected void loadGLTextures() throws Exception {
         /* Create Storage Space For The Texture */
         Texture[] textureImage = new Texture[1];
         
@@ -171,50 +146,10 @@
     }
     
     
-    private void resizeGLScene(int width, int height) {
-        /* Reset The Current Viewport */
-        gl.viewport(0, 0, width, height);
-        /* Select The Projection Matrix */
-        
-        gl.matrixMode(GL.PROJECTION);
-        /* Reset The Projection Matrix */
-        gl.loadIdentity();
-        
-        /* Calculate The Aspect Ratio Of The Window */
-        glu.perspective(45.0f, ((float) Display.getWidth()) / ((float) Display.getHeight()), 0.1f, 100.0f);
-        
-        /* Select The Modelview Matrix */
-        gl.matrixMode(GL.MODELVIEW);
-        /* Reset The Modelview Matrix */
-        gl.loadIdentity();
-    }
-    
-    private void initGL() throws Exception{    
+    protected void initGL() throws Exception{    
         /* Jump To Texture Loading Routine */
         try {
-            loadGLTextures();
-            /* Enable Texture Mapping */
-            gl.enable(GL.TEXTURE_2D);
-            /* Enables Smooth Shading */
-            gl.shadeModel(GL.SMOOTH);
-            /* Black Background */
-            gl.clearColor(0.0f, 0.0f, 0.0f, 0.5f);
-            /* Depth Buffer Setup */
-            gl.clearDepth(1.0f);
-            /* Enables Depth Testing */
-            gl.enable(GL.DEPTH_TEST);
-            /* The Type Of Depth Test To Do */
-            gl.depthFunc(GL.LEQUAL);
-            /* Really Nice Perspective Calculations */
-            gl.hint(GL.PERSPECTIVE_CORRECTION_HINT, GL.NICEST);
-            
-            /* Setup The Ambient Light */
-            gl.lightfv(GL.LIGHT1, GL.AMBIENT, Sys.getDirectBufferAddress(lightAmbient));
-            /* Setup The Diffuse Light */
-            gl.lightfv(GL.LIGHT1, GL.DIFFUSE, Sys.getDirectBufferAddress(lightDiffuse));
-            /* Position The Light */
-            gl.lightfv(GL.LIGHT1, GL.POSITION, Sys.getDirectBufferAddress(lightPosition));            
-            gl.enable(GL.LIGHT1);
+            super.initGL();
             
             /* Full Brightness, 50% Alpha ( NEW ) */
             gl.color4f(1.0f,1.0f,1.0f,0.5f);
@@ -227,7 +162,7 @@
         }
     }
     
-    private boolean drawGLScene() {
+    protected boolean drawGLScene(float frameTime) {
         /* Clear The Screen And The Depth Buffer */
         gl.clear(GL.COLOR_BUFFER_BIT | GL.DEPTH_BUFFER_BIT);
         
@@ -317,75 +252,34 @@
 	gl.end();
 
         /* X Axis Rotation */
-        xrot+=xspeed;
+        xrot+=frameTime * xspeed;
         /* Y Axis Rotation */
-        yrot+=yspeed;
+        yrot+=frameTime * yspeed;
         
 	return true;
     }
-    
-    public void killGLWindow() {
-        Keyboard.destroy();
-        gl.destroy();
-        Display.destroy();
-    }
-    
-    public void createGLWindow(int width, int height, int bits, boolean fullscreenflag) throws Exception {
-        fullscreen = fullscreenflag;
-        try {
-            Display.create(new DisplayMode(width, height, bits, 60), fullscreenflag);
-            gl = new GL(bits, 0, bits, 8);
-            gl.create();
-            glu = new GLU(gl);
-            Keyboard.create();
-            Keyboard.enableBuffer();
-            
-            resizeGLScene(Display.getWidth(), Display.getHeight());
-            
-            initGL();
-        }
-        catch (Exception e) {
-            throw new Exception("Problem initialising Lesson", e);
-        }  
-    }
-    
-    public void start() throws Exception {
-        try {           
-            createGLWindow(640, 480, 16, fullscreen);
-
-            while (!done) {
-                loop();
-            }
-            killGLWindow();
-        }
-        catch (Exception e) {
-            throw new Exception("Problem starting loop", e);
-        }
-    }
 
-    private void loop() {
-        drawGLScene();
-        gl.swapBuffers();
+    protected void input(float frameTime) {
         
         /* Keys that have a constant effect */
         Keyboard.poll();
         if (Keyboard.isKeyDown(Keyboard.KEY_PRIOR)) {
-            z-=0.02f;
+            z-=frameTime * 10f;
         }
         if (Keyboard.isKeyDown(Keyboard.KEY_NEXT)) {
-            z+=0.02f;
+            z+=frameTime * 10f;
         }
         if (Keyboard.isKeyDown(Keyboard.KEY_UP)) {
-            xspeed-=0.01f;
+            xspeed-=frameTime * 20f;
         }
         if (Keyboard.isKeyDown(Keyboard.KEY_DOWN)) {
-            xspeed+=0.01f;
+            xspeed+=frameTime * 20f;
         }
         if (Keyboard.isKeyDown(Keyboard.KEY_RIGHT)) {
-            yspeed+=0.01f;
+            yspeed+=frameTime * 20f;
         }
         if (Keyboard.isKeyDown(Keyboard.KEY_LEFT)) {
-            yspeed-=0.01f;
+            yspeed-=frameTime * 20f;
         }
         
         /* Keys that have a toggle effect */
@@ -395,20 +289,7 @@
             if (Keyboard.key == Keyboard.KEY_ESCAPE && Keyboard.state) {
                 done = true;
             }
-//            /* F1 switch between fullscreen/windowed is buggy...
-//             * So for now, we are leaving this ability disabled */            
-//            if (Keyboard.key == Keyboard.KEY_F1 && Keyboard.state) {
-//                try {
-//                    killGLWindow();
-//                    fullscreen=!fullscreen;
-//                    createGLWindow(640, 480, 16, fullscreen);
-//                }
-//                catch (Exception e) {
-//                    /* We dont want to put exceptions into our loop... so */
-//                    e.printStackTrace();
-//                    System.exit(1);
-//                }
-//            }
+
             if (Keyboard.key == Keyboard.KEY_L && Keyboard.state) {
                 light=!light;
                 if (!light) {
@@ -443,25 +324,11 @@
         }
     }
     
-    private IntBuffer createIntBuffer(int size) {
-        ByteBuffer temp = ByteBuffer.allocateDirect(4 * size);
-        temp.order(ByteOrder.nativeOrder());
-        
-        return temp.asIntBuffer();
-    }
-    
-    private FloatBuffer createFloatBuffer(int size) {
-        ByteBuffer temp = ByteBuffer.allocateDirect(4 * size);
-        temp.order(ByteOrder.nativeOrder());
-        
-        return temp.asFloatBuffer();
-    }
-    
     public static void main(String[] arguments) {
         int err = 0;
         Lesson8 lesson = new Lesson8();
         try {
-            lesson.start();
+            lesson.start(640, 480, 16, false);
         }
         catch (Exception e) {
             err = 1;

--- Texture.java DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson08/Texture.java

[Java-game-lib-cvs] CVS: LWJGL/examples/nehe/lesson07 Lesson7.java,1.1,1.2 Texture.java,1.1,NONE

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson07
In directory sc8-pr-cvs1:/tmp/cvs-serv29914/lesson07

Modified Files:
	Lesson7.java 
Removed Files:
	Texture.java 
Log Message:

now using timers, packages... most packages extend lesson1 or 6-7.
lessons 10-17 will be broken for the rest of the night. going to bed...
They will be done tomarrow =)


Index: Lesson7.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson07/Lesson7.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson07/Lesson7.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Lesson7.java	25 Nov 2002 06:53:08 -0000	1.1
+++ Lesson7.java	26 Nov 2002 07:05:21 -0000	1.2
@@ -29,6 +29,8 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package lesson07;
+
 import java.nio.*;
 import java.io.*;
 import java.awt.image.BufferedImage;
@@ -39,6 +41,8 @@
 import org.lwjgl.opengl.*;
 import org.lwjgl.input.*;
 
+import lesson06.*;
+
 /**
  * $Id$
  *
@@ -49,13 +53,8 @@
  * @author Luke Holden
  * @version $Revision$
  */
-public class Lesson7 {
-    private GL gl;
-    private GLU glu;
-    
-    private boolean done = false;
-    private boolean fullscreen = true;
-    
+public class Lesson7 extends Lesson6 {
+    protected boolean fullscreen = false;
     /* Lighting ON / OFF */
     private boolean light;
     
@@ -81,34 +80,9 @@
     public Lesson7() {
 
     }
-    
-    /* A javafied version of AUX_RGBImageRec *LoadBMP(char*); */
-    private Texture loadImage(String filename) throws Exception {
-        Texture texture = null;
-        BufferedImage tmpImg = null;
         
-        /* normally I would use StringUtils.isValid(String) from the 
-           jakarta commons lib, but thats beyond the scope of this lesson */
-        if ((filename != null) && (filename.trim() != "")) {
-            try {
-                InputStream is = getClass().getResourceAsStream(filename);
-                tmpImg = (BufferedImage) ImageIO.read(is);
-                if (tmpImg == null) {
-                    throw new Exception("Error: Got null from ImageIO.read()");
-                }
-                texture = new Texture(tmpImg);
-            }
-            catch ( Exception e ) {
-                throw new Exception("Problem loading bitmap", e);
-            }
-        } else {
-            throw new Exception("Error: file name is not valid!");
-        }
-        return texture;
-    }
-    
     /* Load Bitmaps And Convert To Textures */
-    private void loadGLTextures() throws Exception {
+    protected void loadGLTextures() throws Exception {
         /* Create Storage Space For The Texture */
         Texture[] textureImage = new Texture[1];
         
@@ -168,43 +142,12 @@
         }
     }
     
+
     
-    private void resizeGLScene(int width, int height) {
-        /* Reset The Current Viewport */
-        gl.viewport(0, 0, width, height);
-        /* Select The Projection Matrix */
-        
-        gl.matrixMode(GL.PROJECTION);
-        /* Reset The Projection Matrix */
-        gl.loadIdentity();
-        
-        /* Calculate The Aspect Ratio Of The Window */
-        glu.perspective(45.0f, ((float) Display.getWidth()) / ((float) Display.getHeight()), 0.1f, 100.0f);
-        
-        /* Select The Modelview Matrix */
-        gl.matrixMode(GL.MODELVIEW);
-        /* Reset The Modelview Matrix */
-        gl.loadIdentity();
-    }
-    
-    private void initGL() throws Exception{    
+    protected void initGL() throws Exception{    
         /* Jump To Texture Loading Routine */
         try {
-            loadGLTextures();
-            /* Enable Texture Mapping ( NEW ) */
-            gl.enable(GL.TEXTURE_2D);
-            /* Enables Smooth Shading */
-            gl.shadeModel(GL.SMOOTH);
-            /* Black Background */
-            gl.clearColor(0.0f, 0.0f, 0.0f, 0.5f);
-            /* Depth Buffer Setup */
-            gl.clearDepth(1.0f);
-            /* Enables Depth Testing */
-            gl.enable(GL.DEPTH_TEST);
-            /* The Type Of Depth Test To Do */
-            gl.depthFunc(GL.LEQUAL);
-            /* Really Nice Perspective Calculations */
-            gl.hint(GL.PERSPECTIVE_CORRECTION_HINT, GL.NICEST);
+            super.initGL();
             
             /* Setup The Ambient Light */
             gl.lightfv(GL.LIGHT1, GL.AMBIENT, Sys.getDirectBufferAddress(lightAmbient));
@@ -221,7 +164,7 @@
         }
     }
     
-    private boolean drawGLScene() {
+    protected boolean drawGLScene(float frameTime) {
         /* Clear The Screen And The Depth Buffer */
         gl.clear(GL.COLOR_BUFFER_BIT | GL.DEPTH_BUFFER_BIT);
         
@@ -311,75 +254,34 @@
 	gl.end();
 
         /* X Axis Rotation */
-        xrot+=xspeed;
+        xrot+=frameTime * xspeed;
         /* Y Axis Rotation */
-        yrot+=yspeed;
+        yrot+=frameTime * yspeed;
         
 	return true;
     }
-    
-    public void killGLWindow() {
-        Keyboard.destroy();
-        gl.destroy();
-        Display.destroy();
-    }
-    
-    public void createGLWindow(int width, int height, int bits, boolean fullscreenflag) throws Exception {
-        fullscreen = fullscreenflag;
-        try {
-            Display.create(new DisplayMode(width, height, bits, 60), fullscreenflag);
-            gl = new GL(bits, 0, bits, 8);
-            gl.create();
-            glu = new GLU(gl);
-            Keyboard.create();
-            Keyboard.enableBuffer();
-            
-            resizeGLScene(Display.getWidth(), Display.getHeight());
-            
-            initGL();
-        }
-        catch (Exception e) {
-            throw new Exception("Problem initialising Lesson", e);
-        }  
-    }
-    
-    public void start() throws Exception {
-        try {           
-            createGLWindow(640, 480, 16, fullscreen);
 
-            while (!done) {
-                loop();
-            }
-            killGLWindow();
-        }
-        catch (Exception e) {
-            throw new Exception("Problem starting loop", e);
-        }
-    }
 
-    private void loop() {
-        drawGLScene();
-        gl.swapBuffers();
-        
+    protected void input(float frameTime) {    
         /* Keys that have a constant effect */
         Keyboard.poll();
         if (Keyboard.isKeyDown(Keyboard.KEY_PRIOR)) {
-            z-=0.02f;
+            z-=frameTime * 10f;
         }
         if (Keyboard.isKeyDown(Keyboard.KEY_NEXT)) {
-            z+=0.02f;
+            z+=frameTime * 10f;
         }
         if (Keyboard.isKeyDown(Keyboard.KEY_UP)) {
-            xspeed-=0.01f;
+            xspeed-=frameTime * 20f;
         }
         if (Keyboard.isKeyDown(Keyboard.KEY_DOWN)) {
-            xspeed+=0.01f;
+            xspeed+=frameTime * 20f;
         }
         if (Keyboard.isKeyDown(Keyboard.KEY_RIGHT)) {
-            yspeed+=0.01f;
+            yspeed+=frameTime * 20f;
         }
         if (Keyboard.isKeyDown(Keyboard.KEY_LEFT)) {
-            yspeed-=0.01f;
+            yspeed-=frameTime * 20f;
         }
         
         /* Keys that have a toggle effect */
@@ -403,7 +305,8 @@
 //                    System.exit(1);
 //                }
 //            }
-            if (Keyboard.key == Keyboard.KEY_L && Keyboard.state) {
+            
+            if (Keyboard.key == Keyboard.KEY_L && !Keyboard.state) {
                 light=!light;
                 if (!light) {
                     gl.disable(GL.LIGHTING);
@@ -421,14 +324,7 @@
         }
     }
     
-    private IntBuffer createIntBuffer(int size) {
-        ByteBuffer temp = ByteBuffer.allocateDirect(4 * size);
-        temp.order(ByteOrder.nativeOrder());
-        
-        return temp.asIntBuffer();
-    }
-    
-    private FloatBuffer createFloatBuffer(int size) {
+    public FloatBuffer createFloatBuffer(int size) {
         ByteBuffer temp = ByteBuffer.allocateDirect(4 * size);
         temp.order(ByteOrder.nativeOrder());
         
@@ -439,7 +335,7 @@
         int err = 0;
         Lesson7 lesson = new Lesson7();
         try {
-            lesson.start();
+            lesson.start(640, 480, 16, false);
         }
         catch (Exception e) {
             err = 1;

--- Texture.java DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson07/Texture.java

[Java-game-lib-cvs] CVS: LWJGL/examples/nehe/lesson06 Lesson6.java,1.3,1.4

[Luke H. <lh...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson06
In directory sc8-pr-cvs1:/tmp/cvs-serv29914/lesson06

Modified Files:
	Lesson6.java 
Log Message:

now using timers, packages... most packages extend lesson1 or 6-7.
lessons 10-17 will be broken for the rest of the night. going to bed...
They will be done tomarrow =)


Index: Lesson6.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/nehe/lesson06/Lesson6.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/nehe/lesson06/Lesson6.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Lesson6.java	26 Nov 2002 06:03:44 -0000	1.3
+++ Lesson6.java	26 Nov 2002 07:05:21 -0000	1.4
@@ -90,7 +90,7 @@
     }
     
     /* Load Bitmaps And Convert To Textures */
-    private void loadGLTextures() throws Exception {
+    protected void loadGLTextures() throws Exception {
         /* Create Storage Space For The Texture */
         Texture[] textureImage = new Texture[1];
         
@@ -245,7 +245,7 @@
         int err = 0;
         Lesson6 lesson = new Lesson6();
         try {
-            lesson.start();            
+            lesson.start(640, 480, 16, false);            
         }
         catch (Exception e) {
             err = 1;