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

AWTInputAdapter.destroy() now destroys the Keyboard and Mouse to mimic the behaviour of Display.destroy() more closely.

This commit is contained in:
Elias Naur 2006-11-19 16:24:18 +00:00
parent 2502496b2d
commit 0e10718b16
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/lwjgl/opengl/AWTInputAdapter.java
View File

@ -92,6 +92,8 @@ public final class AWTInputAdapter {
if (awt_input != null) {
awt_input.destroy();
awt_input = null;
Mouse.destroy();
Keyboard.destroy();
}
}
}

39
src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java
View File

@ -140,18 +140,25 @@ public class AWTInputAdapterTest extends Frame {
+ (fps / (timeUsed / 1000f)));
fps = 0;
}
Mouse.poll();
while (Mouse.next()) {
view_roty += Mouse.getEventDX()*.1;
view_rotx -= Mouse.getEventDY()*.1;
if (Mouse.isCreated()) {
Mouse.poll();
while (Mouse.next()) {
view_roty += Mouse.getEventDX()*.1;
view_rotx -= Mouse.getEventDY()*.1;
}
}
Keyboard.poll();
while (Keyboard.next()) {
if (Keyboard.isCreated()) {
Keyboard.poll();
}
while (Keyboard.isCreated() && Keyboard.next()) {
if (Keyboard.getEventKeyState()) {
switch (Keyboard.getEventKey()) {
case Keyboard.KEY_ESCAPE:
System.exit(0);
break;
case Keyboard.KEY_H:
AWTInputAdapter.destroy();
break;
case Keyboard.KEY_G:
Mouse.setGrabbed(!Mouse.isGrabbed());
break;
@ -162,14 +169,16 @@ public class AWTInputAdapterTest extends Frame {
if (Keyboard.getEventCharacter() != Keyboard.CHAR_NONE)
System.out.println("Typed: " + Keyboard.getEventCharacter());
}
if (Keyboard.isKeyDown(Keyboard.KEY_UP))
view_rotx -= .1;
else if (Keyboard.isKeyDown(Keyboard.KEY_DOWN))
view_rotx += .1;
if (Keyboard.isKeyDown(Keyboard.KEY_LEFT))
view_roty -= .1;
else if (Keyboard.isKeyDown(Keyboard.KEY_RIGHT))
view_roty += .1;
if (Keyboard.isCreated()) {
if (Keyboard.isKeyDown(Keyboard.KEY_UP))
view_rotx -= .1;
else if (Keyboard.isKeyDown(Keyboard.KEY_DOWN))
view_rotx += .1;
if (Keyboard.isKeyDown(Keyboard.KEY_LEFT))
view_roty -= .1;
else if (Keyboard.isKeyDown(Keyboard.KEY_RIGHT))
view_roty += .1;
}
}
});
addWindowListener(new WindowAdapter() {
@ -225,7 +234,7 @@ public class AWTInputAdapterTest extends Frame {
GL11.glMatrixMode(GL11.GL_PROJECTION);
System.err.println("Use the arrow keys and the mouse to rotate the gears. Press 'G' to toggle mouse grabbing.");
System.err.println("Use the arrow keys and the mouse to rotate the gears. Press 'G' to toggle mouse grabbing. Press 'H' to destroy the AWTInputAdapter.");
System.err.println("GL_VENDOR: " + GL11.glGetString(GL11.GL_VENDOR));
System.err.println("GL_RENDERER: " + GL11.glGetString(GL11.GL_RENDERER));
System.err.println("GL_VERSION: " + GL11.glGetString(GL11.GL_VERSION));