OSDN Git Service

[fixed] If aids.
authornathan.sweet <nathan.sweet@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Thu, 4 Nov 2010 05:08:32 +0000 (05:08 +0000)
committernathan.sweet <nathan.sweet@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Thu, 4 Nov 2010 05:08:32 +0000 (05:08 +0000)
[changed] Screen to interface.

backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglInput.java
extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/TWL.java
gdx/src/com/badlogic/gdx/Game.java
gdx/src/com/badlogic/gdx/Input.java
gdx/src/com/badlogic/gdx/Screen.java

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