michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: static method usage

This commit is contained in:
Brian Matzon 2003-08-02 20:52:49 +00:00
parent 4283f40244
commit 80cf5b1dcc
13 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/lwjgl/test/WindowCreationTest.java
View File

@ -29,8 +29,8 @@ public class WindowCreationTest {
System.out.println("Display created"); System.out.println("Display created");
while(!gl.isCloseRequested()) { while(!Window.isCloseRequested()) {
gl.tick(); Window.tick();
try { try {
Thread.sleep(100); Thread.sleep(100);
} catch (Exception e) { } catch (Exception e) {

5
src/java/org/lwjgl/test/input/ControllerCreationTest.java
View File

@ -34,6 +34,7 @@ package org.lwjgl.test.input;
import org.lwjgl.Sys; import org.lwjgl.Sys;
import org.lwjgl.Display; import org.lwjgl.Display;
import org.lwjgl.DisplayMode; import org.lwjgl.DisplayMode;
import org.lwjgl.Window;
import org.lwjgl.input.Controller; import org.lwjgl.input.Controller;
import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL;
import org.lwjgl.opengl.GLWindow; import org.lwjgl.opengl.GLWindow;
@ -165,7 +166,7 @@ public class ControllerCreationTest {
while (Sys.getTime() < endtime) { while (Sys.getTime() < endtime) {
gl.tick(); Window.tick();
Controller.poll(); Controller.poll();
@ -183,7 +184,7 @@ public class ControllerCreationTest {
render(); render();
gl.paint(); Window.paint();
if (Sys.getTime() - statustime > Sys.getTimerResolution()) { if (Sys.getTime() - statustime > Sys.getTimerResolution()) {
System.out.print("."); System.out.print(".");

9
src/java/org/lwjgl/test/input/ControllerTest.java
View File

@ -32,6 +32,7 @@
package org.lwjgl.test.input; package org.lwjgl.test.input;
import org.lwjgl.DisplayMode; import org.lwjgl.DisplayMode;
import org.lwjgl.Window;
import org.lwjgl.input.Controller; import org.lwjgl.input.Controller;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL;
@ -116,10 +117,10 @@ public class ControllerTest {
} }
private void wiggleController() { private void wiggleController() {
while (!gl.isCloseRequested()) { while (!Window.isCloseRequested()) {
gl.tick(); Window.tick();
if(gl.isMinimized()) { if(Window.isMinimized()) {
try { try {
Thread.sleep(100); Thread.sleep(100);
} catch (InterruptedException inte) { } catch (InterruptedException inte) {
@ -166,7 +167,7 @@ public class ControllerTest {
render(); render();
gl.paint(); Window.paint();
} }
} }

12
src/java/org/lwjgl/test/input/HWCursorTest.java
View File

@ -151,24 +151,24 @@ public class HWCursorTest {
*/ */
private void mainLoop() { private void mainLoop() {
while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE) while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)
&& !gl.isCloseRequested()) { && !Window.isCloseRequested()) {
// allow subsystem to get a chance to run too // allow subsystem to get a chance to run too
gl.tick(); Window.tick();
if (!gl.isMinimized()) { if (!Window.isMinimized()) {
// check keyboard input // check keyboard input
processKeyboard(); processKeyboard();
render(); render();
// paint window // paint window
gl.paint(); Window.paint();
} else { } else {
// no need to render/paint if nothing has changed (ie. window dragged over) // no need to render/paint if nothing has changed (ie. window dragged over)
if (gl.isDirty()) { if (Window.isDirty()) {
render(); render();
gl.paint(); Window.paint();
} }
// don't waste cpu time, sleep more // don't waste cpu time, sleep more

9
src/java/org/lwjgl/test/input/KeyboardTest.java
View File

@ -32,6 +32,7 @@
package org.lwjgl.test.input; package org.lwjgl.test.input;
import org.lwjgl.DisplayMode; import org.lwjgl.DisplayMode;
import org.lwjgl.Window;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL;
import org.lwjgl.opengl.GLWindow; import org.lwjgl.opengl.GLWindow;
@ -122,10 +123,10 @@ public class KeyboardTest {
Keyboard.enableBuffer(); Keyboard.enableBuffer();
Keyboard.enableTranslation(); Keyboard.enableTranslation();
while (!gl.isCloseRequested()) { while (!Window.isCloseRequested()) {
gl.tick(); Window.tick();
if(gl.isMinimized()) { if(Window.isMinimized()) {
try { try {
Thread.sleep(100); Thread.sleep(100);
} catch (InterruptedException inte) { } catch (InterruptedException inte) {
@ -185,7 +186,7 @@ public class KeyboardTest {
render(); render();
gl.paint(); Window.paint();
try { try {
Thread.sleep(0); Thread.sleep(0);

5
src/java/org/lwjgl/test/input/MouseCreationTest.java
View File

@ -34,6 +34,7 @@ package org.lwjgl.test.input;
import org.lwjgl.Sys; import org.lwjgl.Sys;
import org.lwjgl.Display; import org.lwjgl.Display;
import org.lwjgl.DisplayMode; import org.lwjgl.DisplayMode;
import org.lwjgl.Window;
import org.lwjgl.input.Mouse; import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL;
import org.lwjgl.opengl.GLWindow; import org.lwjgl.opengl.GLWindow;
@ -167,7 +168,7 @@ public class MouseCreationTest {
long endtime = Sys.getTime() + Sys.getTimerResolution() * 5; long endtime = Sys.getTime() + Sys.getTimerResolution() * 5;
while (Sys.getTime() < endtime) { while (Sys.getTime() < endtime) {
gl.tick(); Window.tick();
Mouse.poll(); Mouse.poll();
@ -188,7 +189,7 @@ public class MouseCreationTest {
render(); render();
gl.paint(); Window.paint();
if (Sys.getTime() - statustime > Sys.getTimerResolution()) { if (Sys.getTime() - statustime > Sys.getTimerResolution()) {
System.out.print("."); System.out.print(".");

9
src/java/org/lwjgl/test/input/MouseTest.java
View File

@ -32,6 +32,7 @@
package org.lwjgl.test.input; package org.lwjgl.test.input;
import org.lwjgl.DisplayMode; import org.lwjgl.DisplayMode;
import org.lwjgl.Window;
import org.lwjgl.input.Mouse; import org.lwjgl.input.Mouse;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL;
@ -117,10 +118,10 @@ public class MouseTest {
} }
private void wiggleMouse() { private void wiggleMouse() {
while (!gl.isCloseRequested()) { while (!Window.isCloseRequested()) {
gl.tick(); Window.tick();
if(gl.isMinimized()) { if(Window.isMinimized()) {
try { try {
Thread.sleep(100); Thread.sleep(100);
} catch (InterruptedException inte) { } catch (InterruptedException inte) {
@ -154,7 +155,7 @@ public class MouseTest {
render(); render();
gl.paint(); Window.paint();
} }
} }

5
src/java/org/lwjgl/test/openal/MovingSoundTest.java
View File

@ -31,6 +31,7 @@
*/ */
package org.lwjgl.test.openal; package org.lwjgl.test.openal;
import org.lwjgl.Window;
import org.lwjgl.openal.AL; import org.lwjgl.openal.AL;
import org.lwjgl.openal.eax.*; import org.lwjgl.openal.eax.*;
import org.lwjgl.input.Keyboard; 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"); 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)) { while(!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)) {
gl.tick(); Window.tick();
Keyboard.poll(); Keyboard.poll();
if(Keyboard.isKeyDown(Keyboard.KEY_LEFT)) { if(Keyboard.isKeyDown(Keyboard.KEY_LEFT)) {
@ -192,7 +193,7 @@ public class MovingSoundTest extends BasicTest {
eaxApplied = !eaxApplied; eaxApplied = !eaxApplied;
} }
if(gl.isCloseRequested()) { if(Window.isCloseRequested()) {
break; break;
} }

12
src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java
View File

@ -115,11 +115,11 @@ public class FullScreenWindowedTest {
*/ */
private void mainLoop() { private void mainLoop() {
while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE) while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)
&& !gl.isCloseRequested()) { && !Window.isCloseRequested()) {
// allow subsystem to get a chance to run too // allow subsystem to get a chance to run too
gl.tick(); Window.tick();
if (!gl.isMinimized()) { if (!Window.isMinimized()) {
// check keyboard input // check keyboard input
processKeyboard(); processKeyboard();
@ -128,13 +128,13 @@ public class FullScreenWindowedTest {
render(); render();
// paint window // paint window
gl.paint(); Window.paint();
} else { } else {
// no need to render/paint if nothing has changed (ie. window dragged over) // no need to render/paint if nothing has changed (ie. window dragged over)
if (gl.isDirty()) { if (Window.isDirty()) {
render(); render();
gl.paint(); Window.paint();
} }
// don't waste cpu time, sleep more // don't waste cpu time, sleep more

8
src/java/org/lwjgl/test/opengl/Game.java
View File

@ -99,17 +99,17 @@ public final class Game {
try { try {
init(); init();
while (!finished) { while (!finished) {
gl.tick(); Window.tick();
if (gl.isMinimized()) if (Window.isMinimized())
Thread.sleep(200); Thread.sleep(200);
else if (gl.isCloseRequested()) else if (Window.isCloseRequested())
System.exit(0); System.exit(0);
Keyboard.poll(); Keyboard.poll();
mainLoop(); mainLoop();
render(); render();
gl.paint(); Window.paint();
} }
} catch (Throwable t) { } catch (Throwable t) {
t.printStackTrace(); t.printStackTrace();

2
src/java/org/lwjgl/test/opengl/Grass.java
View File

@ -201,7 +201,7 @@ public class Grass {
grsDraw(); grsDraw();
gl.paint(); Window.paint();
} }
Mouse.destroy(); Mouse.destroy();
Keyboard.destroy(); Keyboard.destroy();

12
src/java/org/lwjgl/test/opengl/PbufferTest.java
View File

@ -124,11 +124,11 @@ public class PbufferTest {
*/ */
private void mainLoop() { private void mainLoop() {
while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE) while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)
&& !gl.isCloseRequested()) { && !Window.isCloseRequested()) {
// allow subsystem to get a chance to run too // allow subsystem to get a chance to run too
gl.tick(); Window.tick();
if (!gl.isMinimized()) { if (!Window.isMinimized()) {
// check keyboard input // check keyboard input
processKeyboard(); processKeyboard();
@ -137,13 +137,13 @@ public class PbufferTest {
render(); render();
// paint window // paint window
gl.paint(); Window.paint();
} else { } else {
// no need to render/paint if nothing has changed (ie. window dragged over) // no need to render/paint if nothing has changed (ie. window dragged over)
if (gl.isDirty()) { if (Window.isDirty()) {
render(); render();
gl.paint(); Window.paint();
} }
// don't waste cpu time, sleep more // don't waste cpu time, sleep more

8
src/java/org/lwjgl/test/opengl/VBOTest.java
View File

@ -97,17 +97,17 @@ public final class VBOTest {
try { try {
init(); init();
while (!finished) { while (!finished) {
gl.tick(); Window.tick();
if (gl.isMinimized()) if (Window.isMinimized())
Thread.sleep(200); Thread.sleep(200);
else if (gl.isCloseRequested()) else if (Window.isCloseRequested())
System.exit(0); System.exit(0);
Keyboard.poll(); Keyboard.poll();
mainLoop(); mainLoop();
render(); render();
gl.paint(); Window.paint();
} }
} catch (Throwable t) { } catch (Throwable t) {
t.printStackTrace(); t.printStackTrace();