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

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

Modified Files:
	lwjgl.prjx 
Log Message:
removed SWTCanvas - not part of default
updated to new architecture

Index: lwjgl.prjx
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/platform_build/sharp_develop/lwjgl.prjx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lwjgl.prjx	30 Jun 2004 23:23:50 -0000	1.1
+++ lwjgl.prjx	11 Jul 2004 08:49:32 -0000	1.2
@@ -3,15 +3,14 @@
     <File name=".\win32" subtype="Directory" buildaction="Compile" dependson="" data="" />
     <File name=".\win32\Window.h" subtype="Code" buildaction="Nothing" dependson="" data="" />
     <File name=".\win32\LWJGL.cpp" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\win32\org_lwjgl_Display.cpp" subtype="Code" buildaction="Compile" dependson="" data="" />
+		<File name=".\win32\extgl_wgl.cpp" subtype="Code" buildaction="Compile" dependson="" data="" />
+		<File name=".\win32\display.cpp" subtype="Code" buildaction="Compile" dependson="" data="" />
+    <File name=".\win32\org_lwjgl_opengl_Display.cpp" subtype="Code" buildaction="Compile" dependson="" data="" />
     <File name=".\win32\org_lwjgl_input_Controller.cpp" subtype="Code" buildaction="Compile" dependson="" data="" />
     <File name=".\win32\org_lwjgl_input_Cursor.cpp" subtype="Code" buildaction="Compile" dependson="" data="" />
     <File name=".\win32\org_lwjgl_input_Keyboard.cpp" subtype="Code" buildaction="Compile" dependson="" data="" />
     <File name=".\win32\org_lwjgl_input_Mouse.cpp" subtype="Code" buildaction="Compile" dependson="" data="" />
     <File name=".\win32\org_lwjgl_opengl_Pbuffer.cpp" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\win32\org_lwjgl_opengl_SWTCanvas.cpp" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\win32\org_lwjgl_opengl_SWTCanvas.h" subtype="Code" buildaction="Nothing" dependson="" data="" />
-    <File name=".\win32\org_lwjgl_opengl_Window.cpp" subtype="Code" buildaction="Compile" dependson="" data="" />
     <File name=".\win32\org_lwjgl_Sys.cpp" subtype="Code" buildaction="Compile" dependson="" data="" />
     <File name=".\common" subtype="Directory" buildaction="Compile" dependson="" data="" />
     <File name=".\common\org_lwjgl_Sys.h" subtype="Code" buildaction="Nothing" dependson="" data="" />

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/examples/spaceinvaders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27706/src/java/org/lwjgl/examples/spaceinvaders

Modified Files:
	Game.java 
Log Message:
cleaned imports

Index: Game.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Game.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Game.java	11 Jul 2004 08:06:12 -0000	1.3
+++ Game.java	11 Jul 2004 08:12:04 -0000	1.4
@@ -33,14 +33,13 @@
 
 import java.util.ArrayList;
 
-import org.lwjgl.opengl.Display;
-import org.lwjgl.opengl.DisplayMode;
-import org.lwjgl.opengl.PixelFormat;
 import org.lwjgl.LWJGLException;
 import org.lwjgl.Sys;
 import org.lwjgl.input.Controller;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
+import org.lwjgl.opengl.Display;
+import org.lwjgl.opengl.DisplayMode;
 import org.lwjgl.opengl.GL11;
 
 /**

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

Modified Files:
	ALC.java 
Log Message:
expose suspendContext

Index: ALC.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/ALC.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ALC.java	4 Jul 2004 13:58:11 -0000	1.21
+++ ALC.java	11 Jul 2004 08:09:34 -0000	1.22
@@ -290,17 +290,20 @@
 
 	/**
 	 * The application can suspend any context from processing (including the current
-	* one). To indicate that a context should be suspended from processing (i.e. that
-	* internal execution state like offset increments is not supposed to be changed), the
-	* application has to use <code>alcSuspendContext</code>.
-	* 
-	* Repeated calls to <code>alcSuspendContext</code> are legal, and do not affect a context that is
-	* already marked as suspended. The default state of a context created by
-	* <code>alcCreateContext</code> is that it is marked as suspended.
+	 * one). To indicate that a context should be suspended from processing (i.e. that
+	 * internal execution state like offset increments is not supposed to be changed), the
+	 * application has to use <code>alcSuspendContext</code>.
+	 * 
+	 * Repeated calls to <code>alcSuspendContext</code> are legal, and do not affect a context that is
+	 * already marked as suspended. The default state of a context created by
+	 * <code>alcCreateContext</code> is that it is marked as suspended.
 	 *
 	 * @param context address of context to suspend
 	 */
-	native static void alcSuspendContext(int context);
+  public static void alcSuspendContext() {
+  	nalcSuspendContext(AL.context.context);
+  }
+	native static void nalcSuspendContext(int context);
 
 	/**
 	 * The correct way to destroy a context is to first release it using <code>alcMakeCurrent</code> and

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

Modified Files:
	org_lwjgl_openal_ALC.cpp 
Log Message:
expose suspendContext

Index: org_lwjgl_openal_ALC.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALC.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- org_lwjgl_openal_ALC.cpp	4 Jul 2004 13:58:11 -0000	1.17
+++ org_lwjgl_openal_ALC.cpp	11 Jul 2004 08:08:46 -0000	1.18
@@ -288,7 +288,7 @@
  * C Specification:
  * void alcSuspendContext(ALCcontext *context);
  */
-static void JNICALL Java_org_lwjgl_openal_ALC_alcSuspendContext (JNIEnv *env, jclass clazz, jint contextaddress) {
+static void JNICALL Java_org_lwjgl_openal_ALC_nalcSuspendContext (JNIEnv *env, jclass clazz, jint contextaddress) {
 	alcSuspendContext((ALCcontext*) contextaddress);
 }
 
@@ -367,7 +367,7 @@
 		{"nalcProcessContext", "(I)V", (void*)&Java_org_lwjgl_openal_ALC_nalcProcessContext, "alcProcessContext", (void**)&alcProcessContext},
 		{"alcGetCurrentContext", "()Lorg/lwjgl/openal/ALCcontext;", (void*)&Java_org_lwjgl_openal_ALC_alcGetCurrentContext, "alcGetCurrentContext", (void**)&alcGetCurrentContext},
 		{"alcGetContextsDevice", "(I)Lorg/lwjgl/openal/ALCdevice;", (void*)&Java_org_lwjgl_openal_ALC_alcGetContextsDevice, "alcGetContextsDevice", (void**)&alcGetContextsDevice},
-		{"alcSuspendContext", "(I)V", (void*)&Java_org_lwjgl_openal_ALC_alcSuspendContext, "alcSuspendContext", (void**)&alcSuspendContext},
+		{"nalcSuspendContext", "(I)V", (void*)&Java_org_lwjgl_openal_ALC_nalcSuspendContext, "alcSuspendContext", (void**)&alcSuspendContext},
 		{"alcDestroyContext", "(I)V", (void*)&Java_org_lwjgl_openal_ALC_alcDestroyContext, "alcDestroyContext", (void**)&alcDestroyContext},
 		{"nalcGetError", "(I)I", (void*)&Java_org_lwjgl_openal_ALC_nalcGetError, "alcGetError", (void**)&alcGetError},
 		{"nalcIsExtensionPresent", "(ILjava/lang/String;)Z", (void*)&Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent, "alcIsExtensionPresent", (void**)&alcIsExtensionPresent},

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/examples/spaceinvaders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26404/spaceinvaders

Modified Files:
	Game.java 
Log Message:
fixed examples to new architexture

Index: Game.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/examples/spaceinvaders/Game.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Game.java	12 Jun 2004 21:52:37 -0000	1.2
+++ Game.java	11 Jul 2004 08:06:12 -0000	1.3
@@ -33,15 +33,15 @@
 
 import java.util.ArrayList;
 
-import org.lwjgl.Display;
-import org.lwjgl.DisplayMode;
+import org.lwjgl.opengl.Display;
+import org.lwjgl.opengl.DisplayMode;
+import org.lwjgl.opengl.PixelFormat;
 import org.lwjgl.LWJGLException;
 import org.lwjgl.Sys;
 import org.lwjgl.input.Controller;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.Window;
 
 /**
  * The main hook of our game. This class with both act as a manager
@@ -212,13 +212,11 @@
 	public void initialize() {
 		// initialize the window beforehand
 		try {
-			if (fullscreen && setDisplayMode()) {
-				Window.create(WINDOW_TITLE, Display.getDepth(), 0, 8, 0, 0);
-        Window.setVSyncEnabled(true);
-			} else {
-				Window.create(WINDOW_TITLE, 100, 100, width, height, Display.getDepth(), 0, 8, 0, 0);
-			}
-
+      setDisplayMode();
+      Display.setTitle(WINDOW_TITLE);
+      Display.setFullscreen(fullscreen);
+      Display.create();
+      
 			// grab the mouse, dont want that hideous cursor when we're playing!
 			Mouse.setGrabbed(true);
 
@@ -277,14 +275,14 @@
 	 */
 	private boolean setDisplayMode() {
     // get modes
-    DisplayMode[] dm = org.lwjgl.util.Display.getAvailableDisplayModes(800, 600, -1, -1, -1, -1, 60, 60);
+    DisplayMode[] dm = org.lwjgl.util.Display.getAvailableDisplayModes(width, height, -1, -1, -1, -1, 60, 60);
     
     try {
       org.lwjgl.util.Display.setDisplayMode(dm, new String[] {
           "width=" + width,
           "height=" + height,
           "freq=" + 60,
-          "bpp=" + org.lwjgl.Display.getDepth()
+          "bpp=" + org.lwjgl.opengl.Display.getDisplayMode().getBitsPerPixel()
          }); 
       return true;
     } catch (Exception e) {
@@ -425,7 +423,7 @@
 			frameRendering();
 
 			// update window contents
-			Window.update();
+			Display.update();
 		}
 	}
 
@@ -447,7 +445,7 @@
 
 		// update our FPS counter if a second has passed
 		if (lastFpsTime >= 1000) {
-			Window.setTitle(WINDOW_TITLE + " (FPS: " + fps + ")");
+			Display.setTitle(WINDOW_TITLE + " (FPS: " + fps + ")");
 			lastFpsTime = 0;
 			fps = 0;
 		}
@@ -543,7 +541,7 @@
 		}
 
 		// if escape has been pressed, stop the game
-		if (Window.isCloseRequested() || Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)) {
+		if (Display.isCloseRequested() || Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)) {
 			Game.gameRunning = false;
 		}
 	}
@@ -593,7 +591,7 @@
 	private void execute() {
 		gameLoop();
 		soundManager.destroy();
-		Window.destroy();
+		Display.destroy();
 	}
 
 	/**

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

Modified Files:
	Game.java 
Log Message:
fixed examples to new architexture

Index: Game.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/examples/Game.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Game.java	12 Jun 2004 20:28:20 -0000	1.4
+++ Game.java	11 Jul 2004 08:06:11 -0000	1.5
@@ -34,8 +34,8 @@
 import org.lwjgl.Sys;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.openal.AL;
+import org.lwjgl.opengl.Display;
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.Window;
 
 /**
  * $Id$
@@ -84,10 +84,13 @@
 	private static void init() throws Exception {
 		// Create a fullscreen window with 1:1 orthographic 2D projection, and with
 		// mouse, keyboard, and gamepad inputs.
-		Window.create(GAME_TITLE);
+    Display.setTitle(GAME_TITLE);
+    Display.setFullscreen(true);
+
+    // Enable vsync if we can
+    Display.setVSyncEnabled(true);
 		
-		// Enable vsync if we can
-		Window.setVSyncEnabled(true);
+    Display.create();
 		
 		// Start up the sound system
 		AL.create();
@@ -101,16 +104,16 @@
 	private static void run() {
 		while (!finished) {
 			// Always call Window.update(), all the time
-			Window.update();
+			Display.update();
 			
-			if (Window.isCloseRequested()) {
+			if (Display.isCloseRequested()) {
 				// Check for O/S close requests
 				finished = true;
-			} else if (Window.isActive()) {
+			} else if (Display.isActive()) {
 				// The window is in the foreground, so we should play the game
 				logic();
 				render();
-				org.lwjgl.Display.sync(FRAMERATE);
+				Display.sync(FRAMERATE);
 			} else {
 				// The window is not in the foreground, so we can allow other stuff to run and
 				// infrequently update
@@ -119,7 +122,7 @@
 				} catch (InterruptedException e) {
 				}
 				logic();
-				if (Window.isVisible() || Window.isDirty()) {
+				if (Display.isVisible() || Display.isDirty()) {
 					// Only bother rendering if the window is visible or dirty
 					render();
 				}
@@ -137,7 +140,7 @@
 		AL.destroy();
 		
 		// Close the window
-		Window.destroy();
+		Display.destroy();
 	}
 	
 	/**