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

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

Modified Files:
	org_lwjgl_input_Controller.cpp 
Log Message:
Fixed missing header include

Index: org_lwjgl_input_Controller.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Controller.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Controller.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_input_Controller.cpp	21 Mar 2003 23:28:00 -0000	1.2
+++ org_lwjgl_input_Controller.cpp	7 Apr 2003 17:49:13 -0000	1.3
@@ -38,6 +38,7 @@
  * @version $Revision$
  */
 #include <jni.h>
+#include "org_lwjgl_input_Controller.h"
 
 /**
  * Initializes any field ids

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

Modified Files:
	org_lwjgl_Sys.cpp 
Log Message:


Index: org_lwjgl_Sys.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Sys.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Sys.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_Sys.cpp	7 Apr 2003 17:04:24 -0000	1.6
+++ org_lwjgl_Sys.cpp	7 Apr 2003 17:30:41 -0000	1.7
@@ -43,7 +43,6 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include "org_lwjgl_Sys.h"
-#include <signal.h>
 
 long int		hires_timer_freq;			// Hires timer frequency
 long int		hires_timer_start;			// Hires timer start

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

Modified Files:
	org_lwjgl_Display.cpp org_lwjgl_Sys.cpp 
Log Message:
Added dummy gamma controls to linux

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- org_lwjgl_Display.cpp	30 Mar 2003 19:26:39 -0000	1.32
+++ org_lwjgl_Display.cpp	7 Apr 2003 17:04:23 -0000	1.33
@@ -222,3 +222,25 @@
 {
 	return org_lwjgl_Display_PLATFORM_GLX;
 }
+
+/*
+ * Class:     org_lwjgl_Display
+ * Method:    getGammaRamp
+ * Signature: ()[I
+ */
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_Display_getGammaRamp
+  (JNIEnv * env, jclass clazz, jintArray red, jintArray green, jintArray blue)
+{
+	return false;
+}
+
+/*
+ * Class:     org_lwjgl_Display
+ * Method:    setGammaRamp
+ * Signature: ([I[I[I)V
+ */
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_Display_setGammaRamp
+  (JNIEnv * env, jclass clazz, jintArray red, jintArray green, jintArray blue)
+{
+	return false;
+}

Index: org_lwjgl_Sys.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Sys.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Sys.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_Sys.cpp	3 Apr 2003 20:20:29 -0000	1.5
+++ org_lwjgl_Sys.cpp	7 Apr 2003 17:04:24 -0000	1.6
@@ -43,6 +43,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include "org_lwjgl_Sys.h"
+#include <signal.h>
 
 long int		hires_timer_freq;			// Hires timer frequency
 long int		hires_timer_start;			// Hires timer start

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

Modified Files:
	Controller.java Mouse.java Keyboard.java 
Log Message:
Added some isCreated() methods to input classes and keyboard key name mapping

Index: Controller.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Controller.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Controller.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Controller.java	10 Feb 2003 23:07:12 -0000	1.3
+++ Controller.java	7 Apr 2003 15:21:04 -0000	1.4
@@ -159,6 +159,13 @@
 	}
 
 	/**
+	 * @return true if the controller has been created
+	 */
+	public static boolean isCreated() {
+		return created;
+	}
+
+	/**
 	 * "Destroy" the controller
 	 */
 	public static void destroy() {

Index: Mouse.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Mouse.java	28 Mar 2003 19:00:22 -0000	1.17
+++ Mouse.java	7 Apr 2003 15:21:05 -0000	1.18
@@ -104,9 +104,9 @@
 		if (!nCreate())
 			throw new Exception("The mouse could not be created.");
 		created = true;
-    
-    //set mouse buttons
-    buttons = new boolean[buttonCount];
+
+		//set mouse buttons
+		buttons = new boolean[buttonCount];
 	}
 
 	/**
@@ -117,14 +117,21 @@
 	private static native boolean nCreate();
 
 	/**
+	 * @return true if the mouse has been created
+	 */
+	public static boolean isCreated() {
+		return created;
+	}
+
+	/**
 	 * "Destroy" the mouse
 	 */
 	public static void destroy() {
 		if (!created)
 			return;
 		created = false;
-    buttons = null;
-    
+		buttons = null;
+
 		nDestroy();
 	}
 

Index: Keyboard.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Keyboard.java	28 Mar 2003 19:00:26 -0000	1.18
+++ Keyboard.java	7 Apr 2003 15:21:06 -0000	1.19
@@ -32,6 +32,8 @@
  
 package org.lwjgl.input;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
@@ -184,6 +186,27 @@
 	public static final int KEY_APPS            = 0xDD; /* AppMenu key */
 	public static final int KEY_POWER           = 0xDE;
 	public static final int KEY_SLEEP           = 0xDF;
+	
+	/** Key names */
+	private static final String[] keyName = new String[255];
+	static {
+		// Use reflection to find out key names
+		Field[] field = Keyboard.class.getFields();
+		try {
+			for (int i = 0; i < field.length; i++) {
+				if (Modifier.isStatic(field[i].getModifiers())
+					&& Modifier.isPublic(field[i].getModifiers())
+					&& Modifier.isFinal(field[i].getModifiers())
+					&& field[i].getType() == int.class
+					&& field[i].getName().startsWith("KEY_")) {
+					keyName[field[i].getInt(null)] = field[i].getName().substring(4);
+				}
+
+			}
+		} catch (Exception e) {
+		}
+		
+	}
 
 	/** Has the keyboard been created? */
 	private static boolean created;
@@ -261,6 +284,13 @@
 	private static native boolean nCreate();
 
 	/**
+	 * @return true if the keyboard has been created
+	 */
+	public static boolean isCreated() {
+		return created;
+	}
+
+	/**
 	 * "Destroy" the keyboard
 	 */
 	public static void destroy() {
@@ -355,6 +385,15 @@
 	public static boolean isKeyDown(int key) {
 		assert created : "The keyboard has not been created.";
 		return keyDownBuffer.get(key) != 0;
+	}
+	
+	/**
+	 * Gets a key's name
+	 * @param key The key
+	 * @return a String with the key's human readable name in it or null if the key is unnamed
+	 */
+	public static String getKeyName(int key) {
+		return keyName[key];
 	}
 	
 	/**

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

Modified Files:
	BaseAL.java 
Log Message:
Added some isCreated() methods to input classes and keyboard key name mapping

Index: BaseAL.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/openal/BaseAL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/BaseAL.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- BaseAL.java	24 Mar 2003 11:56:04 -0000	1.7
+++ BaseAL.java	7 Apr 2003 15:21:09 -0000	1.8
@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- package org.lwjgl.openal;
+package org.lwjgl.openal;
 
 import java.io.File;
 import java.util.StringTokenizer;
@@ -49,25 +49,25 @@
 public abstract class BaseAL {
 	/** Has the ALC object been created? */
 	protected static boolean created;
-    
+
 	static {
 		initialize();
 	}
-    
-    /**
+
+	/**
 	 * Override to provide any initialization code after creation.
 	 */
-	protected void init() {
+	protected void init() throws Exception {
 	}
-    
+
 	/**
 	 * Static initialization
 	 */
 	private static void initialize() {
 		System.loadLibrary(org.lwjgl.Sys.getLibraryName());
 	}
-    
-    /**
+
+	/**
 	 * Creates the AL instance
 	 * 
 	 * @throws Exception if a failiure occured in the AL creation process
@@ -83,49 +83,47 @@
 		String libname;
 
 		// libname is hardcoded atm - this will change in a near future...
-		libname = (System.getProperty("os.name").toLowerCase().indexOf("windows") == -1) 
-		        ? "libopenal.so" 
-		        : "OpenAL32.dll";     
+		libname = (System.getProperty("os.name").toLowerCase().indexOf("windows") == -1) ? "libopenal.so" : "OpenAL32.dll";
 
 		StringTokenizer st = new StringTokenizer(libpath, seperator);
-            
+
 		//create needed string array
-		String[] oalPaths = new String[st.countTokens()+1];
+		String[] oalPaths = new String[st.countTokens() + 1];
 
 		//build paths
-		for(int i=0;i<oalPaths.length - 1;i++) {
-			oalPaths[i] = st.nextToken() + File.separator + libname; 
+		for (int i = 0; i < oalPaths.length - 1; i++) {
+			oalPaths[i] = st.nextToken() + File.separator + libname;
 		}
 
 		//add cwd path
-		oalPaths[oalPaths.length-1] = libname;
+		oalPaths[oalPaths.length - 1] = libname;
 		if (!nCreate(oalPaths)) {
 			throw new Exception("AL instance could not be created.");
-                }
+		}
+		init();
 		created = true;
-                init();
 	}
-	
+
 	/**
 	 * Native method to create AL instance
 	 * 
 	 * @return true if the AL creation process succeeded
 	 */
 	protected native boolean nCreate(String[] oalPaths);
-    
+
 	/**
 	 * Calls whatever destruction rutines that are needed
 	 */
 	public void destroy() {
 		if (!created) {
 			return;
-        }
-        created = false;
-        nDestroy();
+		}
+		created = false;
+		nDestroy();
 	}
-	
+
 	/**
 	 * Native method the destroy the AL
 	 */
-	protected native void nDestroy();    
+	protected native void nDestroy();
 }