From 9feb42ff3f5c615a609c0b156090c08326c56565 Mon Sep 17 00:00:00 2001 From: shebang Date: Thu, 18 Dec 2014 14:30:34 +0100 Subject: [PATCH 1/3] added Classloader without exception handling to audio --- HeatUp/src/de/heatup/audio/AudioFiles.java | 2 +- HeatUp/src/de/heatup/audio/AudioPlayer.java | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/HeatUp/src/de/heatup/audio/AudioFiles.java b/HeatUp/src/de/heatup/audio/AudioFiles.java index 19505f9..1f68fb4 100644 --- a/HeatUp/src/de/heatup/audio/AudioFiles.java +++ b/HeatUp/src/de/heatup/audio/AudioFiles.java @@ -3,7 +3,7 @@ package de.heatup.audio; public class AudioFiles { //base path - private static final String basePath = "src/de/heatup/resources/audio/"; + private static final String basePath = "de/heatup/resources/audio/"; //sound files private String Invaders; diff --git a/HeatUp/src/de/heatup/audio/AudioPlayer.java b/HeatUp/src/de/heatup/audio/AudioPlayer.java index 5e13e2a..fe02cd4 100644 --- a/HeatUp/src/de/heatup/audio/AudioPlayer.java +++ b/HeatUp/src/de/heatup/audio/AudioPlayer.java @@ -10,7 +10,11 @@ import javax.sound.sampled.LineListener; public class AudioPlayer { - public AudioPlayer() {} + private ClassLoader cl; + + public AudioPlayer() { + this.cl = Thread.currentThread().getContextClassLoader(); + } /** plays a file once */ public void play(String file) { @@ -26,13 +30,17 @@ public class AudioPlayer { } }); + /** File f = new File(file); if(!f.exists()) { System.out.println("File not found: " + f.getAbsolutePath()); return; - } + } + */ - clip.open(AudioSystem.getAudioInputStream(f)); + + + clip.open(AudioSystem.getAudioInputStream(cl.getResourceAsStream(file))); clip.start(); } catch (Exception e) { @@ -54,13 +62,15 @@ public class AudioPlayer { } }); + /** File f = new File(file); if(!f.exists()) { System.out.println("File not found: " + f.getAbsolutePath()); return; - } + } + */ - clip.open(AudioSystem.getAudioInputStream(f)); + clip.open(AudioSystem.getAudioInputStream(cl.getResourceAsStream(file))); clip.loop(clip.LOOP_CONTINUOUSLY); } catch(Exception e) { From 807456d0a1b013636c6ffd617a0fb3d0532193c7 Mon Sep 17 00:00:00 2001 From: andreas Date: Thu, 18 Dec 2014 14:47:31 +0100 Subject: [PATCH 2/3] Keybindings angepasst. --- HeatUp/src/de/heatup/objects/ImageLoader.java | 3 --- HeatUp/src/de/heatup/ui/Main.java | 25 ++++++++++++++++--- HeatUp/src/de/heatup/ui/PanelBuilder.java | 2 +- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/HeatUp/src/de/heatup/objects/ImageLoader.java b/HeatUp/src/de/heatup/objects/ImageLoader.java index 06b0ab2..8bbbe4f 100644 --- a/HeatUp/src/de/heatup/objects/ImageLoader.java +++ b/HeatUp/src/de/heatup/objects/ImageLoader.java @@ -1,12 +1,9 @@ package de.heatup.objects; import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; import java.util.Random; import javax.imageio.ImageIO; - import de.heatup.cfg.Config; diff --git a/HeatUp/src/de/heatup/ui/Main.java b/HeatUp/src/de/heatup/ui/Main.java index ba5d124..34e1191 100644 --- a/HeatUp/src/de/heatup/ui/Main.java +++ b/HeatUp/src/de/heatup/ui/Main.java @@ -47,6 +47,7 @@ public class Main extends JFrame implements Runnable { private static JPanel outerPanel; private static JPanel statusPanel; private static JPanel gamePanel; + private static JPanel menuPanel; private static JPanel leftPanel; private static JPanel rightPanel; private static JPanel actionPanel; @@ -66,22 +67,29 @@ public class Main extends JFrame implements Runnable { outerPanel = new JPanel(); outerPanel.setLayout(new BorderLayout()); - outerPanel.setFocusable(false); + outerPanel.setFocusable(true); statusPanel = new JPanel(); statusPanel.setPreferredSize(new Dimension(800,80)); - statusPanel.setFocusable(true); + statusPanel.setFocusable(false); gamePanel = new JPanel(); gamePanel.setLayout(null); gamePanel.setPreferredSize(new Dimension(800,600)); gamePanel.setFocusable(false); gamePanel.setBackground(Color.black); + + menuPanel = new JPanel(); + menuPanel.setLayout(null); + menuPanel.setPreferredSize(new Dimension(800,600)); + menuPanel.setFocusable(false); + menuPanel.setBackground(Color.black); + actionPanel = new JPanel(); actionPanel.setLayout(new GridLayout(1,1)); actionPanel.setPreferredSize(new Dimension(800,80)); - actionPanel.setFocusable(true); + actionPanel.setFocusable(false); leftPanel = new JPanel(); leftPanel.setLayout(null); @@ -252,7 +260,18 @@ public class Main extends JFrame implements Runnable { private void tick() { PanelBuilder.kb.checkKeyActivity(); if (!pause) { + if ( ! gamePanel.isVisible() ) { + gamePanel.setVisible(true); + actionPanel.setVisible(true); + statusPanel.setVisible(true); + + } PanelBuilder.tick(); + } else if ( pause ) { + // Hier einfügen was passiert wenn ESC gedrückt wird + gamePanel.setVisible(false); + actionPanel.setVisible(false); + statusPanel.setVisible(false); } } // alles was animiert wird hier rein (paints) diff --git a/HeatUp/src/de/heatup/ui/PanelBuilder.java b/HeatUp/src/de/heatup/ui/PanelBuilder.java index 7f74c45..97561b8 100644 --- a/HeatUp/src/de/heatup/ui/PanelBuilder.java +++ b/HeatUp/src/de/heatup/ui/PanelBuilder.java @@ -132,7 +132,7 @@ public class PanelBuilder { kb = new KeyBindings(player01); - statusPanel.addKeyListener(kb); + outerPanel.addKeyListener(kb); MapEngine me; if (map > 0) { From 0c369d5238c575861781759bac3cac17c03e28ff Mon Sep 17 00:00:00 2001 From: andreas Date: Thu, 18 Dec 2014 15:10:01 +0100 Subject: [PATCH 3/3] Neue Grafik --- .../de/heatup/resources/images/25x25_powerup.png | Bin 0 -> 1711 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 HeatUp/src/de/heatup/resources/images/25x25_powerup.png diff --git a/HeatUp/src/de/heatup/resources/images/25x25_powerup.png b/HeatUp/src/de/heatup/resources/images/25x25_powerup.png new file mode 100644 index 0000000000000000000000000000000000000000..2d7327f14c9648e8ccbac6b57bca72133b7f0140 GIT binary patch literal 1711 zcmV;g22lBlP)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru-V72B2@QVjPZR(E02y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00tLHL_t(Y$90xlY+Feg$A2^9 zbDY>tQoC{5K)Xr0&8>k*Rg|Gw*uNHc<3%d zedr2;632;Hq?Kr^m0D;DZJkZ+bi;1xCUKi&V>_2)`W9EW1DK(SCDpU=;) zuCD&U=kr~TL?ZVuU%spd2L~A*9^MIw$K!aO$Hc@0iA3VK<2XOrzkmO?dwYB7>guAY zsfqgfdX!SA^@j+dST(iGJz3?0nfu)N_ayi3-OD+S^G0=b^>0TVO9WmVpuMe)$;rv4 zmX?-=OeQk{Amj14@;vX=qeqYS#$qvS+umJp7~v!M;U$bvdu+mZl*7FgkNgm~;?msQ z%+Syf#+cV*vDnK1QfvL$U@-X8)2B}pjYhY^vjvbg{*_7WLV9~KehSbVIQ3tq@Zyg! zsv6KZj>D-_r#OE6IIipdvahdCNFl^4(P-4_>+8dH-Q9j7beZafB$%Bx;jQBw7@*kv zeT)i#@wRN0N`=9}L5wjS4Gj(bQYrPyv17*w27?%5cB$~;|Kujt>dY<$Wt@h7iif|m z3D~9H7$T7fot>SLa=HAHR7$nCx3}YY-X0awE#hB#4_V1?Ti3YNhj5}_1)&hSyhFv) zA*H0FqXW=NEdhKi zwbm=Mv$M~HY_GDwLK3?$1ww(4tbgV_D;>W;Tj6K#F@^^Z9w4PmOV9I?>2!Ke6K?Nz z-`Yn6|9csOK>Hggwp?Jf>3bl2&vndk9Mb9Znq^t z_2YN23wK#Mbm5tJW+er||_5C|c-c<~~Oi;L5#RO(v*3SeetX0Elh z)k&w*{jII7A`*!pbs4+xK2F0K+?vkkdcGatc^;Q8U1EBAdfgavBAd+?5{U#Vkw}oq zWa#MV_=oGd)i-Y3=&P@d;gxxargBhr6iZjaplStZr;2(4-BMIsp(iO z#@N^xDwD|&i^WK#Ql`7R``vQ6ymbv9P=WAsX^mP6?&+}djg+i}Kqfy`C!-r{V zY9bPepp?RK9CEoFv$M10aygzndGfGSD*eju_x~xGOfK&U<@S&5phO~Jd7c*)Ld2z% z=af>tLWs!bub$TWL(lWBYOUV}u3MH>8W|bUyWegA{{vqy!?i~oJIeq7002ovPDHLk FV1n