From 0933f0595cb93af0c5dc14c30b18c84c07ac56b9 Mon Sep 17 00:00:00 2001 From: toksikk Date: Fri, 7 Nov 2014 12:35:31 +0100 Subject: [PATCH 01/11] =?UTF-8?q?StatusPanelAdder=20Aufruf=20hinzugef?= =?UTF-8?q?=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HeatUp/src/de/heatup/testing/GameLoopD.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/HeatUp/src/de/heatup/testing/GameLoopD.java b/HeatUp/src/de/heatup/testing/GameLoopD.java index 6e9c9c4..b158bac 100644 --- a/HeatUp/src/de/heatup/testing/GameLoopD.java +++ b/HeatUp/src/de/heatup/testing/GameLoopD.java @@ -13,6 +13,7 @@ import de.heatup.mapengine.MapEngine; import de.heatup.mapengine.SpawnAssistant; import de.heatup.objects.StaticObject; import de.heatup.ui.KeyBindings; +import de.heatup.ui.StatusPanelAdder; public class GameLoopD extends JFrame implements Runnable { @@ -79,6 +80,9 @@ public class GameLoopD extends JFrame implements Runnable { frame.add(outerPanel); frame.pack(); frame.setVisible(true); + + // StatusPanel bauen + StatusPanelAdder.setPanel(statusPanel); player01 = new Player(); // Query.setPlayer(player01); From 7377449ad5892f989d442b173fc3bbde51c81dc3 Mon Sep 17 00:00:00 2001 From: feschi55 Date: Fri, 7 Nov 2014 12:36:37 +0100 Subject: [PATCH 02/11] =?UTF-8?q?StatusPanelAdder=20ver=C3=A4ndert=20mit?= =?UTF-8?q?=20GridBagLayout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HeatUp/src/de/heatup/ui/StatusPanelAdder.java | 133 +++++++++++++++--- 1 file changed, 111 insertions(+), 22 deletions(-) diff --git a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java index 245efce..9b43ce1 100644 --- a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java +++ b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java @@ -1,13 +1,11 @@ package de.heatup.ui; import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.GridBagConstraints; +import java.awt.Insets; -import javax.swing.ImageIcon; -import javax.swing.JFrame; import javax.swing.JLabel; -import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.SwingConstants; import javax.swing.border.LineBorder; @@ -33,31 +31,122 @@ public class StatusPanelAdder{ } public static void createPanel(){ - JProgressBar tempbar= new JProgressBar(30,90); - tempbar.setValue(45); - //tempbar.setSize(new Dimension(200,50)); - + JLabel labelTemp= new JLabel("temperature"); + labelTemp.setFont(new Font("Arial", Font.CENTER_BASELINE, 16)); + labelTemp.setBorder(new LineBorder(Color.BLACK, 1)); + + JProgressBar tempBar= new JProgressBar(30,90); + tempBar.setValue(45); + + JLabel labelScore= new JLabel("score"); + labelScore.setFont(new Font("Arial", Font.CENTER_BASELINE, 16)); + //labelScore.setBorder(new LineBorder(Color.BLACK, 1)); + JLabel scoreLabel= new JLabel("new Score Label"); - scoreLabel.setBorder(new LineBorder(Color.BLACK, 2)); - //scoreLabel.setSize(new Dimension(100,50)); + scoreLabel.setBorder(new LineBorder(Color.BLACK, 1)); + + JLabel labelPowerUp = new JLabel("PowerUp"); + labelPowerUp.setFont(new Font("Arial", Font.CENTER_BASELINE, 16)); + //labelPowerUp.setBorder(new LineBorder(Color.BLACK, 1)); JLabel powerUpLabel = new JLabel(/*new ImageIcon("path_to_image.png")*/"powerUpLabel"); - powerUpLabel.setBorder(new LineBorder(Color.BLACK, 1)); - //powerUpLabel.setSize(new Dimension(200,50)); + //powerUpLabel.setBorder(new LineBorder(Color.BLACK, 1)); + + + + JLabel labelTime=new JLabel("Time"); + labelTime.setFont(new Font("Arial", Font.CENTER_BASELINE, 16)); + //labelTime.setBorder(new LineBorder(Color.BLACK, 1)); + labelTime.setSize(100,10); + labelTime.setHorizontalTextPosition(SwingConstants.CENTER); JLabel timeLabel = new JLabel(); - timeLabel.setBorder(new LineBorder(Color.BLACK, 2)); - timeLabel.setText("0"); - //timeLabel.setSize(new Dimension(300,24)); //Groesse, - timeLabel.setHorizontalAlignment(SwingConstants.CENTER ); + //timeLabel.setBorder(new LineBorder(Color.BLACK, 1)); + timeLabel.setText("123456789"); + timeLabel.setFont(new Font("Arial", Font.ITALIC, 12)); + + //Insets(int top, int left, int bottom, int right); + + + GameInterface.getStatusPanel().add(labelTime, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird + 1, 1, // Spaltennr., Zeilennr. + 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) + 0.0, 0.0, + GridBagConstraints.NORTH, // Ausrichtung + GridBagConstraints.BOTH, + new Insets(0,20,30,20), // Abstand zu den anderen Objekten + 0,0)); + + GameInterface.getStatusPanel().add(timeLabel, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird + 2, 1, // Spaltennr., Zeilennr. + 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) + 0.0, 0.0, + GridBagConstraints.SOUTH, // Ausrichtung + GridBagConstraints.BOTH, + new Insets(38,20,0,20), // Abstand zu den anderen Objekten + 0,0)); - GameInterface.getStatusPanel().add(timeLabel); - GameInterface.getStatusPanel().add(tempbar); - GameInterface.getStatusPanel().add(scoreLabel); - GameInterface.getStatusPanel().add(powerUpLabel); - } + GameInterface.getStatusPanel().add(labelTemp, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird + 3, 1, // Spaltennr., Zeilennr. + 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) + 0.0, 0.0, + GridBagConstraints.NORTH, // Ausrichtung + GridBagConstraints.NONE, + new Insets(0,20,30,20), // Abstand zu den anderen Objekten + 0,0)); + + GameInterface.getStatusPanel().add(tempBar, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird + 3, 2, // Spaltennr., Zeilennr. + 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) + 0.0, 0.0, + GridBagConstraints.SOUTH, // Ausrichtung + GridBagConstraints.NONE, + new Insets(38,20,0,20), // Abstand zu den anderen Objekten + 100,20)); + + + + GameInterface.getStatusPanel().add(labelScore, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird + 1, 2, // Spaltennr., Zeilennr. + 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) + 0.0, 0.0, + GridBagConstraints.NORTH, // Ausrichtung + GridBagConstraints.NONE, + new Insets (0,0,0,0), // Abstand zu den anderen Objekten + 0,0)); + GameInterface.getStatusPanel().add(scoreLabel, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird + 2, 2, // Spaltennr., Zeilennr. + 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) + 0.0, 0.0, + GridBagConstraints.SOUTH, // Ausrichtung + GridBagConstraints.NONE, + new Insets (0,0,0,0), // Abstand zu den anderen Objekten + 0,0)); + + + GameInterface.getStatusPanel().add(labelPowerUp, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird + 4, 1, // Spaltennr., Zeilennr. + 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) + 0.0, 0.0, + GridBagConstraints.NORTH, // Ausrichtung + GridBagConstraints.NONE, + new Insets (0,0,0,0), // Abstand zu den anderen Objekten + 0,0)); + + + GameInterface.getStatusPanel().add(powerUpLabel, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird + 4, 2, // Spaltennr., Zeilennr. + 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) + 0.0, 0.0, + GridBagConstraints.SOUTH, // Ausrichtung + GridBagConstraints.NONE, + new Insets (0,0,0,0), // Abstand zu den anderen Objekten + 0,0)); + } + + private static void getStatusPanel(){ GameInterface.getStatusPanel(); } From 64e36530a5ce0196136b4659263bed21d6105e88 Mon Sep 17 00:00:00 2001 From: feschi55 Date: Fri, 7 Nov 2014 12:41:34 +0100 Subject: [PATCH 03/11] =?UTF-8?q?JPanel=20in=20StatusPanelAdder=20ver?= =?UTF-8?q?=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HeatUp/src/de/heatup/ui/StatusPanelAdder.java | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java index 9b43ce1..af32d3e 100644 --- a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java +++ b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java @@ -6,19 +6,22 @@ import java.awt.GridBagConstraints; import java.awt.Insets; import javax.swing.JLabel; +import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.SwingConstants; import javax.swing.border.LineBorder; +import de.heatup.testing.GameLoopD; import de.heatup.ui.statusPanel.Score; import de.heatup.ui.statusPanel.Temperature; import de.heatup.ui.statusPanel.Timer; public class StatusPanelAdder{ - Temperature temp; - Score score; - Timer timer; + private Temperature temp; + private Score score; + private Timer timer; + public static JPanel panel; public int getTemp(){ return temp.getTemp(); @@ -30,6 +33,10 @@ public class StatusPanelAdder{ return timer.getTime(); } + public void setPanel(JPanel panel){ + this.panel=panel; + } + public static void createPanel(){ JLabel labelTemp= new JLabel("temperature"); labelTemp.setFont(new Font("Arial", Font.CENTER_BASELINE, 16)); @@ -68,7 +75,7 @@ public class StatusPanelAdder{ //Insets(int top, int left, int bottom, int right); - GameInterface.getStatusPanel().add(labelTime, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird + panel.add(labelTime, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird 1, 1, // Spaltennr., Zeilennr. 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) 0.0, 0.0, @@ -77,7 +84,7 @@ public class StatusPanelAdder{ new Insets(0,20,30,20), // Abstand zu den anderen Objekten 0,0)); - GameInterface.getStatusPanel().add(timeLabel, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird + panel.add(timeLabel, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird 2, 1, // Spaltennr., Zeilennr. 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) 0.0, 0.0, @@ -88,7 +95,7 @@ public class StatusPanelAdder{ - GameInterface.getStatusPanel().add(labelTemp, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird + panel.add(labelTemp, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird 3, 1, // Spaltennr., Zeilennr. 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) 0.0, 0.0, @@ -97,7 +104,7 @@ public class StatusPanelAdder{ new Insets(0,20,30,20), // Abstand zu den anderen Objekten 0,0)); - GameInterface.getStatusPanel().add(tempBar, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird + panel.add(tempBar, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird 3, 2, // Spaltennr., Zeilennr. 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) 0.0, 0.0, @@ -108,7 +115,7 @@ public class StatusPanelAdder{ - GameInterface.getStatusPanel().add(labelScore, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird + panel.add(labelScore, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird 1, 2, // Spaltennr., Zeilennr. 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) 0.0, 0.0, @@ -116,7 +123,7 @@ public class StatusPanelAdder{ GridBagConstraints.NONE, new Insets (0,0,0,0), // Abstand zu den anderen Objekten 0,0)); - GameInterface.getStatusPanel().add(scoreLabel, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird + panel.add(scoreLabel, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird 2, 2, // Spaltennr., Zeilennr. 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) 0.0, 0.0, @@ -126,7 +133,7 @@ public class StatusPanelAdder{ 0,0)); - GameInterface.getStatusPanel().add(labelPowerUp, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird + panel.add(labelPowerUp, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird 4, 1, // Spaltennr., Zeilennr. 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) 0.0, 0.0, @@ -136,7 +143,7 @@ public class StatusPanelAdder{ 0,0)); - GameInterface.getStatusPanel().add(powerUpLabel, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird + panel.add(powerUpLabel, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird 4, 2, // Spaltennr., Zeilennr. 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) 0.0, 0.0, @@ -146,9 +153,5 @@ public class StatusPanelAdder{ 0,0)); } - - private static void getStatusPanel(){ - GameInterface.getStatusPanel(); - } } From abef4c99f239fa9b0aaa8c1bc341a6a5b95a31e6 Mon Sep 17 00:00:00 2001 From: feschi55 Date: Fri, 7 Nov 2014 12:44:21 +0100 Subject: [PATCH 04/11] StatusPanelAdder --- HeatUp/src/de/heatup/ui/StatusPanelAdder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java index af32d3e..3bd6a09 100644 --- a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java +++ b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java @@ -21,7 +21,7 @@ public class StatusPanelAdder{ private Temperature temp; private Score score; private Timer timer; - public static JPanel panel; + private static JPanel panel; public int getTemp(){ return temp.getTemp(); @@ -33,7 +33,7 @@ public class StatusPanelAdder{ return timer.getTime(); } - public void setPanel(JPanel panel){ + public static void setPanel(JPanel panel){ this.panel=panel; } From f4b2074ca1b232f3859be23ea501eb539ab9def5 Mon Sep 17 00:00:00 2001 From: feschi55 Date: Fri, 7 Nov 2014 12:46:53 +0100 Subject: [PATCH 05/11] StatusPanelAdder this. entfernt --- HeatUp/src/de/heatup/ui/StatusPanelAdder.java | 77 +------------------ 1 file changed, 3 insertions(+), 74 deletions(-) diff --git a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java index 3bd6a09..46cba08 100644 --- a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java +++ b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java @@ -33,8 +33,8 @@ public class StatusPanelAdder{ return timer.getTime(); } - public static void setPanel(JPanel panel){ - this.panel=panel; + public static void setPanel(JPanel newPanel){ + panel=newPanel; } public static void createPanel(){ @@ -74,83 +74,12 @@ public class StatusPanelAdder{ //Insets(int top, int left, int bottom, int right); - - panel.add(labelTime, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird - 1, 1, // Spaltennr., Zeilennr. - 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) - 0.0, 0.0, - GridBagConstraints.NORTH, // Ausrichtung - GridBagConstraints.BOTH, - new Insets(0,20,30,20), // Abstand zu den anderen Objekten - 0,0)); - - panel.add(timeLabel, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird - 2, 1, // Spaltennr., Zeilennr. - 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) - 0.0, 0.0, - GridBagConstraints.SOUTH, // Ausrichtung - GridBagConstraints.BOTH, - new Insets(38,20,0,20), // Abstand zu den anderen Objekten - 0,0)); + panel.add(timeLabel, ); - panel.add(labelTemp, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird - 3, 1, // Spaltennr., Zeilennr. - 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) - 0.0, 0.0, - GridBagConstraints.NORTH, // Ausrichtung - GridBagConstraints.NONE, - new Insets(0,20,30,20), // Abstand zu den anderen Objekten - 0,0)); - - panel.add(tempBar, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird - 3, 2, // Spaltennr., Zeilennr. - 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) - 0.0, 0.0, - GridBagConstraints.SOUTH, // Ausrichtung - GridBagConstraints.NONE, - new Insets(38,20,0,20), // Abstand zu den anderen Objekten - 100,20)); - - panel.add(labelScore, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird - 1, 2, // Spaltennr., Zeilennr. - 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) - 0.0, 0.0, - GridBagConstraints.NORTH, // Ausrichtung - GridBagConstraints.NONE, - new Insets (0,0,0,0), // Abstand zu den anderen Objekten - 0,0)); - panel.add(scoreLabel, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird - 2, 2, // Spaltennr., Zeilennr. - 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) - 0.0, 0.0, - GridBagConstraints.SOUTH, // Ausrichtung - GridBagConstraints.NONE, - new Insets (0,0,0,0), // Abstand zu den anderen Objekten - 0,0)); - - - panel.add(labelPowerUp, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird - 4, 1, // Spaltennr., Zeilennr. - 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) - 0.0, 0.0, - GridBagConstraints.NORTH, // Ausrichtung - GridBagConstraints.NONE, - new Insets (0,0,0,0), // Abstand zu den anderen Objekten - 0,0)); - - - panel.add(powerUpLabel, new GridBagConstraints( // formPanel ist das Panel, indas eingefügt wird - 4, 2, // Spaltennr., Zeilennr. - 4, 2, // Spaltenbreite (gridwidth), Zeilenbreite (gridheigth) - 0.0, 0.0, - GridBagConstraints.SOUTH, // Ausrichtung - GridBagConstraints.NONE, - new Insets (0,0,0,0), // Abstand zu den anderen Objekten - 0,0)); } } From 040178a19c9caba414f6e5f3bfd82d025251a099 Mon Sep 17 00:00:00 2001 From: feschi55 Date: Fri, 7 Nov 2014 12:48:53 +0100 Subject: [PATCH 06/11] =?UTF-8?q?StatusPanelAdder=20funktionsf=C3=A4hig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HeatUp/src/de/heatup/ui/StatusPanelAdder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java index 46cba08..5d7d585 100644 --- a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java +++ b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java @@ -74,7 +74,7 @@ public class StatusPanelAdder{ //Insets(int top, int left, int bottom, int right); - panel.add(timeLabel, ); + //panel.add(timeLabel, ); From 3d062a8f4645f3a945aca29c8b967b69e4cc637e Mon Sep 17 00:00:00 2001 From: toksikk Date: Fri, 7 Nov 2014 13:12:05 +0100 Subject: [PATCH 07/11] Added repaints to render Sleep set to 1 --- HeatUp/src/de/heatup/testing/GameLoopD.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/HeatUp/src/de/heatup/testing/GameLoopD.java b/HeatUp/src/de/heatup/testing/GameLoopD.java index b158bac..5855b28 100644 --- a/HeatUp/src/de/heatup/testing/GameLoopD.java +++ b/HeatUp/src/de/heatup/testing/GameLoopD.java @@ -83,6 +83,7 @@ public class GameLoopD extends JFrame implements Runnable { // StatusPanel bauen StatusPanelAdder.setPanel(statusPanel); + StatusPanelAdder.createPanel(); player01 = new Player(); // Query.setPlayer(player01); @@ -188,7 +189,7 @@ public class GameLoopD extends JFrame implements Runnable { frames++; try { - thread.sleep(5); // entlastet die cpu massiv. + thread.sleep(1); // entlastet die cpu massiv. } catch (InterruptedException e) { // TODO Auto-generated catch block @@ -217,6 +218,10 @@ public class GameLoopD extends JFrame implements Runnable { // alles was animiert wird hier rein (paints) private void render() { player01.repaint(); + outerPanel.repaint(); + gamePanel.repaint(); + actionPanel.repaint(); + statusPanel.repaint(); } } From ae0e3c0368ec7e01279dcc76d1e1aee5584f2d02 Mon Sep 17 00:00:00 2001 From: feschi55 Date: Fri, 7 Nov 2014 13:35:50 +0100 Subject: [PATCH 08/11] =?UTF-8?q?StatusPanelAdder=20Layout=20ge=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HeatUp/src/de/heatup/ui/StatusPanelAdder.java | 47 ++++++++++++++++--- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java index 5d7d585..61ba55f 100644 --- a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java +++ b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java @@ -1,8 +1,11 @@ package de.heatup.ui; +import java.awt.BorderLayout; import java.awt.Color; +import java.awt.FlowLayout; import java.awt.Font; import java.awt.GridBagConstraints; +import java.awt.GridLayout; import java.awt.Insets; import javax.swing.JLabel; @@ -34,6 +37,7 @@ public class StatusPanelAdder{ } public static void setPanel(JPanel newPanel){ + newPanel.setLayout(new FlowLayout()); panel=newPanel; } @@ -44,13 +48,26 @@ public class StatusPanelAdder{ JProgressBar tempBar= new JProgressBar(30,90); tempBar.setValue(45); + + JPanel tempPanel=new JPanel(); + tempPanel.setLayout(new BorderLayout()); + tempPanel.add(labelTemp, BorderLayout.NORTH); + tempPanel.add(tempBar, BorderLayout.SOUTH); + + JLabel labelScore= new JLabel("score"); labelScore.setFont(new Font("Arial", Font.CENTER_BASELINE, 16)); //labelScore.setBorder(new LineBorder(Color.BLACK, 1)); JLabel scoreLabel= new JLabel("new Score Label"); - scoreLabel.setBorder(new LineBorder(Color.BLACK, 1)); + //scoreLabel.setBorder(new LineBorder(Color.BLACK, 1)); + + JPanel scorePanel=new JPanel(); + scorePanel.setLayout(new BorderLayout()); + scorePanel.add(labelScore, BorderLayout.NORTH); + scorePanel.add(scoreLabel, BorderLayout.SOUTH); + JLabel labelPowerUp = new JLabel("PowerUp"); labelPowerUp.setFont(new Font("Arial", Font.CENTER_BASELINE, 16)); @@ -58,25 +75,43 @@ public class StatusPanelAdder{ JLabel powerUpLabel = new JLabel(/*new ImageIcon("path_to_image.png")*/"powerUpLabel"); //powerUpLabel.setBorder(new LineBorder(Color.BLACK, 1)); + JPanel powerUpPanel=new JPanel(); + powerUpPanel.setLayout(new BorderLayout()); + powerUpPanel.add(labelPowerUp, BorderLayout.NORTH); + powerUpPanel.add(powerUpLabel, BorderLayout.SOUTH); + - JLabel labelTime=new JLabel("Time"); labelTime.setFont(new Font("Arial", Font.CENTER_BASELINE, 16)); //labelTime.setBorder(new LineBorder(Color.BLACK, 1)); labelTime.setSize(100,10); - labelTime.setHorizontalTextPosition(SwingConstants.CENTER); + //labelTime.setHorizontalTextPosition(SwingConstants.CENTER); - JLabel timeLabel = new JLabel(); + JLabel timeLabel = new JLabel("123456789"); //timeLabel.setBorder(new LineBorder(Color.BLACK, 1)); - timeLabel.setText("123456789"); timeLabel.setFont(new Font("Arial", Font.ITALIC, 12)); + JPanel timePanel=new JPanel(); + timePanel.setLayout(new BorderLayout()); + timePanel.add(labelTime, BorderLayout.NORTH); + timePanel.add(timeLabel, BorderLayout.SOUTH); + + + + //Insets(int top, int left, int bottom, int right); - //panel.add(timeLabel, ); + panel.add(timePanel); + panel.add(scorePanel); + panel.add(tempPanel); + panel.add(powerUpPanel); + + + panel.setVisible(true); + From 84039165d7207cd718acdd398efdf46b81af0d9c Mon Sep 17 00:00:00 2001 From: toksikk Date: Fri, 7 Nov 2014 13:45:18 +0100 Subject: [PATCH 09/11] =?UTF-8?q?Wichtige=20Repaint=20=C3=A4nderung=20im?= =?UTF-8?q?=20Render?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../de/heatup/highscore/HighscoreHandler.java | 22 ++++++++++++++- HeatUp/src/de/heatup/mapengine/MapEngine.java | 11 ++++++++ HeatUp/src/de/heatup/objects/ImageLoader.java | 28 +++++++++++++++++-- HeatUp/src/de/heatup/testing/GameLoopD.java | 5 ++-- 4 files changed, 60 insertions(+), 6 deletions(-) diff --git a/HeatUp/src/de/heatup/highscore/HighscoreHandler.java b/HeatUp/src/de/heatup/highscore/HighscoreHandler.java index 05e38db..9cf1faf 100644 --- a/HeatUp/src/de/heatup/highscore/HighscoreHandler.java +++ b/HeatUp/src/de/heatup/highscore/HighscoreHandler.java @@ -1,5 +1,25 @@ package de.heatup.highscore; -public class HighscoreHandler { +import de.heatup.cfg.Config; +import de.heatup.logging.Logger; +public class HighscoreHandler { + private static String currentMap; + private static MapHighscore currentMapHighscore; + /** + * Es muss vorher eine Karte geladen sein + */ + public HighscoreHandler() { + // if highscore does not exist + newMapHighscore(); + // if it exists + // loadMapHighscore(); + } + private static void newMapHighscore() { + currentMap = ChecksumGenerator.generateCheckSum(Config.mapFilePath); + currentMapHighscore = new MapHighscore(); + Logger.write("HighscoreHandler - Map hashed: "+currentMap); + } + + } diff --git a/HeatUp/src/de/heatup/mapengine/MapEngine.java b/HeatUp/src/de/heatup/mapengine/MapEngine.java index c5ef370..2b38e62 100644 --- a/HeatUp/src/de/heatup/mapengine/MapEngine.java +++ b/HeatUp/src/de/heatup/mapengine/MapEngine.java @@ -8,6 +8,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Scanner; +import javax.swing.JPanel; + import de.heatup.cfg.Config; import de.heatup.logging.Logger; import de.heatup.objects.*; @@ -234,4 +236,13 @@ public class MapEngine { System.out.println(); } } + /** + * test + * + */ + public void addAllToPanel(JPanel gamePanel) { + for (StaticObject currentStaticObject : this.getAllMapObjects()) { + gamePanel.add(currentStaticObject); + } + } } diff --git a/HeatUp/src/de/heatup/objects/ImageLoader.java b/HeatUp/src/de/heatup/objects/ImageLoader.java index 730b13d..cb968f4 100644 --- a/HeatUp/src/de/heatup/objects/ImageLoader.java +++ b/HeatUp/src/de/heatup/objects/ImageLoader.java @@ -3,9 +3,12 @@ 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; + public class ImageLoader { @@ -20,10 +23,10 @@ public class ImageLoader { public static BufferedImage getBufferedImage(char key) { String imageFileName; switch (key) { - case '#': + case Config.wayChar: imageFileName="src/de/heatup/resources/images/25x25_black.png"; break; - case '-': + case Config.wallChar: imageFileName="src/de/heatup/resources/images/25x25_wall_orange_2.png"; break; case 'u': @@ -42,6 +45,19 @@ public class ImageLoader { imageFileName="src/de/heatup/resources/images/dummy_image.png"; break; } + if (isHardware(key)) { + Random rand = new Random(); + switch (rand.nextInt(2)) { + case 0: + imageFileName="src/de/heatup/resources/images/hardware/rectangular_chip.jpg"; + break; + case 1: + imageFileName="src/de/heatup/resources/images/hardware/square_chip.jpg"; + break; + default: + break; + } + } BufferedImage loadedBufferedImage = null; //System.out.println(imageFileName); try { @@ -57,5 +73,13 @@ public class ImageLoader { return loadedBufferedImage; } + private static boolean isHardware(char c) { + for (int i = Config.firstHardwareChar; i < Config.lastHardwareChar; i++) { + if (c == i) { + return true; + } + } + return false; + } } diff --git a/HeatUp/src/de/heatup/testing/GameLoopD.java b/HeatUp/src/de/heatup/testing/GameLoopD.java index 5855b28..6b1327c 100644 --- a/HeatUp/src/de/heatup/testing/GameLoopD.java +++ b/HeatUp/src/de/heatup/testing/GameLoopD.java @@ -109,9 +109,7 @@ public class GameLoopD extends JFrame implements Runnable { gamePanel.addKeyListener(kb); MapEngine me = new MapEngine(1); - for (StaticObject currentStaticObject : me.getAllMapObjects()) { - gamePanel.add(currentStaticObject); - } + me.addAllToPanel(gamePanel); Point spawnPoint = SpawnAssistant.getPathLocationOnGrid(); player01.spawnAt(spawnPoint); @@ -222,6 +220,7 @@ public class GameLoopD extends JFrame implements Runnable { gamePanel.repaint(); actionPanel.repaint(); statusPanel.repaint(); + this.repaint(); } } From 140d1a02e1ef2c01f196a5f0d39602ffac76c4ea Mon Sep 17 00:00:00 2001 From: feschi55 Date: Fri, 7 Nov 2014 13:56:08 +0100 Subject: [PATCH 10/11] =?UTF-8?q?StatusPanelAdder=20setVisible=20mit=20pas?= =?UTF-8?q?sendem=20Layout=20(lauff=C3=A4hig)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HeatUp/src/de/heatup/ui/StatusPanelAdder.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java index 61ba55f..2c68379 100644 --- a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java +++ b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java @@ -100,16 +100,12 @@ public class StatusPanelAdder{ - //Insets(int top, int left, int bottom, int right); - - - panel.add(timePanel); panel.add(scorePanel); panel.add(tempPanel); panel.add(powerUpPanel); - - + + panel.setVisible(false); panel.setVisible(true); From 47a678ef910ce9550dfaa1ba69e526c5be3f1454 Mon Sep 17 00:00:00 2001 From: toksikk Date: Fri, 7 Nov 2014 14:12:10 +0100 Subject: [PATCH 11/11] Tuning GameLoop --- HeatUp/src/de/heatup/testing/GameLoopD.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/HeatUp/src/de/heatup/testing/GameLoopD.java b/HeatUp/src/de/heatup/testing/GameLoopD.java index 6b1327c..76b71e9 100644 --- a/HeatUp/src/de/heatup/testing/GameLoopD.java +++ b/HeatUp/src/de/heatup/testing/GameLoopD.java @@ -57,20 +57,20 @@ public class GameLoopD extends JFrame implements Runnable { outerPanel = new JPanel(); outerPanel.setLayout(new BorderLayout()); - outerPanel.setVisible(true); + outerPanel.setFocusable(false); statusPanel = new JPanel(); - statusPanel.setLayout(new GridLayout(1,4)); statusPanel.setPreferredSize(new Dimension(800,80)); + statusPanel.setFocusable(false); gamePanel = new JPanel(); gamePanel.setLayout(null); gamePanel.setPreferredSize(new Dimension(800,600)); - gamePanel.setVisible(true); actionPanel = new JPanel(); actionPanel.setLayout(new GridLayout(1,1)); actionPanel.setPreferredSize(new Dimension(800,80)); + actionPanel.setFocusable(false); outerPanel.add(statusPanel,BorderLayout.NORTH); @@ -121,6 +121,9 @@ public class GameLoopD extends JFrame implements Runnable { Point spawnPoint4 = SpawnAssistant.getPathLocationOnGrid(); opponent03.spawnAt(spawnPoint4); + actionPanel.setVisible(true); + outerPanel.setVisible(true); + statusPanel.setVisible(true); gamePanel.setVisible(true); //GameInterface.getGamePanel().repaint();