diff --git a/src/java/org/lwjgl/test/WindowCreationTest.java b/src/java/org/lwjgl/test/WindowCreationTest.java index 30e0ee7b..ac65b16e 100644 --- a/src/java/org/lwjgl/test/WindowCreationTest.java +++ b/src/java/org/lwjgl/test/WindowCreationTest.java @@ -29,8 +29,8 @@ public class WindowCreationTest { System.out.println("Display created"); - while(!gl.isCloseRequested()) { - gl.tick(); + while(!Window.isCloseRequested()) { + Window.tick(); try { Thread.sleep(100); } catch (Exception e) { diff --git a/src/java/org/lwjgl/test/input/ControllerCreationTest.java b/src/java/org/lwjgl/test/input/ControllerCreationTest.java index dedac499..335f3b61 100644 --- a/src/java/org/lwjgl/test/input/ControllerCreationTest.java +++ b/src/java/org/lwjgl/test/input/ControllerCreationTest.java @@ -34,6 +34,7 @@ package org.lwjgl.test.input; import org.lwjgl.Sys; import org.lwjgl.Display; import org.lwjgl.DisplayMode; +import org.lwjgl.Window; import org.lwjgl.input.Controller; import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GLWindow; @@ -165,7 +166,7 @@ public class ControllerCreationTest { while (Sys.getTime() < endtime) { - gl.tick(); + Window.tick(); Controller.poll(); @@ -183,7 +184,7 @@ public class ControllerCreationTest { render(); - gl.paint(); + Window.paint(); if (Sys.getTime() - statustime > Sys.getTimerResolution()) { System.out.print("."); diff --git a/src/java/org/lwjgl/test/input/ControllerTest.java b/src/java/org/lwjgl/test/input/ControllerTest.java index cebbe482..78cb65f0 100644 --- a/src/java/org/lwjgl/test/input/ControllerTest.java +++ b/src/java/org/lwjgl/test/input/ControllerTest.java @@ -32,6 +32,7 @@ package org.lwjgl.test.input; import org.lwjgl.DisplayMode; +import org.lwjgl.Window; import org.lwjgl.input.Controller; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL; @@ -116,10 +117,10 @@ public class ControllerTest { } private void wiggleController() { - while (!gl.isCloseRequested()) { - gl.tick(); + while (!Window.isCloseRequested()) { + Window.tick(); - if(gl.isMinimized()) { + if(Window.isMinimized()) { try { Thread.sleep(100); } catch (InterruptedException inte) { @@ -166,7 +167,7 @@ public class ControllerTest { render(); - gl.paint(); + Window.paint(); } } diff --git a/src/java/org/lwjgl/test/input/HWCursorTest.java b/src/java/org/lwjgl/test/input/HWCursorTest.java index 2c052623..cb6ea5d3 100644 --- a/src/java/org/lwjgl/test/input/HWCursorTest.java +++ b/src/java/org/lwjgl/test/input/HWCursorTest.java @@ -151,24 +151,24 @@ public class HWCursorTest { */ private void mainLoop() { while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE) - && !gl.isCloseRequested()) { + && !Window.isCloseRequested()) { // allow subsystem to get a chance to run too - gl.tick(); + Window.tick(); - if (!gl.isMinimized()) { + if (!Window.isMinimized()) { // check keyboard input processKeyboard(); render(); // paint window - gl.paint(); + Window.paint(); } else { // no need to render/paint if nothing has changed (ie. window dragged over) - if (gl.isDirty()) { + if (Window.isDirty()) { render(); - gl.paint(); + Window.paint(); } // don't waste cpu time, sleep more diff --git a/src/java/org/lwjgl/test/input/KeyboardTest.java b/src/java/org/lwjgl/test/input/KeyboardTest.java index 1036c49b..65ab45bf 100644 --- a/src/java/org/lwjgl/test/input/KeyboardTest.java +++ b/src/java/org/lwjgl/test/input/KeyboardTest.java @@ -32,6 +32,7 @@ package org.lwjgl.test.input; import org.lwjgl.DisplayMode; +import org.lwjgl.Window; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GLWindow; @@ -122,10 +123,10 @@ public class KeyboardTest { Keyboard.enableBuffer(); Keyboard.enableTranslation(); - while (!gl.isCloseRequested()) { - gl.tick(); + while (!Window.isCloseRequested()) { + Window.tick(); - if(gl.isMinimized()) { + if(Window.isMinimized()) { try { Thread.sleep(100); } catch (InterruptedException inte) { @@ -185,7 +186,7 @@ public class KeyboardTest { render(); - gl.paint(); + Window.paint(); try { Thread.sleep(0); diff --git a/src/java/org/lwjgl/test/input/MouseCreationTest.java b/src/java/org/lwjgl/test/input/MouseCreationTest.java index 2b33e618..35204b9e 100644 --- a/src/java/org/lwjgl/test/input/MouseCreationTest.java +++ b/src/java/org/lwjgl/test/input/MouseCreationTest.java @@ -34,6 +34,7 @@ package org.lwjgl.test.input; import org.lwjgl.Sys; import org.lwjgl.Display; import org.lwjgl.DisplayMode; +import org.lwjgl.Window; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GLWindow; @@ -167,7 +168,7 @@ public class MouseCreationTest { long endtime = Sys.getTime() + Sys.getTimerResolution() * 5; while (Sys.getTime() < endtime) { - gl.tick(); + Window.tick(); Mouse.poll(); @@ -188,7 +189,7 @@ public class MouseCreationTest { render(); - gl.paint(); + Window.paint(); if (Sys.getTime() - statustime > Sys.getTimerResolution()) { System.out.print("."); diff --git a/src/java/org/lwjgl/test/input/MouseTest.java b/src/java/org/lwjgl/test/input/MouseTest.java index 37c44d8f..5cec7290 100644 --- a/src/java/org/lwjgl/test/input/MouseTest.java +++ b/src/java/org/lwjgl/test/input/MouseTest.java @@ -32,6 +32,7 @@ package org.lwjgl.test.input; import org.lwjgl.DisplayMode; +import org.lwjgl.Window; import org.lwjgl.input.Mouse; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL; @@ -117,10 +118,10 @@ public class MouseTest { } private void wiggleMouse() { - while (!gl.isCloseRequested()) { - gl.tick(); + while (!Window.isCloseRequested()) { + Window.tick(); - if(gl.isMinimized()) { + if(Window.isMinimized()) { try { Thread.sleep(100); } catch (InterruptedException inte) { @@ -154,7 +155,7 @@ public class MouseTest { render(); - gl.paint(); + Window.paint(); } } diff --git a/src/java/org/lwjgl/test/openal/MovingSoundTest.java b/src/java/org/lwjgl/test/openal/MovingSoundTest.java index 3e4ffa78..346c5086 100644 --- a/src/java/org/lwjgl/test/openal/MovingSoundTest.java +++ b/src/java/org/lwjgl/test/openal/MovingSoundTest.java @@ -31,6 +31,7 @@ */ package org.lwjgl.test.openal; +import org.lwjgl.Window; import org.lwjgl.openal.AL; import org.lwjgl.openal.eax.*; import org.lwjgl.input.Keyboard; @@ -155,7 +156,7 @@ public class MovingSoundTest extends BasicTest { System.out.println("Move source with arrow keys\nMove listener with right shift and arrowkeys\nEnable EAX effect by pressing e (if available)\nExit with ESC"); while(!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)) { - gl.tick(); + Window.tick(); Keyboard.poll(); if(Keyboard.isKeyDown(Keyboard.KEY_LEFT)) { @@ -192,7 +193,7 @@ public class MovingSoundTest extends BasicTest { eaxApplied = !eaxApplied; } - if(gl.isCloseRequested()) { + if(Window.isCloseRequested()) { break; } diff --git a/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java b/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java index fb55ca4d..38870012 100644 --- a/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java +++ b/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java @@ -115,11 +115,11 @@ public class FullScreenWindowedTest { */ private void mainLoop() { while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE) - && !gl.isCloseRequested()) { + && !Window.isCloseRequested()) { // allow subsystem to get a chance to run too - gl.tick(); + Window.tick(); - if (!gl.isMinimized()) { + if (!Window.isMinimized()) { // check keyboard input processKeyboard(); @@ -128,13 +128,13 @@ public class FullScreenWindowedTest { render(); // paint window - gl.paint(); + Window.paint(); } else { // no need to render/paint if nothing has changed (ie. window dragged over) - if (gl.isDirty()) { + if (Window.isDirty()) { render(); - gl.paint(); + Window.paint(); } // don't waste cpu time, sleep more diff --git a/src/java/org/lwjgl/test/opengl/Game.java b/src/java/org/lwjgl/test/opengl/Game.java index 2b24cc36..c070864e 100644 --- a/src/java/org/lwjgl/test/opengl/Game.java +++ b/src/java/org/lwjgl/test/opengl/Game.java @@ -99,17 +99,17 @@ public final class Game { try { init(); while (!finished) { - gl.tick(); + Window.tick(); - if (gl.isMinimized()) + if (Window.isMinimized()) Thread.sleep(200); - else if (gl.isCloseRequested()) + else if (Window.isCloseRequested()) System.exit(0); Keyboard.poll(); mainLoop(); render(); - gl.paint(); + Window.paint(); } } catch (Throwable t) { t.printStackTrace(); diff --git a/src/java/org/lwjgl/test/opengl/Grass.java b/src/java/org/lwjgl/test/opengl/Grass.java index 116debd1..67deb44d 100644 --- a/src/java/org/lwjgl/test/opengl/Grass.java +++ b/src/java/org/lwjgl/test/opengl/Grass.java @@ -201,7 +201,7 @@ public class Grass { grsDraw(); - gl.paint(); + Window.paint(); } Mouse.destroy(); Keyboard.destroy(); diff --git a/src/java/org/lwjgl/test/opengl/PbufferTest.java b/src/java/org/lwjgl/test/opengl/PbufferTest.java index 6d8ee0c7..1d60323f 100644 --- a/src/java/org/lwjgl/test/opengl/PbufferTest.java +++ b/src/java/org/lwjgl/test/opengl/PbufferTest.java @@ -124,11 +124,11 @@ public class PbufferTest { */ private void mainLoop() { while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE) - && !gl.isCloseRequested()) { + && !Window.isCloseRequested()) { // allow subsystem to get a chance to run too - gl.tick(); + Window.tick(); - if (!gl.isMinimized()) { + if (!Window.isMinimized()) { // check keyboard input processKeyboard(); @@ -137,13 +137,13 @@ public class PbufferTest { render(); // paint window - gl.paint(); + Window.paint(); } else { // no need to render/paint if nothing has changed (ie. window dragged over) - if (gl.isDirty()) { + if (Window.isDirty()) { render(); - gl.paint(); + Window.paint(); } // don't waste cpu time, sleep more diff --git a/src/java/org/lwjgl/test/opengl/VBOTest.java b/src/java/org/lwjgl/test/opengl/VBOTest.java index 89008219..9a613f85 100644 --- a/src/java/org/lwjgl/test/opengl/VBOTest.java +++ b/src/java/org/lwjgl/test/opengl/VBOTest.java @@ -97,17 +97,17 @@ public final class VBOTest { try { init(); while (!finished) { - gl.tick(); + Window.tick(); - if (gl.isMinimized()) + if (Window.isMinimized()) Thread.sleep(200); - else if (gl.isCloseRequested()) + else if (Window.isCloseRequested()) System.exit(0); Keyboard.poll(); mainLoop(); render(); - gl.paint(); + Window.paint(); } } catch (Throwable t) { t.printStackTrace();