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

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

Modified Files:
	WindowCreationTest.java 
Log Message:
move before creation

Index: WindowCreationTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/WindowCreationTest.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- WindowCreationTest.java	27 Dec 2004 21:32:22 -0000	1.25
+++ WindowCreationTest.java	27 Dec 2004 21:39:30 -0000	1.26
@@ -57,14 +57,13 @@
 
     int x = 100, y = 100;
     boolean fullscreen = false;
+    System.out.println("Moving to 100, 100");
+    Display.setLocation(x, y);      
     
     // Create the actual window
     try {
       setDisplayMode();
       Display.create();
-      
-      System.out.println("Moving to 100, 100");
-      Display.setLocation(x, y);      
     } catch (Exception e) {
 			e.printStackTrace();
       System.out.println("Unable to create window!, exiting...");

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

Modified Files:
	Display.java 
Log Message:
respect display location

Index: Display.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Display.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Display.java	14 Dec 2004 08:11:18 -0000	1.35
+++ Display.java	27 Dec 2004 21:38:50 -0000	1.36
@@ -69,13 +69,13 @@
 	private static long timeNow, timeThen;
 
 	/** X coordinate of the window */
-	private static int x;
+	private static int x = -1;
 
 	/**
 	 * Y coordinate of the window. Y in window coordinates is from the top of the display down,
 	 * unlike GL, where it is typically at the bottom of the display.
 	 */
-	private static int y;
+	private static int y = -1;
 
 	/** Title of the window (never null) */
 	private static String title = "Game";
@@ -201,8 +201,12 @@
 	 * A native context must exist, and it will be attached to the window.
 	 */
 	private static void createWindow() throws LWJGLException {
-		x = Math.max(0, (initial_mode.getWidth() - current_mode.getWidth()) / 2);
-		y = Math.max(0, (initial_mode.getHeight() - current_mode.getHeight()) / 2);
+    // if no display location set, center window
+    if(x == -1 && y == -1) {
+      setLocation(Math.max(0, (initial_mode.getWidth() - current_mode.getWidth()) / 2),
+                  Math.max(0, (initial_mode.getHeight() - current_mode.getHeight()) / 2));
+    }
+    
 		display_impl.createWindow(current_mode, fullscreen, (fullscreen) ? 0 : x, (fullscreen) ? 0 : y);
 		setTitle(title);
 		initControls();
@@ -610,6 +614,7 @@
 		display_impl.destroyContext();
 		GLContext.unloadOpenGLLibrary();
 		context = null;
+    x = y = -1;
 		try {
 			GLContext.useContext(null);
 		} catch (LWJGLException e) {
@@ -657,7 +662,9 @@
 	 * The window is clamped to remain entirely on the screen. If you attempt
 	 * to position the window such that it would extend off the screen, the window
 	 * is simply placed as close to the edge as possible.
-	 * @param x , y The new window location
+   * <br><b>note</b>If no location has been specified (or x == y == -1) the window will be centered
+	 * @param x The new window location on the x axis
+   * @param y The new window location on the y axis
 	 */
 	public static void setLocation(int x, int y) {
 		if (fullscreen) {
@@ -666,8 +673,6 @@
 
 		// offset if already created
 		if(isCreated()) {
-			x = Math.max(0, Math.min(initial_mode.getWidth() - current_mode.getWidth(), x));
-			y = Math.max(0, Math.min(initial_mode.getHeight() - current_mode.getHeight(), y));
 			display_impl.reshape(x, y, current_mode.getWidth(), current_mode.getHeight());
 		}
 

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

Modified Files:
	WindowCreationTest.java 
Log Message:
move window after centering
updated output

Index: WindowCreationTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/WindowCreationTest.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- WindowCreationTest.java	11 Nov 2004 16:03:15 -0000	1.24
+++ WindowCreationTest.java	27 Dec 2004 21:32:22 -0000	1.25
@@ -58,13 +58,13 @@
     int x = 100, y = 100;
     boolean fullscreen = false;
     
-    System.out.println("Moving to 100, 100");
-    Display.setLocation(x, y);
-    
     // Create the actual window
     try {
       setDisplayMode();
       Display.create();
+      
+      System.out.println("Moving to 100, 100");
+      Display.setLocation(x, y);      
     } catch (Exception e) {
 			e.printStackTrace();
       System.out.println("Unable to create window!, exiting...");
@@ -72,7 +72,11 @@
 		}
 
     System.out.println("Window created");
-    System.out.println(Display.getDisplayMode().getHeight() + ", " + Display.getDisplayMode().getWidth() + ", " + Display.getTitle());
+    System.out.println("Width: " + Display.getDisplayMode().getWidth() + 
+                       ", Height: " + Display.getDisplayMode().getHeight() + 
+                       ", Bits per pixel: " + Display.getDisplayMode().getBitsPerPixel() + 
+                       ", Frequency: " + Display.getDisplayMode().getFrequency() + 
+                       ", Title: "+ Display.getTitle());
     
 	Display.setVSyncEnabled(true);
 	Display.setTitle("WindowCreationTest");