shadowfacts/lwjgl2-arm64
1
0
Fork 0
mirror of https://github.com/shadowfacts/lwjgl2-arm64.git synced 2026-04-05 06:25:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

support for setLocation

Browse source
This commit is contained in:
Brian Matzon 2004-09-15 17:07:06 +00:00
parent 318952793f
commit da867ff28a
6 changed files with 143 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

85
src/java/org/lwjgl/opengl/Display.java
View file

@ -75,14 +75,14 @@ public final class Display {
/** Timer for sync() */
private static long timeNow, timeThen;
// /** X coordinate of the window */
// private static int x;
/** X coordinate of the window */
private static int x;
/**
* 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;
/** Title of the window (never null) */
private static String title = "Game";
@ -177,13 +177,15 @@ public final class Display {
* A native context must exist, and it will be attached to the window.
*/
private static void createWindow() throws LWJGLException {
nCreateWindow(current_mode, fullscreen);
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));
nCreateWindow(current_mode, fullscreen, (fullscreen) ? 0 : x, (fullscreen) ? 0 : y);
nSetTitle(title);
initControls();
nSetVSyncEnabled(vsync);
}
private static native void nCreateWindow(DisplayMode mode, boolean fullscreen) throws LWJGLException;
private static native void nCreateWindow(DisplayMode mode, boolean fullscreen, int x, int y) throws LWJGLException;
private static void destroyWindow() {
// Automatically destroy keyboard, mouse, and controller
@ -329,21 +331,17 @@ public final class Display {
/**
* @return the X coordinate of the window (always 0 for fullscreen)
*/
/* public static int getX() {
if (!isCreated())
throw new IllegalStateException("Cannot get X on uncreated window");
return x;
}
*/
/*public static int getX() {
return (fullscreen) ? 0 : x;
}*/
/**
* @return the Y coordinate of the window (always 0 for fullscreen)
*/
/* public static int getY() {
if (!isCreated())
throw new IllegalStateException("Cannot get Y on uncreated window");
return y;
}
*/
/*public static int getY() {
return (fullscreen) ? 0 : y;
}*/
/**
* @return the title of the window
@ -370,10 +368,11 @@ public final class Display {
return;
destroyWindow();
try {
if (fullscreen)
if (fullscreen) {
switchDisplayMode();
else
} else {
resetDisplayMode();
}
createWindow();
} catch (LWJGLException e) {
destroyContext();
@ -697,30 +696,28 @@ public final class Display {
private static native void nSetVSyncEnabled(boolean sync);
// /**
// * Set the window's location. This is a no-op on fullscreen windows.
// * 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
// */
// public static void setLocation(int x, int y) {
// if (!isCreated())
// throw new IllegalStateException("Cannot move uncreated window");
// if (fullscreen) {
// return;
// }
// Display.x = Math.max(0, Math.min(Display.getWidth() - Display.width, x));
// Display.y = Math.max(0, Math.min(Display.getHeight() - Display.height, y));
// nReshape(Display.x, Display.y, Display.width, Display.height);
// }
//
//
// /**
// * Native method to reshape the window
// * @param x, y The new window location
// * @param width, height The new window dimensions
// */
// private static native void nReshape(int x, int y, int width, int height);
/**
* Set the window's location. This is a no-op on fullscreen windows.
* 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
*/
public static void setLocation(int x, int y) {
if (fullscreen) {
return;
}
// 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));
nReshape(x, y, current_mode.getWidth(), current_mode.getHeight());
}
// cache position
Display.x = x;
Display.y = y;
}
private static native void nReshape(int x, int y, int width, int height);
}

38
src/java/org/lwjgl/test/WindowCreationTest.java
View file

@ -31,8 +31,10 @@
*/
package org.lwjgl.test;
import org.lwjgl.LWJGLException;
import org.lwjgl.opengl.Display;
import org.lwjgl.opengl.DisplayMode;
import org.lwjgl.opengl.GL11;
import org.lwjgl.input.Keyboard;
/**
@ -52,6 +54,12 @@ public class WindowCreationTest {
// get avaialble modes, and print out
DisplayMode[] modes = Display.getAvailableDisplayModes();
System.out.println("Found " + modes.length + " display modes");
int x = 100, y = 100;
boolean fullscreen = false;
System.out.println("Moving to 100, 100");
Display.setLocation(x, y);
// Create the actual window
try {
@ -65,9 +73,10 @@ public class WindowCreationTest {
System.out.println("Window created");
System.out.println(Display.getDisplayMode().getHeight() + ", " + Display.getDisplayMode().getWidth() + ", " + Display.getTitle());
// wait for user to close window
while(!Display.isCloseRequested()) {
while(!Display.isCloseRequested()) {
GL11.glClear(GL11.GL_COLOR_BUFFER_BIT);
Display.update();
try {
Thread.sleep(100);
@ -78,6 +87,31 @@ public class WindowCreationTest {
if(Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)) {
break;
}
if(Keyboard.isKeyDown(Keyboard.KEY_LEFT)) {
Display.setLocation(x -= 10, y);
}
if(Keyboard.isKeyDown(Keyboard.KEY_RIGHT)) {
Display.setLocation(x += 10, y);
}
if(Keyboard.isKeyDown(Keyboard.KEY_UP)) {
Display.setLocation(x, y -= 10);
}
if(Keyboard.isKeyDown(Keyboard.KEY_DOWN)) {
Display.setLocation(x, y += 10);
}
if(Keyboard.isKeyDown(Keyboard.KEY_F)) {
try {
Display.setFullscreen(fullscreen = !fullscreen);
} catch (LWJGLException lwjgle) {
lwjgle.printStackTrace();
}
}
}
// nuke window and get out