From: nathan.sweet Date: Thu, 4 Nov 2010 05:08:32 +0000 (+0000) Subject: [fixed] If aids. X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=80d5684697aeb822ac08c871a47c4601ed5ac4d0;p=mikumikustudio%2Flibgdx-mikumikustudio.git [fixed] If aids. [changed] Screen to interface. --- diff --git a/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglInput.java b/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglInput.java index b701da0c0..86788a4a5 100644 --- a/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglInput.java +++ b/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglInput.java @@ -14,9 +14,7 @@ package com.badlogic.gdx.backends.lwjgl; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Set; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; @@ -120,7 +118,7 @@ final class LwjglInput implements Input { if( key == Input.Keys.ANY_KEY ) return pressedKeys > 0; else - return Keyboard.isKeyDown(getKeyCodeReverse(key)); + return Keyboard.isKeyDown(getLwjglKeyCode(key)); } public boolean isTouched () { @@ -202,125 +200,129 @@ final class LwjglInput implements Input { touchEvents.clear(); } } - - public static int getKeyCode (int keyCode) { - if (keyCode == Keyboard.KEY_0) return Input.Keys.KEYCODE_0; - if (keyCode == Keyboard.KEY_1) return Input.Keys.KEYCODE_1; - if (keyCode == Keyboard.KEY_2) return Input.Keys.KEYCODE_2; - if (keyCode == Keyboard.KEY_3) return Input.Keys.KEYCODE_3; - if (keyCode == Keyboard.KEY_4) return Input.Keys.KEYCODE_4; - if (keyCode == Keyboard.KEY_5) return Input.Keys.KEYCODE_5; - if (keyCode == Keyboard.KEY_6) return Input.Keys.KEYCODE_6; - if (keyCode == Keyboard.KEY_7) return Input.Keys.KEYCODE_7; - if (keyCode == Keyboard.KEY_8) return Input.Keys.KEYCODE_8; - if (keyCode == Keyboard.KEY_9) return Input.Keys.KEYCODE_9; - if (keyCode == Keyboard.KEY_A) return Input.Keys.KEYCODE_A; - if (keyCode == Keyboard.KEY_B) return Input.Keys.KEYCODE_B; - if (keyCode == Keyboard.KEY_C) return Input.Keys.KEYCODE_C; - if (keyCode == Keyboard.KEY_D) return Input.Keys.KEYCODE_D; - if (keyCode == Keyboard.KEY_E) return Input.Keys.KEYCODE_E; - if (keyCode == Keyboard.KEY_F) return Input.Keys.KEYCODE_F; - if (keyCode == Keyboard.KEY_G) return Input.Keys.KEYCODE_G; - if (keyCode == Keyboard.KEY_H) return Input.Keys.KEYCODE_H; - if (keyCode == Keyboard.KEY_I) return Input.Keys.KEYCODE_I; - if (keyCode == Keyboard.KEY_J) return Input.Keys.KEYCODE_J; - if (keyCode == Keyboard.KEY_K) return Input.Keys.KEYCODE_K; - if (keyCode == Keyboard.KEY_L) return Input.Keys.KEYCODE_L; - if (keyCode == Keyboard.KEY_M) return Input.Keys.KEYCODE_M; - if (keyCode == Keyboard.KEY_N) return Input.Keys.KEYCODE_N; - if (keyCode == Keyboard.KEY_O) return Input.Keys.KEYCODE_O; - if (keyCode == Keyboard.KEY_P) return Input.Keys.KEYCODE_P; - if (keyCode == Keyboard.KEY_Q) return Input.Keys.KEYCODE_Q; - if (keyCode == Keyboard.KEY_R) return Input.Keys.KEYCODE_R; - if (keyCode == Keyboard.KEY_S) return Input.Keys.KEYCODE_S; - if (keyCode == Keyboard.KEY_T) return Input.Keys.KEYCODE_T; - if (keyCode == Keyboard.KEY_U) return Input.Keys.KEYCODE_U; - if (keyCode == Keyboard.KEY_V) return Input.Keys.KEYCODE_V; - if (keyCode == Keyboard.KEY_W) return Input.Keys.KEYCODE_W; - if (keyCode == Keyboard.KEY_X) return Input.Keys.KEYCODE_X; - if (keyCode == Keyboard.KEY_Y) return Input.Keys.KEYCODE_Y; - if (keyCode == Keyboard.KEY_Z) return Input.Keys.KEYCODE_Z; - if (keyCode == Keyboard.KEY_LMETA) return Input.Keys.KEYCODE_ALT_LEFT; - if (keyCode == Keyboard.KEY_RMETA) return Input.Keys.KEYCODE_ALT_RIGHT; - if (keyCode == Keyboard.KEY_BACKSLASH) return Input.Keys.KEYCODE_BACKSLASH; - if (keyCode == Keyboard.KEY_COMMA) return Input.Keys.KEYCODE_COMMA; - if (keyCode == Keyboard.KEY_DELETE) return Input.Keys.KEYCODE_DEL; - if (keyCode == Keyboard.KEY_LEFT) return Input.Keys.KEYCODE_DPAD_LEFT; - if (keyCode == Keyboard.KEY_RIGHT) return Input.Keys.KEYCODE_DPAD_RIGHT; - if (keyCode == Keyboard.KEY_UP) return Input.Keys.KEYCODE_DPAD_UP; - if (keyCode == Keyboard.KEY_DOWN) return Input.Keys.KEYCODE_DPAD_DOWN; - if (keyCode == Keyboard.KEY_RETURN) return Input.Keys.KEYCODE_ENTER; - if (keyCode == Keyboard.KEY_HOME) return Input.Keys.KEYCODE_HOME; - if (keyCode == Keyboard.KEY_MINUS) return Input.Keys.KEYCODE_MINUS; - if (keyCode == Keyboard.KEY_PERIOD) return Input.Keys.KEYCODE_PERIOD; - if (keyCode == Keyboard.KEY_ADD) return Input.Keys.KEYCODE_PLUS; - if (keyCode == Keyboard.KEY_SEMICOLON) return Input.Keys.KEYCODE_SEMICOLON; - if (keyCode == Keyboard.KEY_LSHIFT) return Input.Keys.KEYCODE_SHIFT_LEFT; - if (keyCode == Keyboard.KEY_RSHIFT) return Input.Keys.KEYCODE_SHIFT_RIGHT; - if (keyCode == Keyboard.KEY_SLASH) return Input.Keys.KEYCODE_SLASH; - if (keyCode == Keyboard.KEY_SPACE) return Input.Keys.KEYCODE_SPACE; - if (keyCode == Keyboard.KEY_TAB) return Input.Keys.KEYCODE_TAB; - return Input.Keys.KEYCODE_UNKNOWN; + + public static int getGdxKeyCode (int lwjglKeyCode) { + switch (lwjglKeyCode) { + case Keyboard.KEY_0: return Input.Keys.KEYCODE_0; + case Keyboard.KEY_1: return Input.Keys.KEYCODE_1; + case Keyboard.KEY_2: return Input.Keys.KEYCODE_2; + case Keyboard.KEY_3: return Input.Keys.KEYCODE_3; + case Keyboard.KEY_4: return Input.Keys.KEYCODE_4; + case Keyboard.KEY_5: return Input.Keys.KEYCODE_5; + case Keyboard.KEY_6: return Input.Keys.KEYCODE_6; + case Keyboard.KEY_7: return Input.Keys.KEYCODE_7; + case Keyboard.KEY_8: return Input.Keys.KEYCODE_8; + case Keyboard.KEY_9: return Input.Keys.KEYCODE_9; + case Keyboard.KEY_A: return Input.Keys.KEYCODE_A; + case Keyboard.KEY_B: return Input.Keys.KEYCODE_B; + case Keyboard.KEY_C: return Input.Keys.KEYCODE_C; + case Keyboard.KEY_D: return Input.Keys.KEYCODE_D; + case Keyboard.KEY_E: return Input.Keys.KEYCODE_E; + case Keyboard.KEY_F: return Input.Keys.KEYCODE_F; + case Keyboard.KEY_G: return Input.Keys.KEYCODE_G; + case Keyboard.KEY_H: return Input.Keys.KEYCODE_H; + case Keyboard.KEY_I: return Input.Keys.KEYCODE_I; + case Keyboard.KEY_J: return Input.Keys.KEYCODE_J; + case Keyboard.KEY_K: return Input.Keys.KEYCODE_K; + case Keyboard.KEY_L: return Input.Keys.KEYCODE_L; + case Keyboard.KEY_M: return Input.Keys.KEYCODE_M; + case Keyboard.KEY_N: return Input.Keys.KEYCODE_N; + case Keyboard.KEY_O: return Input.Keys.KEYCODE_O; + case Keyboard.KEY_P: return Input.Keys.KEYCODE_P; + case Keyboard.KEY_Q: return Input.Keys.KEYCODE_Q; + case Keyboard.KEY_R: return Input.Keys.KEYCODE_R; + case Keyboard.KEY_S: return Input.Keys.KEYCODE_S; + case Keyboard.KEY_T: return Input.Keys.KEYCODE_T; + case Keyboard.KEY_U: return Input.Keys.KEYCODE_U; + case Keyboard.KEY_V: return Input.Keys.KEYCODE_V; + case Keyboard.KEY_W: return Input.Keys.KEYCODE_W; + case Keyboard.KEY_X: return Input.Keys.KEYCODE_X; + case Keyboard.KEY_Y: return Input.Keys.KEYCODE_Y; + case Keyboard.KEY_Z: return Input.Keys.KEYCODE_Z; + case Keyboard.KEY_LMETA: return Input.Keys.KEYCODE_ALT_LEFT; + case Keyboard.KEY_RMETA: return Input.Keys.KEYCODE_ALT_RIGHT; + case Keyboard.KEY_BACKSLASH: return Input.Keys.KEYCODE_BACKSLASH; + case Keyboard.KEY_COMMA: return Input.Keys.KEYCODE_COMMA; + case Keyboard.KEY_DELETE: return Input.Keys.KEYCODE_DEL; + case Keyboard.KEY_LEFT: return Input.Keys.KEYCODE_DPAD_LEFT; + case Keyboard.KEY_RIGHT: return Input.Keys.KEYCODE_DPAD_RIGHT; + case Keyboard.KEY_UP: return Input.Keys.KEYCODE_DPAD_UP; + case Keyboard.KEY_DOWN: return Input.Keys.KEYCODE_DPAD_DOWN; + case Keyboard.KEY_RETURN: return Input.Keys.KEYCODE_ENTER; + case Keyboard.KEY_HOME: return Input.Keys.KEYCODE_HOME; + case Keyboard.KEY_MINUS: return Input.Keys.KEYCODE_MINUS; + case Keyboard.KEY_PERIOD: return Input.Keys.KEYCODE_PERIOD; + case Keyboard.KEY_ADD: return Input.Keys.KEYCODE_PLUS; + case Keyboard.KEY_SEMICOLON: return Input.Keys.KEYCODE_SEMICOLON; + case Keyboard.KEY_LSHIFT: return Input.Keys.KEYCODE_SHIFT_LEFT; + case Keyboard.KEY_RSHIFT: return Input.Keys.KEYCODE_SHIFT_RIGHT; + case Keyboard.KEY_SLASH: return Input.Keys.KEYCODE_SLASH; + case Keyboard.KEY_SPACE: return Input.Keys.KEYCODE_SPACE; + case Keyboard.KEY_TAB: return Input.Keys.KEYCODE_TAB; + default: return Input.Keys.KEYCODE_UNKNOWN; + } } - public static int getKeyCodeReverse (int keyCode) { - if (keyCode == Input.Keys.KEYCODE_0) return Keyboard.KEY_0; - if (keyCode == Input.Keys.KEYCODE_1) return Keyboard.KEY_1; - if (keyCode == Input.Keys.KEYCODE_2) return Keyboard.KEY_2; - if (keyCode == Input.Keys.KEYCODE_3) return Keyboard.KEY_3; - if (keyCode == Input.Keys.KEYCODE_4) return Keyboard.KEY_4; - if (keyCode == Input.Keys.KEYCODE_5) return Keyboard.KEY_5; - if (keyCode == Input.Keys.KEYCODE_6) return Keyboard.KEY_6; - if (keyCode == Input.Keys.KEYCODE_7) return Keyboard.KEY_7; - if (keyCode == Input.Keys.KEYCODE_8) return Keyboard.KEY_8; - if (keyCode == Input.Keys.KEYCODE_9) return Keyboard.KEY_9; - if (keyCode == Input.Keys.KEYCODE_A) return Keyboard.KEY_A; - if (keyCode == Input.Keys.KEYCODE_B) return Keyboard.KEY_B; - if (keyCode == Input.Keys.KEYCODE_C) return Keyboard.KEY_C; - if (keyCode == Input.Keys.KEYCODE_D) return Keyboard.KEY_D; - if (keyCode == Input.Keys.KEYCODE_E) return Keyboard.KEY_E; - if (keyCode == Input.Keys.KEYCODE_F) return Keyboard.KEY_F; - if (keyCode == Input.Keys.KEYCODE_G) return Keyboard.KEY_G; - if (keyCode == Input.Keys.KEYCODE_H) return Keyboard.KEY_H; - if (keyCode == Input.Keys.KEYCODE_I) return Keyboard.KEY_I; - if (keyCode == Input.Keys.KEYCODE_J) return Keyboard.KEY_J; - if (keyCode == Input.Keys.KEYCODE_K) return Keyboard.KEY_K; - if (keyCode == Input.Keys.KEYCODE_L) return Keyboard.KEY_L; - if (keyCode == Input.Keys.KEYCODE_M) return Keyboard.KEY_M; - if (keyCode == Input.Keys.KEYCODE_N) return Keyboard.KEY_N; - if (keyCode == Input.Keys.KEYCODE_O) return Keyboard.KEY_O; - if (keyCode == Input.Keys.KEYCODE_P) return Keyboard.KEY_P; - if (keyCode == Input.Keys.KEYCODE_Q) return Keyboard.KEY_Q; - if (keyCode == Input.Keys.KEYCODE_R) return Keyboard.KEY_R; - if (keyCode == Input.Keys.KEYCODE_S) return Keyboard.KEY_S; - if (keyCode == Input.Keys.KEYCODE_T) return Keyboard.KEY_T; - if (keyCode == Input.Keys.KEYCODE_U) return Keyboard.KEY_U; - if (keyCode == Input.Keys.KEYCODE_V) return Keyboard.KEY_V; - if (keyCode == Input.Keys.KEYCODE_W) return Keyboard.KEY_W; - if (keyCode == Input.Keys.KEYCODE_X) return Keyboard.KEY_X; - if (keyCode == Input.Keys.KEYCODE_Y) return Keyboard.KEY_Y; - if (keyCode == Input.Keys.KEYCODE_Z) return Keyboard.KEY_Z; - if (keyCode == Input.Keys.KEYCODE_ALT_LEFT) return Keyboard.KEY_LMETA; - if (keyCode == Input.Keys.KEYCODE_ALT_RIGHT) return Keyboard.KEY_RMETA; - if (keyCode == Input.Keys.KEYCODE_BACKSLASH) return Keyboard.KEY_BACKSLASH; - if (keyCode == Input.Keys.KEYCODE_COMMA) return Keyboard.KEY_COMMA; - if (keyCode == Input.Keys.KEYCODE_DEL) return Keyboard.KEY_DELETE; - if (keyCode == Input.Keys.KEYCODE_DPAD_LEFT) return Keyboard.KEY_LEFT; - if (keyCode == Input.Keys.KEYCODE_DPAD_RIGHT) return Keyboard.KEY_RIGHT; - if (keyCode == Input.Keys.KEYCODE_DPAD_UP) return Keyboard.KEY_UP; - if (keyCode == Input.Keys.KEYCODE_DPAD_DOWN) return Keyboard.KEY_DOWN; - if (keyCode == Input.Keys.KEYCODE_ENTER) return Keyboard.KEY_RETURN; - if (keyCode == Input.Keys.KEYCODE_HOME) return Keyboard.KEY_HOME; - if (keyCode == Input.Keys.KEYCODE_MINUS) return Keyboard.KEY_MINUS; - if (keyCode == Input.Keys.KEYCODE_PERIOD) return Keyboard.KEY_PERIOD; - if (keyCode == Input.Keys.KEYCODE_PLUS) return Keyboard.KEY_ADD; - if (keyCode == Input.Keys.KEYCODE_SEMICOLON) return Keyboard.KEY_SEMICOLON; - if (keyCode == Input.Keys.KEYCODE_SHIFT_LEFT) return Keyboard.KEY_LSHIFT; - if (keyCode == Input.Keys.KEYCODE_SHIFT_RIGHT) return Keyboard.KEY_RSHIFT; - if (keyCode == Input.Keys.KEYCODE_SLASH) return Keyboard.KEY_SLASH; - if (keyCode == Input.Keys.KEYCODE_SPACE) return Keyboard.KEY_SPACE; - if (keyCode == Input.Keys.KEYCODE_TAB) return Keyboard.KEY_TAB; - return Keyboard.KEY_NONE; + public static int getLwjglKeyCode (int gdxKeyCode) { + switch (gdxKeyCode) { + case Input.Keys.KEYCODE_0: return Keyboard.KEY_0; + case Input.Keys.KEYCODE_1: return Keyboard.KEY_1; + case Input.Keys.KEYCODE_2: return Keyboard.KEY_2; + case Input.Keys.KEYCODE_3: return Keyboard.KEY_3; + case Input.Keys.KEYCODE_4: return Keyboard.KEY_4; + case Input.Keys.KEYCODE_5: return Keyboard.KEY_5; + case Input.Keys.KEYCODE_6: return Keyboard.KEY_6; + case Input.Keys.KEYCODE_7: return Keyboard.KEY_7; + case Input.Keys.KEYCODE_8: return Keyboard.KEY_8; + case Input.Keys.KEYCODE_9: return Keyboard.KEY_9; + case Input.Keys.KEYCODE_A: return Keyboard.KEY_A; + case Input.Keys.KEYCODE_B: return Keyboard.KEY_B; + case Input.Keys.KEYCODE_C: return Keyboard.KEY_C; + case Input.Keys.KEYCODE_D: return Keyboard.KEY_D; + case Input.Keys.KEYCODE_E: return Keyboard.KEY_E; + case Input.Keys.KEYCODE_F: return Keyboard.KEY_F; + case Input.Keys.KEYCODE_G: return Keyboard.KEY_G; + case Input.Keys.KEYCODE_H: return Keyboard.KEY_H; + case Input.Keys.KEYCODE_I: return Keyboard.KEY_I; + case Input.Keys.KEYCODE_J: return Keyboard.KEY_J; + case Input.Keys.KEYCODE_K: return Keyboard.KEY_K; + case Input.Keys.KEYCODE_L: return Keyboard.KEY_L; + case Input.Keys.KEYCODE_M: return Keyboard.KEY_M; + case Input.Keys.KEYCODE_N: return Keyboard.KEY_N; + case Input.Keys.KEYCODE_O: return Keyboard.KEY_O; + case Input.Keys.KEYCODE_P: return Keyboard.KEY_P; + case Input.Keys.KEYCODE_Q: return Keyboard.KEY_Q; + case Input.Keys.KEYCODE_R: return Keyboard.KEY_R; + case Input.Keys.KEYCODE_S: return Keyboard.KEY_S; + case Input.Keys.KEYCODE_T: return Keyboard.KEY_T; + case Input.Keys.KEYCODE_U: return Keyboard.KEY_U; + case Input.Keys.KEYCODE_V: return Keyboard.KEY_V; + case Input.Keys.KEYCODE_W: return Keyboard.KEY_W; + case Input.Keys.KEYCODE_X: return Keyboard.KEY_X; + case Input.Keys.KEYCODE_Y: return Keyboard.KEY_Y; + case Input.Keys.KEYCODE_Z: return Keyboard.KEY_Z; + case Input.Keys.KEYCODE_ALT_LEFT: return Keyboard.KEY_LMETA; + case Input.Keys.KEYCODE_ALT_RIGHT: return Keyboard.KEY_RMETA; + case Input.Keys.KEYCODE_BACKSLASH: return Keyboard.KEY_BACKSLASH; + case Input.Keys.KEYCODE_COMMA: return Keyboard.KEY_COMMA; + case Input.Keys.KEYCODE_DEL: return Keyboard.KEY_DELETE; + case Input.Keys.KEYCODE_DPAD_LEFT: return Keyboard.KEY_LEFT; + case Input.Keys.KEYCODE_DPAD_RIGHT: return Keyboard.KEY_RIGHT; + case Input.Keys.KEYCODE_DPAD_UP: return Keyboard.KEY_UP; + case Input.Keys.KEYCODE_DPAD_DOWN: return Keyboard.KEY_DOWN; + case Input.Keys.KEYCODE_ENTER: return Keyboard.KEY_RETURN; + case Input.Keys.KEYCODE_HOME: return Keyboard.KEY_HOME; + case Input.Keys.KEYCODE_MINUS: return Keyboard.KEY_MINUS; + case Input.Keys.KEYCODE_PERIOD: return Keyboard.KEY_PERIOD; + case Input.Keys.KEYCODE_PLUS: return Keyboard.KEY_ADD; + case Input.Keys.KEYCODE_SEMICOLON: return Keyboard.KEY_SEMICOLON; + case Input.Keys.KEYCODE_SHIFT_LEFT: return Keyboard.KEY_LSHIFT; + case Input.Keys.KEYCODE_SHIFT_RIGHT: return Keyboard.KEY_RSHIFT; + case Input.Keys.KEYCODE_SLASH: return Keyboard.KEY_SLASH; + case Input.Keys.KEYCODE_SPACE: return Keyboard.KEY_SPACE; + case Input.Keys.KEYCODE_TAB: return Keyboard.KEY_TAB; + default: return Keyboard.KEY_NONE; + } } public void update() { @@ -384,7 +386,7 @@ final class LwjglInput implements Input { if (Keyboard.isCreated()) { while (Keyboard.next()) { if (Keyboard.getEventKeyState()) { - int keyCode = getKeyCode(Keyboard.getEventKey()); + int keyCode = getGdxKeyCode(Keyboard.getEventKey()); char keyChar = Keyboard.getEventCharacter(); KeyEvent event = freeKeyEvents.newObject(); @@ -401,7 +403,7 @@ final class LwjglInput implements Input { pressedKeys++; } else { - int keyCode = LwjglInput.getKeyCode(Keyboard.getEventKey()); + int keyCode = LwjglInput.getGdxKeyCode(Keyboard.getEventKey()); KeyEvent event = freeKeyEvents.newObject(); event.keyCode = keyCode; diff --git a/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/TWL.java b/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/TWL.java index 525d35b45..735d0fa1a 100644 --- a/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/TWL.java +++ b/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/TWL.java @@ -80,11 +80,12 @@ public class TWL implements InputProcessor { /** * Sets the widget in the GUI's root pane. By default the root pane takes up the whole screen. + * @param widget If null, this method is equivalent to {@link #clear()}. */ public void setWidget (Widget widget) { Widget root = gui.getRootPane(); root.removeAllChildren(); - root.add(widget); + if (widget != null) root.add(widget); } /** @@ -134,7 +135,9 @@ public class TWL implements InputProcessor { } public boolean touchUp (int x, int y, int pointer) { - return gui.handleMouse(x, y, pointer, false); + boolean handled = gui.handleMouse(x, y, pointer, false); + gui.handleMouse(-9999, -9999, -1, true); + return handled; } public boolean touchDragged (int x, int y, int pointer) { @@ -147,63 +150,65 @@ public class TWL implements InputProcessor { } static public int getTwlKeyCode (int gdxKeyCode) { - if (gdxKeyCode == Input.Keys.KEYCODE_0) return Event.KEY_0; - if (gdxKeyCode == Input.Keys.KEYCODE_1) return Event.KEY_1; - if (gdxKeyCode == Input.Keys.KEYCODE_2) return Event.KEY_2; - if (gdxKeyCode == Input.Keys.KEYCODE_3) return Event.KEY_3; - if (gdxKeyCode == Input.Keys.KEYCODE_4) return Event.KEY_4; - if (gdxKeyCode == Input.Keys.KEYCODE_5) return Event.KEY_5; - if (gdxKeyCode == Input.Keys.KEYCODE_6) return Event.KEY_6; - if (gdxKeyCode == Input.Keys.KEYCODE_7) return Event.KEY_7; - if (gdxKeyCode == Input.Keys.KEYCODE_8) return Event.KEY_8; - if (gdxKeyCode == Input.Keys.KEYCODE_9) return Event.KEY_9; - if (gdxKeyCode == Input.Keys.KEYCODE_A) return Event.KEY_A; - if (gdxKeyCode == Input.Keys.KEYCODE_B) return Event.KEY_B; - if (gdxKeyCode == Input.Keys.KEYCODE_C) return Event.KEY_C; - if (gdxKeyCode == Input.Keys.KEYCODE_D) return Event.KEY_D; - if (gdxKeyCode == Input.Keys.KEYCODE_E) return Event.KEY_E; - if (gdxKeyCode == Input.Keys.KEYCODE_F) return Event.KEY_F; - if (gdxKeyCode == Input.Keys.KEYCODE_G) return Event.KEY_G; - if (gdxKeyCode == Input.Keys.KEYCODE_H) return Event.KEY_H; - if (gdxKeyCode == Input.Keys.KEYCODE_I) return Event.KEY_I; - if (gdxKeyCode == Input.Keys.KEYCODE_J) return Event.KEY_J; - if (gdxKeyCode == Input.Keys.KEYCODE_K) return Event.KEY_K; - if (gdxKeyCode == Input.Keys.KEYCODE_L) return Event.KEY_L; - if (gdxKeyCode == Input.Keys.KEYCODE_M) return Event.KEY_M; - if (gdxKeyCode == Input.Keys.KEYCODE_N) return Event.KEY_N; - if (gdxKeyCode == Input.Keys.KEYCODE_O) return Event.KEY_O; - if (gdxKeyCode == Input.Keys.KEYCODE_P) return Event.KEY_P; - if (gdxKeyCode == Input.Keys.KEYCODE_Q) return Event.KEY_Q; - if (gdxKeyCode == Input.Keys.KEYCODE_R) return Event.KEY_R; - if (gdxKeyCode == Input.Keys.KEYCODE_S) return Event.KEY_S; - if (gdxKeyCode == Input.Keys.KEYCODE_T) return Event.KEY_T; - if (gdxKeyCode == Input.Keys.KEYCODE_U) return Event.KEY_U; - if (gdxKeyCode == Input.Keys.KEYCODE_V) return Event.KEY_V; - if (gdxKeyCode == Input.Keys.KEYCODE_W) return Event.KEY_W; - if (gdxKeyCode == Input.Keys.KEYCODE_X) return Event.KEY_X; - if (gdxKeyCode == Input.Keys.KEYCODE_Y) return Event.KEY_Y; - if (gdxKeyCode == Input.Keys.KEYCODE_Z) return Event.KEY_Z; - if (gdxKeyCode == Input.Keys.KEYCODE_ALT_LEFT) return Event.KEY_LMETA; - if (gdxKeyCode == Input.Keys.KEYCODE_ALT_RIGHT) return Event.KEY_RMETA; - if (gdxKeyCode == Input.Keys.KEYCODE_BACKSLASH) return Event.KEY_BACKSLASH; - if (gdxKeyCode == Input.Keys.KEYCODE_COMMA) return Event.KEY_COMMA; - if (gdxKeyCode == Input.Keys.KEYCODE_DEL) return Event.KEY_DELETE; - if (gdxKeyCode == Input.Keys.KEYCODE_DPAD_LEFT) return Event.KEY_LEFT; - if (gdxKeyCode == Input.Keys.KEYCODE_DPAD_RIGHT) return Event.KEY_RIGHT; - if (gdxKeyCode == Input.Keys.KEYCODE_DPAD_UP) return Event.KEY_UP; - if (gdxKeyCode == Input.Keys.KEYCODE_DPAD_DOWN) return Event.KEY_DOWN; - if (gdxKeyCode == Input.Keys.KEYCODE_ENTER) return Event.KEY_RETURN; - if (gdxKeyCode == Input.Keys.KEYCODE_HOME) return Event.KEY_HOME; - if (gdxKeyCode == Input.Keys.KEYCODE_MINUS) return Event.KEY_MINUS; - if (gdxKeyCode == Input.Keys.KEYCODE_PERIOD) return Event.KEY_PERIOD; - if (gdxKeyCode == Input.Keys.KEYCODE_PLUS) return Event.KEY_ADD; - if (gdxKeyCode == Input.Keys.KEYCODE_SEMICOLON) return Event.KEY_SEMICOLON; - if (gdxKeyCode == Input.Keys.KEYCODE_SHIFT_LEFT) return Event.KEY_LSHIFT; - if (gdxKeyCode == Input.Keys.KEYCODE_SHIFT_RIGHT) return Event.KEY_RSHIFT; - if (gdxKeyCode == Input.Keys.KEYCODE_SLASH) return Event.KEY_SLASH; - if (gdxKeyCode == Input.Keys.KEYCODE_SPACE) return Event.KEY_SPACE; - if (gdxKeyCode == Input.Keys.KEYCODE_TAB) return Event.KEY_TAB; - return Event.KEY_NONE; + switch (gdxKeyCode) { + case Input.Keys.KEYCODE_0: return Event.KEY_0; + case Input.Keys.KEYCODE_1: return Event.KEY_1; + case Input.Keys.KEYCODE_2: return Event.KEY_2; + case Input.Keys.KEYCODE_3: return Event.KEY_3; + case Input.Keys.KEYCODE_4: return Event.KEY_4; + case Input.Keys.KEYCODE_5: return Event.KEY_5; + case Input.Keys.KEYCODE_6: return Event.KEY_6; + case Input.Keys.KEYCODE_7: return Event.KEY_7; + case Input.Keys.KEYCODE_8: return Event.KEY_8; + case Input.Keys.KEYCODE_9: return Event.KEY_9; + case Input.Keys.KEYCODE_A: return Event.KEY_A; + case Input.Keys.KEYCODE_B: return Event.KEY_B; + case Input.Keys.KEYCODE_C: return Event.KEY_C; + case Input.Keys.KEYCODE_D: return Event.KEY_D; + case Input.Keys.KEYCODE_E: return Event.KEY_E; + case Input.Keys.KEYCODE_F: return Event.KEY_F; + case Input.Keys.KEYCODE_G: return Event.KEY_G; + case Input.Keys.KEYCODE_H: return Event.KEY_H; + case Input.Keys.KEYCODE_I: return Event.KEY_I; + case Input.Keys.KEYCODE_J: return Event.KEY_J; + case Input.Keys.KEYCODE_K: return Event.KEY_K; + case Input.Keys.KEYCODE_L: return Event.KEY_L; + case Input.Keys.KEYCODE_M: return Event.KEY_M; + case Input.Keys.KEYCODE_N: return Event.KEY_N; + case Input.Keys.KEYCODE_O: return Event.KEY_O; + case Input.Keys.KEYCODE_P: return Event.KEY_P; + case Input.Keys.KEYCODE_Q: return Event.KEY_Q; + case Input.Keys.KEYCODE_R: return Event.KEY_R; + case Input.Keys.KEYCODE_S: return Event.KEY_S; + case Input.Keys.KEYCODE_T: return Event.KEY_T; + case Input.Keys.KEYCODE_U: return Event.KEY_U; + case Input.Keys.KEYCODE_V: return Event.KEY_V; + case Input.Keys.KEYCODE_W: return Event.KEY_W; + case Input.Keys.KEYCODE_X: return Event.KEY_X; + case Input.Keys.KEYCODE_Y: return Event.KEY_Y; + case Input.Keys.KEYCODE_Z: return Event.KEY_Z; + case Input.Keys.KEYCODE_ALT_LEFT: return Event.KEY_LMETA; + case Input.Keys.KEYCODE_ALT_RIGHT: return Event.KEY_RMETA; + case Input.Keys.KEYCODE_BACKSLASH: return Event.KEY_BACKSLASH; + case Input.Keys.KEYCODE_COMMA: return Event.KEY_COMMA; + case Input.Keys.KEYCODE_DEL: return Event.KEY_DELETE; + case Input.Keys.KEYCODE_DPAD_LEFT: return Event.KEY_LEFT; + case Input.Keys.KEYCODE_DPAD_RIGHT: return Event.KEY_RIGHT; + case Input.Keys.KEYCODE_DPAD_UP: return Event.KEY_UP; + case Input.Keys.KEYCODE_DPAD_DOWN: return Event.KEY_DOWN; + case Input.Keys.KEYCODE_ENTER: return Event.KEY_RETURN; + case Input.Keys.KEYCODE_HOME: return Event.KEY_HOME; + case Input.Keys.KEYCODE_MINUS: return Event.KEY_MINUS; + case Input.Keys.KEYCODE_PERIOD: return Event.KEY_PERIOD; + case Input.Keys.KEYCODE_PLUS: return Event.KEY_ADD; + case Input.Keys.KEYCODE_SEMICOLON: return Event.KEY_SEMICOLON; + case Input.Keys.KEYCODE_SHIFT_LEFT: return Event.KEY_LSHIFT; + case Input.Keys.KEYCODE_SHIFT_RIGHT: return Event.KEY_RSHIFT; + case Input.Keys.KEYCODE_SLASH: return Event.KEY_SLASH; + case Input.Keys.KEYCODE_SPACE: return Event.KEY_SPACE; + case Input.Keys.KEYCODE_TAB: return Event.KEY_TAB; + default: return Event.KEY_NONE; + } } /** diff --git a/gdx/src/com/badlogic/gdx/Game.java b/gdx/src/com/badlogic/gdx/Game.java index b3d0f0c73..e3e25c12b 100644 --- a/gdx/src/com/badlogic/gdx/Game.java +++ b/gdx/src/com/badlogic/gdx/Game.java @@ -8,7 +8,7 @@ package com.badlogic.gdx; * screen is set. */ public abstract class Game implements ApplicationListener { - Screen screen; + private Screen screen; @Override public void dispose () { if (screen != null) screen.hide(); diff --git a/gdx/src/com/badlogic/gdx/Input.java b/gdx/src/com/badlogic/gdx/Input.java index 296fb3331..745507110 100644 --- a/gdx/src/com/badlogic/gdx/Input.java +++ b/gdx/src/com/badlogic/gdx/Input.java @@ -50,106 +50,106 @@ public interface Input { * */ public class Keys { - public static int ANY_KEY = -1; - public static int KEYCODE_0 = 7; - public static int KEYCODE_1 = 8; - public static int KEYCODE_2 = 9; - public static int KEYCODE_3 = 10; - public static int KEYCODE_4 = 11; - public static int KEYCODE_5 = 12; - public static int KEYCODE_6 = 13; - public static int KEYCODE_7 = 14; - public static int KEYCODE_8 = 15; - public static int KEYCODE_9 = 16; - public static int KEYCODE_A = 29; - public static int KEYCODE_ALT_LEFT = 57; - public static int KEYCODE_ALT_RIGHT = 58; - public static int KEYCODE_APOSTROPHE = 75; - public static int KEYCODE_AT = 77; - public static int KEYCODE_B = 30; - public static int KEYCODE_BACK = 4; - public static int KEYCODE_BACKSLASH = 73; - public static int KEYCODE_C = 31; - public static int KEYCODE_CALL = 5; - public static int KEYCODE_CAMERA = 27; - public static int KEYCODE_CLEAR = 28; - public static int KEYCODE_COMMA = 55; - public static int KEYCODE_D = 32; - public static int KEYCODE_DEL = 67; - public static int KEYCODE_DPAD_CENTER = 23; - public static int KEYCODE_DPAD_DOWN = 20; - public static int KEYCODE_DPAD_LEFT = 21; - public static int KEYCODE_DPAD_RIGHT = 22; - public static int KEYCODE_DPAD_UP = 19; - public static int KEYCODE_E = 33; - public static int KEYCODE_ENDCALL = 6; - public static int KEYCODE_ENTER = 66; - public static int KEYCODE_ENVELOPE = 65; - public static int KEYCODE_EQUALS = 70; - public static int KEYCODE_EXPLORER = 64; - public static int KEYCODE_F = 34; - public static int KEYCODE_FOCUS = 80; - public static int KEYCODE_G = 35; - public static int KEYCODE_GRAVE = 68; - public static int KEYCODE_H = 36; - public static int KEYCODE_HEADSETHOOK = 79; - public static int KEYCODE_HOME = 3; - public static int KEYCODE_I = 37; - public static int KEYCODE_J = 38; - public static int KEYCODE_K = 39; - public static int KEYCODE_L = 40; - public static int KEYCODE_LEFT_BRACKET = 71; - public static int KEYCODE_M = 41; - public static int KEYCODE_MEDIA_FAST_FORWARD = 90; - public static int KEYCODE_MEDIA_NEXT = 87; - public static int KEYCODE_MEDIA_PLAY_PAUSE = 85; - public static int KEYCODE_MEDIA_PREVIOUS = 88; - public static int KEYCODE_MEDIA_REWIND = 89; - public static int KEYCODE_MEDIA_STOP = 86; - public static int KEYCODE_MENU = 82; - public static int KEYCODE_MINUS = 69; - public static int KEYCODE_MUTE = 91; - public static int KEYCODE_N = 42; - public static int KEYCODE_NOTIFICATION = 83; - public static int KEYCODE_NUM = 78; - public static int KEYCODE_O = 43; - public static int KEYCODE_P = 44; - public static int KEYCODE_PERIOD = 56; - public static int KEYCODE_PLUS = 81; - public static int KEYCODE_POUND = 18; - public static int KEYCODE_POWER = 26; - public static int KEYCODE_Q = 45; - public static int KEYCODE_R = 46; - public static int KEYCODE_RIGHT_BRACKET = 72; - public static int KEYCODE_S = 47; - public static int KEYCODE_SEARCH = 84; - public static int KEYCODE_SEMICOLON = 74; - public static int KEYCODE_SHIFT_LEFT = 59; - public static int KEYCODE_SHIFT_RIGHT = 60; - public static int KEYCODE_SLASH = 76; - public static int KEYCODE_SOFT_LEFT = 1; - public static int KEYCODE_SOFT_RIGHT = 2; - public static int KEYCODE_SPACE = 62; - public static int KEYCODE_STAR = 17; - public static int KEYCODE_SYM = 63; - public static int KEYCODE_T = 48; - public static int KEYCODE_TAB = 61; - public static int KEYCODE_U = 49; - public static int KEYCODE_UNKNOWN = 0; - public static int KEYCODE_V = 50; - public static int KEYCODE_VOLUME_DOWN = 25; - public static int KEYCODE_VOLUME_UP = 24; - public static int KEYCODE_W = 51; - public static int KEYCODE_X = 52; - public static int KEYCODE_Y = 53; - public static int KEYCODE_Z = 54; - public static int META_ALT_LEFT_ON = 16; - public static int META_ALT_ON = 2; - public static int META_ALT_RIGHT_ON = 32; - public static int META_SHIFT_LEFT_ON = 64; - public static int META_SHIFT_ON = 1; - public static int META_SHIFT_RIGHT_ON = 128; - public static int META_SYM_ON = 4; + public static final int ANY_KEY = -1; + public static final int KEYCODE_0 = 7; + public static final int KEYCODE_1 = 8; + public static final int KEYCODE_2 = 9; + public static final int KEYCODE_3 = 10; + public static final int KEYCODE_4 = 11; + public static final int KEYCODE_5 = 12; + public static final int KEYCODE_6 = 13; + public static final int KEYCODE_7 = 14; + public static final int KEYCODE_8 = 15; + public static final int KEYCODE_9 = 16; + public static final int KEYCODE_A = 29; + public static final int KEYCODE_ALT_LEFT = 57; + public static final int KEYCODE_ALT_RIGHT = 58; + public static final int KEYCODE_APOSTROPHE = 75; + public static final int KEYCODE_AT = 77; + public static final int KEYCODE_B = 30; + public static final int KEYCODE_BACK = 4; + public static final int KEYCODE_BACKSLASH = 73; + public static final int KEYCODE_C = 31; + public static final int KEYCODE_CALL = 5; + public static final int KEYCODE_CAMERA = 27; + public static final int KEYCODE_CLEAR = 28; + public static final int KEYCODE_COMMA = 55; + public static final int KEYCODE_D = 32; + public static final int KEYCODE_DEL = 67; + public static final int KEYCODE_DPAD_CENTER = 23; + public static final int KEYCODE_DPAD_DOWN = 20; + public static final int KEYCODE_DPAD_LEFT = 21; + public static final int KEYCODE_DPAD_RIGHT = 22; + public static final int KEYCODE_DPAD_UP = 19; + public static final int KEYCODE_E = 33; + public static final int KEYCODE_ENDCALL = 6; + public static final int KEYCODE_ENTER = 66; + public static final int KEYCODE_ENVELOPE = 65; + public static final int KEYCODE_EQUALS = 70; + public static final int KEYCODE_EXPLORER = 64; + public static final int KEYCODE_F = 34; + public static final int KEYCODE_FOCUS = 80; + public static final int KEYCODE_G = 35; + public static final int KEYCODE_GRAVE = 68; + public static final int KEYCODE_H = 36; + public static final int KEYCODE_HEADSETHOOK = 79; + public static final int KEYCODE_HOME = 3; + public static final int KEYCODE_I = 37; + public static final int KEYCODE_J = 38; + public static final int KEYCODE_K = 39; + public static final int KEYCODE_L = 40; + public static final int KEYCODE_LEFT_BRACKET = 71; + public static final int KEYCODE_M = 41; + public static final int KEYCODE_MEDIA_FAST_FORWARD = 90; + public static final int KEYCODE_MEDIA_NEXT = 87; + public static final int KEYCODE_MEDIA_PLAY_PAUSE = 85; + public static final int KEYCODE_MEDIA_PREVIOUS = 88; + public static final int KEYCODE_MEDIA_REWIND = 89; + public static final int KEYCODE_MEDIA_STOP = 86; + public static final int KEYCODE_MENU = 82; + public static final int KEYCODE_MINUS = 69; + public static final int KEYCODE_MUTE = 91; + public static final int KEYCODE_N = 42; + public static final int KEYCODE_NOTIFICATION = 83; + public static final int KEYCODE_NUM = 78; + public static final int KEYCODE_O = 43; + public static final int KEYCODE_P = 44; + public static final int KEYCODE_PERIOD = 56; + public static final int KEYCODE_PLUS = 81; + public static final int KEYCODE_POUND = 18; + public static final int KEYCODE_POWER = 26; + public static final int KEYCODE_Q = 45; + public static final int KEYCODE_R = 46; + public static final int KEYCODE_RIGHT_BRACKET = 72; + public static final int KEYCODE_S = 47; + public static final int KEYCODE_SEARCH = 84; + public static final int KEYCODE_SEMICOLON = 74; + public static final int KEYCODE_SHIFT_LEFT = 59; + public static final int KEYCODE_SHIFT_RIGHT = 60; + public static final int KEYCODE_SLASH = 76; + public static final int KEYCODE_SOFT_LEFT = 1; + public static final int KEYCODE_SOFT_RIGHT = 2; + public static final int KEYCODE_SPACE = 62; + public static final int KEYCODE_STAR = 17; + public static final int KEYCODE_SYM = 63; + public static final int KEYCODE_T = 48; + public static final int KEYCODE_TAB = 61; + public static final int KEYCODE_U = 49; + public static final int KEYCODE_UNKNOWN = 0; + public static final int KEYCODE_V = 50; + public static final int KEYCODE_VOLUME_DOWN = 25; + public static final int KEYCODE_VOLUME_UP = 24; + public static final int KEYCODE_W = 51; + public static final int KEYCODE_X = 52; + public static final int KEYCODE_Y = 53; + public static final int KEYCODE_Z = 54; + public static final int META_ALT_LEFT_ON = 16; + public static final int META_ALT_ON = 2; + public static final int META_ALT_RIGHT_ON = 32; + public static final int META_SHIFT_LEFT_ON = 64; + public static final int META_SHIFT_ON = 1; + public static final int META_SHIFT_RIGHT_ON = 128; + public static final int META_SYM_ON = 4; } /** diff --git a/gdx/src/com/badlogic/gdx/Screen.java b/gdx/src/com/badlogic/gdx/Screen.java index baeeff206..ecd031a9b 100644 --- a/gdx/src/com/badlogic/gdx/Screen.java +++ b/gdx/src/com/badlogic/gdx/Screen.java @@ -7,46 +7,40 @@ package com.badlogic.gdx; * Note that {@link #dispose()} is not called automatically. * @see Game */ -public abstract class Screen { +public interface Screen { /** * Called when the screen should render itself. * @param delta The time in seconds since the last render. */ - public abstract void render (float delta); + public void render (float delta); /** * @see ApplicationListener#resize(int, int) */ - public void resize (int width, int height) { - } + public void resize (int width, int height); /** * Called when this screen becomes the current screen for a {@link Game}. */ - public void show () { - } + public void show (); /** * Called when this screen is no longer the current screen for a {@link Game}. */ - public void hide () { - } + public void hide (); /** * @see ApplicationListener#pause() */ - public void pause () { - } + public void pause (); /** * @see ApplicationListener#resume() */ - public void resume () { - } + public void resume (); /** * Called when this screen should release all resources. */ - public void dispose () { - } + public void dispose (); }