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

Anpassungen am Objekt

Browse Source
This commit is contained in:
andreas
2014-10-31 13:47:15 +01:00
parent 53ed22c930
commit 43a07e130b
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HeatUp/src/de/heatup/objects/Gegner.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class Gegner {
} else { } else {
fname="../resources/images/25x25_black.png"; fname="../resources/images/25x25_black.png";
} }
opponentImage = ImageIO.read(new File("./resources/images/25x25_black.png")); opponentImage = ImageIO.read(new File("src/de/heatup/resources/images/25x25_black.png"));
opponentLabel = new JLabel(new ImageIcon(opponentImage)); opponentLabel = new JLabel(new ImageIcon(opponentImage));
this.gegnerLogik(); this.gegnerLogik();
} }
HeatUp/src/de/heatup/objects/Objekt.java
+5 -5
View File
@@ -42,7 +42,7 @@ public class Objekt {
private void setObjectImage() throws IOException { private void setObjectImage() throws IOException {
String filename = getImageFilename(objectIdentifier); String filename = getImageFilename(objectIdentifier);
System.out.println(filename); System.out.println("Filename: " + filename);
objectImage = ImageIO.read(new File(filename)); objectImage = ImageIO.read(new File(filename));
objectLabel = new JLabel(new ImageIcon(objectImage)); objectLabel = new JLabel(new ImageIcon(objectImage));
} }
@@ -52,18 +52,18 @@ public class Objekt {
switch (objectIdentifier) { switch (objectIdentifier) {
case '1': case '1':
//leiterbahn //leiterbahn
objectFilename="../resources/images/25x25_black.png"; objectFilename="src/de/heatup/resources/images/25x25_black.png";
break; break;
case '2': case '2':
//2:harware //2:harware
objectFilename="../resources/images/25x25_red.png"; objectFilename="src/de/heatup/resources/images/25x25_red.png";
break; break;
case '3': case '3':
//3:wand //3:wand
objectFilename="../resources/images/25x25_blue.png"; objectFilename="src/de/heatup/resources/images/25x25_blue.png";
break; break;
default: default:
objectFilename="images/25x25_orange.png"; objectFilename="src/de/heatup/resources/images/25x25_orange.png";
break; break;
} }
System.out.println(objectFilename); System.out.println(objectFilename);
HeatUp/src/de/heatup/ui/GameInterface.java
+15 -15
View File
@@ -90,16 +90,16 @@ public class GameInterface extends JFrame {
Gegner g2 = new Gegner(); Gegner g2 = new Gegner();
Gegner g3 = new Gegner(); Gegner g3 = new Gegner();
Objekt o1 = new Objekt("images/objekt_dot144.png"); //Objekt o1 = new Objekt('0');
o1.getLabel().setVisible(true); //o1.getLabel().setVisible(true);
Objekt s1 = new Objekt("../resources/images/25x25_black.png"); Objekt s1 = new Objekt('0');
Objekt s2 = new Objekt("../resources/images/25x25_black.png"); Objekt s2 = new Objekt('0');
Objekt s3 = new Objekt("../resources/images/25x25_black.png"); Objekt s3 = new Objekt('0');
Objekt s4 = new Objekt("../resources/images/25x25_black.png"); Objekt s4 = new Objekt('0');
Objekt s5 = new Objekt("../resources/images/25x25_black.png"); Objekt s5 = new Objekt('0');
Objekt s6 = new Objekt("../resources/images/25x25_black.png"); Objekt s6 = new Objekt('0');
/* /*
@@ -109,14 +109,14 @@ public class GameInterface extends JFrame {
gameWindow.gamePanel.add(g2.getLabel()); gameWindow.gamePanel.add(g2.getLabel());
gameWindow.gamePanel.add(g3.getLabel()); gameWindow.gamePanel.add(g3.getLabel());
gameWindow.gamePanel.add(o1.getLabel()); //gameWindow.gamePanel.add(o1.getLabel());
g1.getLabel().setBounds(300, 100, 20, 20); g1.getLabel().setBounds(300, 100, 20, 20);
g2.getLabel().setBounds(300, 200, 20, 20); g2.getLabel().setBounds(300, 200, 20, 20);
g3.getLabel().setBounds(300, 300, 20, 20); g3.getLabel().setBounds(300, 300, 20, 20);
Objekt bg = new Objekt("images/bg_gray.png"); //Objekt bg = new Objekt("images/bg_gray.png");
bg.setPosition(0, 0); //bg.setPosition(0, 0);
gameWindow.gamePanel.add(s1.getLabel()); gameWindow.gamePanel.add(s1.getLabel());
gameWindow.gamePanel.add(s2.getLabel()); gameWindow.gamePanel.add(s2.getLabel());
@@ -124,12 +124,12 @@ public class GameInterface extends JFrame {
gameWindow.gamePanel.add(s4.getLabel()); gameWindow.gamePanel.add(s4.getLabel());
gameWindow.gamePanel.add(s5.getLabel()); gameWindow.gamePanel.add(s5.getLabel());
gameWindow.gamePanel.add(s6.getLabel()); gameWindow.gamePanel.add(s6.getLabel());
gameWindow.gamePanel.add(bg.getLabel()); //gameWindow.gamePanel.add(bg.getLabel());
bg.getLabel().repaint(); //bg.getLabel().repaint();
gameWindow.gamePanel.setComponentZOrder(o1.getLabel(), 0); //gameWindow.gamePanel.setComponentZOrder(o1.getLabel(), 0);
gameWindow.gamePanel.setComponentZOrder(bg.getLabel(), 5); //gameWindow.gamePanel.setComponentZOrder(bg.getLabel(), 5);
gameWindow.gamePanel.setComponentZOrder(g1.getLabel(), 1); gameWindow.gamePanel.setComponentZOrder(g1.getLabel(), 1);
gameWindow.gamePanel.setComponentZOrder(g2.getLabel(), 1); gameWindow.gamePanel.setComponentZOrder(g2.getLabel(), 1);
gameWindow.gamePanel.setComponentZOrder(g3.getLabel(), 1); gameWindow.gamePanel.setComponentZOrder(g3.getLabel(), 1);