da/HeatUp
1
0
Fork 0
mirror of https://github.com/jokerx3/HeatUp synced 2026-07-27 11:29:46 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:jokerx3/prp

Browse Source
This commit is contained in:
feschi55
2014-11-25 15:19:49 +01:00
parent a9650705c4 a15d136fc9
commit 743d960e48
6 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HeatUp/src/de/heatup/objects/ImageLoader.java
+13 -12
View File
@@ -20,39 +20,39 @@ public class ImageLoader {
* -: Wall * -: Wall
* 0 - 9: Hardware * 0 - 9: Hardware
*/ */
public static BufferedImage getBufferedImage(char key) { public BufferedImage getBufferedImage(char key) {
String imageFileName; String imageFileName;
switch (key) { switch (key) {
case Config.wayChar: case Config.wayChar:
imageFileName="src/de/heatup/resources/images/25x25_black.png"; imageFileName="de/heatup/resources/images/25x25_black.png";
break; break;
case Config.wallChar: case Config.wallChar:
imageFileName="src/de/heatup/resources/images/25x25_wall_orange_2.png"; imageFileName="de/heatup/resources/images/25x25_wall_orange_2.png";
break; break;
case 'u': case 'u':
imageFileName="src/de/heatup/resources/images/little_green_guy_verysmall.png"; imageFileName="de/heatup/resources/images/little_green_guy_verysmall.png";
break; break;
case 'd': case 'd':
imageFileName="src/de/heatup/resources/images/little_green_guy_verysmall.png"; imageFileName="de/heatup/resources/images/little_green_guy_verysmall.png";
break; break;
case 'l': case 'l':
imageFileName="src/de/heatup/resources/images/little_green_guy_verysmall.png"; imageFileName="de/heatup/resources/images/little_green_guy_verysmall.png";
break; break;
case 'r': case 'r':
imageFileName="src/de/heatup/resources/images/little_green_guy_verysmall.png"; imageFileName="de/heatup/resources/images/little_green_guy_verysmall.png";
break; break;
default: default:
imageFileName="src/de/heatup/resources/images/dummy_image.png"; imageFileName="de/heatup/resources/images/dummy_image.png";
break; break;
} }
if (isHardware(key)) { if (isHardware(key)) {
Random rand = new Random(); Random rand = new Random();
switch (rand.nextInt(2)) { switch (rand.nextInt(2)) {
case 0: case 0:
imageFileName="src/de/heatup/resources/images/hardware/rectangular_chip.jpg"; imageFileName="de/heatup/resources/images/hardware/rectangular_chip.jpg";
break; break;
case 1: case 1:
imageFileName="src/de/heatup/resources/images/hardware/square_chip.jpg"; imageFileName="de/heatup/resources/images/hardware/square_chip.jpg";
break; break;
default: default:
break; break;
@@ -60,8 +60,9 @@ public class ImageLoader {
} }
BufferedImage loadedBufferedImage = null; BufferedImage loadedBufferedImage = null;
//System.out.println(imageFileName); //System.out.println(imageFileName);
try { try {
loadedBufferedImage = ImageIO.read(new File(imageFileName)); loadedBufferedImage = ImageIO.read(this.getClass().getClassLoader().getResourceAsStream(imageFileName));
} catch (Exception e) { } catch (Exception e) {
// TODO: handle exception // TODO: handle exception
} }
@@ -73,7 +74,7 @@ public class ImageLoader {
return loadedBufferedImage; return loadedBufferedImage;
} }
private static boolean isHardware(char c) { private boolean isHardware(char c) {
for (int i = Config.firstHardwareChar; i < Config.lastHardwareChar; i++) { for (int i = Config.firstHardwareChar; i < Config.lastHardwareChar; i++) {
if (c == i) { if (c == i) {
return true; return true;
HeatUp/src/de/heatup/objects/StaticObject.java
+2 -1
View File
@@ -11,6 +11,7 @@ import javax.imageio.ImageIO;
import javax.swing.JComponent; import javax.swing.JComponent;
import de.heatup.cfg.Config; import de.heatup.cfg.Config;
import de.heatup.testing.PanelBuilder;
/* /*
* Draft for static objects * Draft for static objects
@@ -67,7 +68,7 @@ public class StaticObject extends JComponent {
} }
private void loadBufferedImage() { private void loadBufferedImage() {
this.bf1 = ImageLoader.getBufferedImage(this.staticObjectType); this.bf1 = PanelBuilder.getImageLoader().getBufferedImage(this.staticObjectType);
} }
public void setImage(BufferedImage image) { public void setImage(BufferedImage image) {
HeatUp/src/de/heatup/objects/logic.java
+6 -4
View File
@@ -3,6 +3,8 @@ package de.heatup.objects;
import java.io.IOException; import java.io.IOException;
import java.util.Random; import java.util.Random;
import de.heatup.testing.PanelBuilder;
/* /*
* Static class for opponent movement still quick n' dirty * Static class for opponent movement still quick n' dirty
@@ -59,22 +61,22 @@ public class logic {
movex -= 4; movex -= 4;
mx=-4; mx=-4;
my=0; my=0;
dynObj.setImage(ImageLoader.getBufferedImage('l')); dynObj.setImage(PanelBuilder.getImageLoader().getBufferedImage('l'));
} else if ( move == 2 && movex >= 0) { } else if ( move == 2 && movex >= 0) {
movex -= 4; movex -= 4;
mx=4; mx=4;
my=0; my=0;
dynObj.setImage(ImageLoader.getBufferedImage('r')); dynObj.setImage(PanelBuilder.getImageLoader().getBufferedImage('r'));
} else if (move == -1 && movey >= 0) { } else if (move == -1 && movey >= 0) {
movey -= 4; movey -= 4;
my=-4; my=-4;
mx=0; mx=0;
dynObj.setImage(ImageLoader.getBufferedImage('u')); dynObj.setImage(PanelBuilder.getImageLoader().getBufferedImage('u'));
} else if (move == 1 && movey >= 0) { } else if (move == 1 && movey >= 0) {
movey -= 4; movey -= 4;
my=4; my=4;
mx=0; mx=0;
dynObj.setImage(ImageLoader.getBufferedImage('d')); dynObj.setImage(PanelBuilder.getImageLoader().getBufferedImage('d'));
} else { } else {
move = 0; move = 0;
mx=0; mx=0;
HeatUp/src/de/heatup/testing/Opponent.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class Opponent extends Player {
@Override protected void loadBufferedImage() { @Override protected void loadBufferedImage() {
try { try {
super.bf1 = ImageIO.read(new File("src/de/heatup/resources/images/little_green_guy_verysmall.png")); super.bf1 = ImageIO.read(this.getClass().getClassLoader().getResourceAsStream("de/heatup/resources/images/little_green_guy_verysmall.png"));
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
HeatUp/src/de/heatup/testing/PanelBuilder.java
+8
View File
@@ -6,6 +6,7 @@ import javax.swing.JPanel;
import de.heatup.mapengine.MapEngine; import de.heatup.mapengine.MapEngine;
import de.heatup.mapengine.SpawnAssistant; import de.heatup.mapengine.SpawnAssistant;
import de.heatup.objects.ImageLoader;
import de.heatup.ui.KeyBindings; import de.heatup.ui.KeyBindings;
import de.heatup.ui.StatusPanelAdder; import de.heatup.ui.StatusPanelAdder;
import de.heatup.ui.actionPanel.ActionControl; import de.heatup.ui.actionPanel.ActionControl;
@@ -21,6 +22,7 @@ public class PanelBuilder {
public static Player player01; public static Player player01;
private static InstancedObjects instancedObjects; private static InstancedObjects instancedObjects;
private static ImageLoader imageLoader;
public static InstancedObjects getInstancedObjects() { public static InstancedObjects getInstancedObjects() {
return instancedObjects; return instancedObjects;
@@ -53,6 +55,8 @@ public class PanelBuilder {
instancedObjects = new InstancedObjects(); instancedObjects = new InstancedObjects();
imageLoader = new ImageLoader();
player01 = new Player(); // !!! PLAYER IMMER ZUERST INSTANZIIEREN, DANACH OPPONENTS !!! player01 = new Player(); // !!! PLAYER IMMER ZUERST INSTANZIIEREN, DANACH OPPONENTS !!!
gamePanel.add(player01); gamePanel.add(player01);
player01.setBounds(25,25,25, 25); // !!! MUSS DRIN BLEIBEN TROTZ NACHTRÄGLICHES SPAWN UMSETZEN !!! player01.setBounds(25,25,25, 25); // !!! MUSS DRIN BLEIBEN TROTZ NACHTRÄGLICHES SPAWN UMSETZEN !!!
@@ -89,4 +93,8 @@ public class PanelBuilder {
} }
public static ImageLoader getImageLoader() {
return imageLoader;
}
} }
HeatUp/src/de/heatup/testing/Player.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class Player extends JComponent {
protected void loadBufferedImage() { protected void loadBufferedImage() {
try { try {
this.bf1 = ImageIO.read(new File("src/de/heatup/resources/images/little_blue_guy_verysmall.png")); this.bf1 = ImageIO.read(this.getClass().getClassLoader().getResourceAsStream("de/heatup/resources/images/little_blue_guy_verysmall.png"));
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }