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

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

Modified Files:
	Joystick.java 
Log Message:
beautification

Index: Joystick.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Joystick.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Joystick.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Joystick.java	18 Nov 2002 17:50:10 -0000	1.9
+++ Joystick.java	15 Dec 2002 22:24:48 -0000	1.10
@@ -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.input;
 
 import org.lwjgl.Sys;
@@ -57,51 +57,51 @@
 	static {
 		initialize();
 	}
-	
+
 	/** Has the joystick been created? */
 	private static boolean created;
-	
+
 	/** The joystick buttons status */
 	private static boolean[] buttons;
-	
+
 	/** X position, range -1000 to 1000 */
 	public static int x = -1;
-	
+
 	/** Y position, range -1000 to 1000 */
 	public static int y = -1;
-	
+
 	/** Z position, range -1000 to 1000 */
 	public static int z = -1;
-    
-    /** Position of Point of View from -1 to 27000 (360 degrees) */
-    public static int pov;
-    
-    /** Constant specifying centered POV */
-    public static final int POV_CENTER  = -1;
 
-    /** Constant specifying nortward POV */
-    public static final int POV_NORTH   = 0;
+	/** Position of Point of View from -1 to 27000 (360 degrees) */
+	public static int pov;
 
-    /** Constant specifying southward POV */
-    public static final int POV_SOUTH   = 18000;
+	/** Constant specifying centered POV */
+	public static final int POV_CENTER = -1;
 
-    /** Constant specifying eastward POV */
-    public static final int POV_EAST    = 27000;
+	/** Constant specifying nortward POV */
+	public static final int POV_NORTH = 0;
+
+	/** Constant specifying southward POV */
+	public static final int POV_SOUTH = 18000;
+
+	/** Constant specifying eastward POV */
+	public static final int POV_EAST = 27000;
+
+	/** Constant specifying westward POV */
+	public static final int POV_WEST = 9000;
+
+	/* Joystick capabilities */
+	public static int buttonCount = -1;
+	public static boolean hasZAxis = false;
+	public static boolean hasPOV = false;
 
-    /** Constant specifying westward POV */
-    public static final int POV_WEST    = 9000;
-    
-    /* Joystick capabilities */
-    public static int buttonCount  = -1;
-    public static boolean hasZAxis = false;
-    public static boolean hasPOV   = false;
-	
 	/**
 	 * Joystick cannot be constructed.
 	 */
 	private Joystick() {
 	}
-	
+
 	/**
 	 * Static initialization
 	 */
@@ -109,7 +109,7 @@
 		System.loadLibrary(Sys.getLibraryName());
 		initIDs();
 	}
-	
+
 	/**
 	 * "Create" the joystick. The display must first have been created.
 	 * @throws Exception if the joystick could not be created for any reason
@@ -117,22 +117,22 @@
 	public static void create() throws Exception {
 		if (created) {
 			return;
-        }
-        
+		}
+
 		if (!nCreate()) {
 			throw new Exception("The joystick could not be created.");
-        }
+		}
 		created = true;
 	}
-	
+
 	/**
 	 * "Destroy" the joystick
 	 */
 	public static void destroy() {
 		if (!created) {
 			return;
-        }
-        
+		}
+
 		created = false;
 		nDestroy();
 	}
@@ -143,8 +143,8 @@
 	public static void poll() {
 		assert created : "The joystick has not been created.";
 		nPoll();
-	}		
-	
+	}
+
 	/**
 	 * See if a particular mouse button is down.
 	 * 
@@ -156,24 +156,24 @@
 		assert created : "The joystick has not been created.";
 		return buttons[button];
 	}
-    
+
 	/**
 	 * Native method to poll the joystick
 	 */
-	private static native void nPoll();    
-    
+	private static native void nPoll();
+
 	/**
 	 * Native method to create the joystick
 	 * 
 	 * @return true if the joystick was created
 	 */
-	private static native boolean nCreate();    
-    
-    /**
-	 * Native method the destroy the joystick
-	 */
+	private static native boolean nCreate();
+
+	/**
+	* Native method the destroy the joystick
+	*/
 	private static native void nDestroy();
-    
+
 	/**
 	 * Register fields with the native library
 	 */

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

Modified Files:
	Sys.java 
Log Message:
Added DEBUG constant

Index: Sys.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/Sys.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Sys.java	18 Oct 2002 23:28:04 -0000	1.11
+++ Sys.java	15 Dec 2002 22:12:46 -0000	1.12
@@ -77,15 +77,25 @@
 	/** The native library name */
 	private static String LIBRARY_NAME;
 	
+	/**
+	 * Debug flag. This will tell you if you are using the debug version of
+	 * the library, and whether assertions are enabled or not.
+	 */
+	public static final boolean DEBUG;
+	
+	private static boolean _debug;
 	static {
 		try {
 			assert false;
 			LIBRARY_NAME = "lwjgl";
+			_debug = false;
 		} catch (AssertionError e) {
 			// Assertions are enabled, so we'll use the debug version of the
 			// library
 			LIBRARY_NAME = "lwjgl_d";
+			_debug = true;
 		} finally {
+			DEBUG = _debug;
 			initialize();
 		}
 	}
@@ -178,5 +188,24 @@
 	 * HIGH_PRIORITY, NORMAL_PRIORITY, or LOW_PRIORITY.
 	 */
 	public static native void setProcessPriority(int priority);
+	
+	/**
+	 * Attempt to display a modal alert to the user. This method should be used
+	 * when a game fails to initialize properly or crashes out losing its display
+	 * in the process. It is provided because AWT may not be available on the target
+	 * platform.
+	 * 
+	 * The alert should display the title and the message and then the current
+	 * thread should block until the user dismisses the alert - typically with an
+	 * OK button click.
+	 * 
+	 * It may be that the user's system has no windowing system installed for some
+	 * reason, in which case this method may do nothing at all, or attempt to provide
+	 * some console output.
+	 *
+	 * @param title The title of the alert. We suggest using the title of your game.
+	 * @param message The message text for the alert.
+	 */
+	public static native void alert(String title, String message);
 		
 } 

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

Modified Files:
	SourceLimitTest.java 
Log Message:
fix: even more beautification!

Index: SourceLimitTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/SourceLimitTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/SourceLimitTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SourceLimitTest.java	15 Dec 2002 22:05:10 -0000	1.2
+++ SourceLimitTest.java	15 Dec 2002 22:09:09 -0000	1.3
@@ -102,7 +102,7 @@
 		//delete sources
 		al.deleteSources(sourcesToCreate, Sys.getDirectBufferAddress(sources));
 
-		System.out.println("successfully created " + sourcesToCreate + " sources!");
+		System.out.println("created " + sourcesToCreate + " sources successfully!");
 	}
 
 	/**
@@ -138,7 +138,7 @@
     if(sourcesCreated != sourcesToCreate) {
       System.out.println("created " + sourcesCreated + " sources before failing");
     } else {
-      System.out.println("created " + sourcesCreated + " sources successfully");
+      System.out.println("created " + sourcesCreated + " sources successfully!");
     }
 	}
 

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

Modified Files:
	SourceLimitTest.java 
Log Message:
fix: small beautification

Index: SourceLimitTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/SourceLimitTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/SourceLimitTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SourceLimitTest.java	15 Dec 2002 22:01:00 -0000	1.1
+++ SourceLimitTest.java	15 Dec 2002 22:05:10 -0000	1.2
@@ -102,7 +102,7 @@
 		//delete sources
 		al.deleteSources(sourcesToCreate, Sys.getDirectBufferAddress(sources));
 
-		System.out.println("successfully created " + sourcesToCreate + "sources!");
+		System.out.println("successfully created " + sourcesToCreate + " sources!");
 	}
 
 	/**

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

Added Files:
	SourceLimitTest.java 
Log Message:
simple test for testing the number of available sources

--- NEW FILE: SourceLimitTest.java ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/SourceLimitTest.java
/*
 * 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.
 */
package org.lwjgl.test.openal;

import org.lwjgl.Sys;
import org.lwjgl.openal.AL;

import java.nio.IntBuffer;

/**
 * $Id: SourceLimitTest.java,v 1.1 2002/12/15 22:01:00 matzon Exp $
 *
 * Simple test for testing the number of available sources
 *
 * @author Brian Matzon <br...@ma...>
 * @version $Revision: 1.1 $
 */
public class SourceLimitTest extends BasicTest {

	/** Sources to create */
	protected int sourcesToCreate = 64;

	/**
	 * Creates an instance of SourceLimitTest
	 */
	public SourceLimitTest() {
		super();
	}

	/**
	 * Runs the actual test, using supplied arguments
	 */
	protected void execute(String[] args) {
		//parse 1st arg to sourcecount
		if (args.length > 0) {
			try {
				sourcesToCreate = Integer.parseInt(args[0]);
			} catch (NumberFormatException nfe) {
				System.out.println(
					"Unable to parse parameter to integer. Defaulting to 64 sources.");
			}
		}

		//initialize AL
		alInitialize();
    
    System.out.print("Creating " + sourcesToCreate + " in one go...");
    CreateAllSources();
    
    System.out.print("Creating " + sourcesToCreate + " one at a time...");
    CreateSourcesStep();

		//shutdown
		alExit();
	}

	/**
	 * Tests the creation of n sources in on go
	 */
	protected void CreateAllSources() {
		int lastError;

		//make bytbuffer that can hold sourcesToCreate sources
		IntBuffer sources = createIntBuffer(sourcesToCreate);

		//Create sourcesToCreate sources in one fell swoop
		al.genSources(sourcesToCreate, Sys.getDirectBufferAddress(sources));
		if ((lastError = al.getError()) != AL.NO_ERROR) {
			System.out.println("failed to create " + sourcesToCreate + " sources");
			return;
		}

		//delete sources
		al.deleteSources(sourcesToCreate, Sys.getDirectBufferAddress(sources));

		System.out.println("successfully created " + sourcesToCreate + "sources!");
	}

	/**
	 * Tests if n sources can be created one at a time
	 */
	protected void CreateSourcesStep() {
		int lastError;
		int sourcesCreated = 0;

		//make bytbuffer that can hold sourcesToCreate sources
		IntBuffer sources = createIntBuffer(sourcesToCreate);

    //create the sources
		for (int i = 0; i < sourcesToCreate; i++) {
			al.genSources(1, Sys.getDirectBufferAddress(sources) + (i * 4));
			if ((lastError = al.getError()) != AL.NO_ERROR) {
				System.out.println("failed to create source: " + (i + 1));
				break;
			}
      sourcesCreated++;
		}

    //delete allocated sources
		for (int i = 0; i < sourcesCreated; i++) {
			//delete buffers and sources
			al.deleteSources(1, Sys.getDirectBufferAddress(sources) + (i * 4));
			if ((lastError = al.getError()) != AL.NO_ERROR) {
				System.out.println("failed to delete source: " + i);
				break;
			}
		}
    
    if(sourcesCreated != sourcesToCreate) {
      System.out.println("created " + sourcesCreated + " sources before failing");
    } else {
      System.out.println("created " + sourcesCreated + " sources successfully");
    }
	}

	/**
	 * main entry point
	 *
	 * @param args String array containing arguments
	 */
	public static void main(String[] args) {
		SourceLimitTest sourceLimitTest = new SourceLimitTest();
		sourceLimitTest.execute(args);
	}
}