[changed] moah fixes to metagun works on android now as well :p

diff --git a/demos/metagun/metagun-desktop/src/com/mojang/metagun/Input.java b/demos/metagun/metagun-desktop/src/com/mojang/metagun/Input.java
index 9b8513c..53dfb3f 100644 (file)
--- a/demos/metagun/metagun-desktop/src/com/mojang/metagun/Input.java
+++ b/demos/metagun/metagun-desktop/src/com/mojang/metagun/Input.java
@@ -1,9 +1,11 @@
 package com.mojang.metagun;\r
 \r
 import com.badlogic.gdx.Input.Keys;\r
+import com.badlogic.gdx.Gdx;\r
 import com.badlogic.gdx.InputAdapter;\r
+import com.badlogic.gdx.InputProcessor;\r
 \r
-public class Input extends InputAdapter {\r
+public class Input implements InputProcessor {\r
     public static final int UP = 0;\r
     public static final int DOWN = 1;\r
     public static final int LEFT = 2;\r
@@ -41,9 +43,18 @@ public class Input extends InputAdapter {
     }\r
 \r
     public void tick() {\r
+        if(Gdx.input.getAccelerometerY() < -1.2f)\r
+                set(Keys.KEYCODE_DPAD_LEFT, true);\r
+        else if(Gdx.input.getAccelerometerY() > 1.2f)\r
+                set(Keys.KEYCODE_DPAD_RIGHT, true);\r
+        else {\r
+                set(Keys.KEYCODE_DPAD_LEFT, false);\r
+                set(Keys.KEYCODE_DPAD_RIGHT, false);\r
+        }\r
+        \r
         for (int i = 0; i < buttons.length; i++) {\r
             oldButtons[i] = buttons[i];\r
-        }\r
+        }               \r
     }\r
 \r
 \r
@@ -66,5 +77,31 @@ public class Input extends InputAdapter {
        @Override public boolean keyTyped (char character) {\r
                // TODO Auto-generated method stub\r
                return false;\r
+       }\r
+\r
+       @Override public boolean touchDown (int x, int y, int pointer, int button) {\r
+               if(x < Gdx.graphics.getWidth() / 5) \r
+                       set(Keys.KEYCODE_Z, true);\r
+               if(x > Gdx.graphics.getWidth() - Gdx.graphics.getWidth() / 5)\r
+                       set(Keys.KEYCODE_Y, true);\r
+               return false;\r
+       }\r
+\r
+       @Override public boolean touchUp (int x, int y, int pointer, int button) {              \r
+               set(Keys.KEYCODE_Z, false);             \r
+               set(Keys.KEYCODE_Y, false);\r
+               return false;\r
+       }\r
+\r
+       @Override public boolean touchDragged (int x, int y, int pointer) {             \r
+               return false;\r
+       }\r
+\r
+       @Override public boolean touchMoved (int x, int y) {\r
+               return false;\r
+       }\r
+\r
+       @Override public boolean scrolled (int amount) {\r
+               return false;\r
        }       \r
 }\r

diff --git a/demos/metagun/metagun-desktop/src/com/mojang/metagun/Metagun.java b/demos/metagun/metagun-desktop/src/com/mojang/metagun/Metagun.java
index c552a53..afe1f3b 100644 (file)
--- a/demos/metagun/metagun-desktop/src/com/mojang/metagun/Metagun.java
+++ b/demos/metagun/metagun-desktop/src/com/mojang/metagun/Metagun.java
@@ -27,12 +27,13 @@ public class Metagun implements ApplicationListener {
        \r
        public void create() {\r
                Art.load();\r
+               Sound.load();\r
                Gdx.input.setInputProcessor(input);\r
                running = true;\r
 //             setScreen(new TitleScreen());\r
                setScreen(new GameScreen());\r
-               font = new BitmapFont();        \r
-               batch = new SpriteBatch();\r
+//             font = new BitmapFont();        \r
+//             batch = new SpriteBatch();\r
        }\r
 \r
        public void pause() {\r
@@ -60,9 +61,9 @@ public class Metagun implements ApplicationListener {
                        accum -= 1.0f / 60.0f;\r
                }\r
                screen.render();        \r
-               batch.begin();\r
-               font.draw(batch, "fps: " + Gdx.graphics.getFramesPerSecond(), 10, 30);\r
-               batch.end();\r
+//             batch.begin();\r
+//             font.draw(batch, "fps: " + Gdx.graphics.getFramesPerSecond(), 10, 30);\r
+//             batch.end();\r
        }\r
 \r
        public void keyPressed(KeyEvent ke) {\r

diff --git a/demos/metagun/metagun-desktop/src/com/mojang/metagun/Sound.java b/demos/metagun/metagun-desktop/src/com/mojang/metagun/Sound.java
index 05f9940..27838da 100644 (file)
--- a/demos/metagun/metagun-desktop/src/com/mojang/metagun/Sound.java
+++ b/demos/metagun/metagun-desktop/src/com/mojang/metagun/Sound.java
@@ -1,69 +1,34 @@
 package com.mojang.metagun;\r
 \r
-import java.io.*;\r
-\r
-import javax.sound.sampled.*;\r
+import com.badlogic.gdx.Gdx;\r
 \r
 public class Sound {\r
-    public static class Clips {\r
-        public Clip[] clips;\r
-        private int p;\r
-        private int count;\r
-        \r
-        public Clips(byte[] buffer, int count) throws LineUnavailableException, IOException, UnsupportedAudioFileException {\r
-            if (buffer==null) return;\r
-            \r
-            clips = new Clip[count];\r
-            this.count = count;\r
-            for (int i=0; i<count; i++) {\r
-                clips[i] = AudioSystem.getClip();\r
-                clips[i].open(AudioSystem.getAudioInputStream(new ByteArrayInputStream(buffer)));\r
-            }\r
-        }\r
-        \r
-        public void play() {\r
-            if (clips==null) return;\r
-\r
-            clips[p].stop();\r
-            clips[p].setFramePosition(0);\r
-            clips[p].start();\r
-            p++;\r
-            if (p>=count) p = 0;\r
-        }\r
-    }\r
-    public static Clips boom = load("/boom.wav", 4);\r
-    public static Clips hit = load("/hit.wav", 4);\r
-    public static Clips splat = load("/splat.wav", 4);\r
-    public static Clips launch = load("/launch.wav", 4);\r
-    public static Clips pew = load("/pew.wav", 4);\r
-    public static Clips oof = load("/oof.wav", 4);\r
-    public static Clips gethat = load("/gethat.wav", 4);\r
-    public static Clips death = load("/death.wav", 4);\r
-    public static Clips startgame = load("/startgame.wav", 1);\r
-    public static Clips jump = load("/jump.wav", 1);\r
-\r
-    private static Clips load(String name, int count) {\r
-        try {\r
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();\r
-            DataInputStream dis = new DataInputStream(Sound.class.getResourceAsStream(name));\r
-            byte[] buffer = new byte[1024];\r
-            int read = 0;\r
-            while ((read = dis.read(buffer)) >= 0) {\r
-                baos.write(buffer, 0, read);\r
-            }\r
-            dis.close();\r
-            \r
-            byte[] data = baos.toByteArray();\r
-            return new Clips(data, count);\r
-        } catch (Exception e) {\r
-            try {\r
-                return new Clips(null, 0);\r
-            } catch (Exception ee) {\r
-                return null;\r
-            }\r
-        }\r
-    }\r
+    \r
+    public static com.badlogic.gdx.audio.Sound boom;\r
+    public static com.badlogic.gdx.audio.Sound hit;\r
+    public static com.badlogic.gdx.audio.Sound splat;\r
+    public static com.badlogic.gdx.audio.Sound launch;\r
+    public static com.badlogic.gdx.audio.Sound pew;\r
+    public static com.badlogic.gdx.audio.Sound oof;\r
+    public static com.badlogic.gdx.audio.Sound gethat;\r
+    public static com.badlogic.gdx.audio.Sound death;\r
+    public static com.badlogic.gdx.audio.Sound startgame;\r
+    public static com.badlogic.gdx.audio.Sound jump;\r
 \r
-    public static void touch() {\r
+    public static void load() {\r
+        boom = load("res/boom.wav");\r
+        hit = load("res/hit.wav");\r
+        splat = load("res/splat.wav");\r
+        launch = load("res/launch.wav");\r
+        pew = load("res/pew.wav");\r
+        oof = load("res/oof.wav");\r
+        gethat = load("res/gethat.wav");\r
+        death = load("res/death.wav");\r
+        startgame = load("res/startgame.wav");\r
+        jump = load("res/jump.wav");\r
     }\r
+    \r
+    private static com.badlogic.gdx.audio.Sound load(String name) {\r
+        return Gdx.audio.newSound(Gdx.files.internal(name));\r
+    }       \r
 }\r

diff --git a/demos/metagun/metagun-desktop/src/com/mojang/metagun/entity/Entity.java b/demos/metagun/metagun-desktop/src/com/mojang/metagun/entity/Entity.java
index fedb731..7d3b0d9 100644 (file)
--- a/demos/metagun/metagun-desktop/src/com/mojang/metagun/entity/Entity.java
+++ b/demos/metagun/metagun-desktop/src/com/mojang/metagun/entity/Entity.java
@@ -1,9 +1,9 @@
 package com.mojang.metagun.entity;\r
 \r
-import java.awt.Graphics;\r
 import java.util.Random;\r
 \r
-import com.mojang.metagun.level.*;\r
+import com.mojang.metagun.level.Camera;\r
+import com.mojang.metagun.level.Level;\r
 import com.mojang.metagun.screen.Screen;\r
 \r
 public abstract class Entity {\r

diff --git a/demos/metagun/metagun-desktop/src/com/mojang/metagun/screen/SignReadScreen.java b/demos/metagun/metagun-desktop/src/com/mojang/metagun/screen/SignReadScreen.java
index bdfef9d..090eeed 100644 (file)
--- a/demos/metagun/metagun-desktop/src/com/mojang/metagun/screen/SignReadScreen.java
+++ b/demos/metagun/metagun-desktop/src/com/mojang/metagun/screen/SignReadScreen.java
@@ -1,5 +1,6 @@
 package com.mojang.metagun.screen;\r
 \r
+import com.badlogic.gdx.Gdx;\r
 import com.mojang.metagun.Art;\r
 import com.mojang.metagun.Input;\r
 \r
@@ -192,7 +193,8 @@ public class SignReadScreen extends Screen {
     }\r
     \r
     public void tick(Input input) {\r
-        if (!input.oldButtons[Input.ESCAPE] && input.buttons[Input.ESCAPE]) {\r
+        if (!input.oldButtons[Input.ESCAPE] && input.buttons[Input.ESCAPE] ||\r
+           Gdx.input.isTouched()) {\r
             setScreen(parent);\r
             return;\r
         }\r

diff --git a/demos/metagun/metagun-desktop/src/com/mojang/metagun/screen/exposition.txt b/demos/metagun/metagun-desktop/src/com/mojang/metagun/screen/exposition.txt
deleted file mode 100644 (file)
index 6fbbd03..0000000
--- a/demos/metagun/metagun-desktop/src/com/mojang/metagun/screen/exposition.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-              METAGUN\r
-\r
-\r
-\r
-  ABOUT             \r
-\r
-METAGUN WAS MADE BY MARKUS PERSSON IN\r
-AUGUST 2010 FOR LUDUM DARE 18,\r
-A COMPETITION WHERE YOU MAKE A GAME\r
-DURING A SINGLE WEEKEND.\r
-\r
-\r
-THE THEME OF THE COMPETITION WAS\r
-"ENEMIES AS WEAPONS".\r
-\r
-\r
-\r
-  \r
-  \r
-  THE STORY SO FAR\r
-  \r
-RECENTLY, THE POLITICAL CLIMATE HAS\r
-GROWN WEIRD. SEVERAL COUNTRIES HAVE\r
-DECLARED THEMSELVES ROADLESS, AND\r
-SOMETHING SOMETHING IN THE MONTH OF MAY.\r
-ANYWAY, YOU FIND THIS TOTALLY AWESOME\r
-GUN THAT SHOOTS SMALLER PEOPLE WITH GUNS\r
-WHO IN TURN SHOOT YOU!\r
-\r
-\r
-AWESOME!\r
-\r
-\r
-\r
-\r
-\r
-  CONTROLS\r
-  \r
-USE THE ARROWS KEYS TO MOVE\r
-PRESS Z, A, C OR D TO JUMP\r
-PRESS X OR S TO FIRE\r
-PRESS ESCAPE TO PAUSE THE GAME\r
-\r
-\r
-ONCE YOU GET THE GUN, YOU CAN AIM UP\r
-AND DOWN BY PRESSING UP AND DOWN\r
-\r
-\r
-\r
-\r
-  SELECTED WORDS STARTING WITH F\r
-  \r
-FISH, FREEDOM, FIGURE, FOOT, FORK,\r
-FLOOD, FATAL, FUNGUS, FAX, FILM, FOG,\r
-FATTY, FOOT AGAIN, FELT, GNOME, F'TANG,\r
-\r
-\r
-NO WAIT GNOME STARTS WITH G, I WILL\r
-START OVER!\r
-\r
-  \r
-FISH, FREEDOM, FIGURE, FOOT, FORK,\r
-FLOOD, FATAL, FUNGUS, FAX, FILM, FOG,\r
-FATTY, FOOT AGAIN, FELT, F'TANG,\r
-FONE BONE, FADE, FORCE, FURBISH, FELONY,\r
-FEDORA.\r
-\r
-\r
-\r
-\r
-  THANK YOU\r
-  \r
-ELIN <3\r
-\r
-POV AND THE REST OF THE LD TEAM\r
-\r
-EVERYONE PARTICIPATING IN LD18\r
-\r
-EVERY SINGLE ONE WHO WASTED TIME\r
-WATCHING ME DEVELOP THIS GAME LIVE,\r
-AND EVERYONE WHO CAME WITH FEEDBACK\r
-\r
-DRPETTER FOR SFXR\r
-\r
-VALVE FOR TOTALLY RELEASING EP3 SOON
\ No newline at end of file