From 16ce45ca123165081cfba2e8c0f43b7e199c663f Mon Sep 17 00:00:00 2001
From: andreas <andreas.hainke@foteviken.de>
Date: Sat, 1 Nov 2014 22:53:14 +0100
Subject: [PATCH] Fertig zum testen...

---
 HeatUp/src/de/heatup/objects/DynamicObject.java |  3 +--
 HeatUp/src/de/heatup/objects/logic.java         |  1 +
 HeatUp/src/de/heatup/testing/GameLoop.java      | 12 +++++++++++-
 HeatUp/src/de/heatup/ui/GameInterface.java      | 13 +++++--------
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/HeatUp/src/de/heatup/objects/DynamicObject.java b/HeatUp/src/de/heatup/objects/DynamicObject.java
index fc14ad8..47a09fe 100644
--- a/HeatUp/src/de/heatup/objects/DynamicObject.java
+++ b/HeatUp/src/de/heatup/objects/DynamicObject.java
@@ -39,12 +39,11 @@ public class DynamicObject extends JComponent{
 		g2d.drawImage(bf1, 0, 0, this);
 		//g2d.setStroke(new BasicStroke(8.0f));
 		g2d.finalize();
-		System.out.println("paintComponent");
 	}
 	
 	private void loadBufferedImage() {
 		try {
-			this.bf1 = ImageIO.read(new File("src/de/heatup/resources/images/dummy_image.png"));
+			this.bf1 = ImageIO.read(new File("src/de/heatup/resources/images/little_green_guy.png"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}		
diff --git a/HeatUp/src/de/heatup/objects/logic.java b/HeatUp/src/de/heatup/objects/logic.java
index a85768b..66921cf 100644
--- a/HeatUp/src/de/heatup/objects/logic.java
+++ b/HeatUp/src/de/heatup/objects/logic.java
@@ -6,6 +6,7 @@ import java.util.Random;
 
 /*
  * Static class for opponent movement still quick n' dirty
+ * TODO: Move to other package ex. AI
  */
 public class logic {
 	
diff --git a/HeatUp/src/de/heatup/testing/GameLoop.java b/HeatUp/src/de/heatup/testing/GameLoop.java
index 7173546..a20bb5c 100644
--- a/HeatUp/src/de/heatup/testing/GameLoop.java
+++ b/HeatUp/src/de/heatup/testing/GameLoop.java
@@ -1,19 +1,29 @@
 package de.heatup.testing;
 
 import de.heatup.mapengine.MapEngine;
+import de.heatup.objects.DynamicObject;
 import de.heatup.objects.StaticObject;
+import de.heatup.objects.logic;
 import de.heatup.ui.GameInterface;
 
 public class GameLoop {
 
 	public static void startGameLoop() {
 
+
+		
+		DynamicObject dynO1 = new DynamicObject();
+		GameInterface.getGamePanel().add(dynO1);
+
 		MapEngine me = new MapEngine(1);
 		for (StaticObject currentStaticObject : me.getAllMapObjects()) {
 			GameInterface.getGamePanel().add(currentStaticObject);
-			
 		}
 		
+		//GameInterface.getGamePanel().repaint();
+		//GameInterface.getGamePanel().setComponentZOrder(dynO1, 1);
+		//GameInterface.getGamePanel().add(dynO1);
+		logic.startMovement(dynO1);
 
 	}
 }
diff --git a/HeatUp/src/de/heatup/ui/GameInterface.java b/HeatUp/src/de/heatup/ui/GameInterface.java
index 01ec7a5..434a942 100644
--- a/HeatUp/src/de/heatup/ui/GameInterface.java
+++ b/HeatUp/src/de/heatup/ui/GameInterface.java
@@ -40,22 +40,22 @@ public class GameInterface extends JFrame {
 		
 		outerPanel = new JPanel();
 		outerPanel.setLayout(new BorderLayout());
-		outerPanel.setBorder(BorderFactory.createTitledBorder("outerPanel"));
+		//outerPanel.setBorder(BorderFactory.createTitledBorder("outerPanel"));
 		outerPanel.setVisible(true);
 		
 		statusPanel = new JPanel();
 		statusPanel.setLayout(new GridLayout(1,4));
 		statusPanel.setPreferredSize(new Dimension(800,80));
-		statusPanel.setBorder(BorderFactory.createTitledBorder("statusPanel"));
+		//statusPanel.setBorder(BorderFactory.createTitledBorder("statusPanel"));
 
 		gamePanel = new JPanel();
 		gamePanel.setLayout(null);
 		gamePanel.setPreferredSize(new Dimension(800,600));
-		gamePanel.setBorder(BorderFactory.createTitledBorder("gamePanel"));
+		//gamePanel.setBorder(BorderFactory.createTitledBorder("gamePanel"));
 
 		actionPanel = new JPanel();
 		actionPanel.setLayout(new GridLayout(1,1));
-		actionPanel.setBorder(BorderFactory.createTitledBorder("actionPanel"));
+		//actionPanel.setBorder(BorderFactory.createTitledBorder("actionPanel"));
 		actionPanel.setPreferredSize(new Dimension(800,80));
 	
 
@@ -64,10 +64,7 @@ public class GameInterface extends JFrame {
 		outerPanel.add(actionPanel,BorderLayout.SOUTH);
 		
 		frame.add(outerPanel);
-		
-
-
-		
+				
 		frame.pack();
 		frame.setVisible(true);
 		frame.repaint();