diff --git a/HeatUp/src/de/heatup/objects/DynamicObject.java b/HeatUp/src/de/heatup/objects/DynamicObject.java index 47a09fe..45c81d1 100644 --- a/HeatUp/src/de/heatup/objects/DynamicObject.java +++ b/HeatUp/src/de/heatup/objects/DynamicObject.java @@ -35,9 +35,10 @@ public class DynamicObject extends JComponent{ if ( rescaleFactor != 0.0 ) { g2d.scale(rescaleFactor, rescaleFactor); } - //g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON); + + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON); g2d.drawImage(bf1, 0, 0, this); - //g2d.setStroke(new BasicStroke(8.0f)); + g2d.setStroke(new BasicStroke(8.0f)); g2d.finalize(); } diff --git a/HeatUp/src/de/heatup/testing/GameLoop.java b/HeatUp/src/de/heatup/testing/GameLoop.java index a20bb5c..dde61f1 100644 --- a/HeatUp/src/de/heatup/testing/GameLoop.java +++ b/HeatUp/src/de/heatup/testing/GameLoop.java @@ -14,7 +14,15 @@ public class GameLoop { DynamicObject dynO1 = new DynamicObject(); GameInterface.getGamePanel().add(dynO1); - + DynamicObject dynO2 = new DynamicObject(); + GameInterface.getGamePanel().add(dynO2); + DynamicObject dynO3 = new DynamicObject(); + GameInterface.getGamePanel().add(dynO3); + DynamicObject dynO4 = new DynamicObject(); + GameInterface.getGamePanel().add(dynO4); + + dynO4.setRescale(0.5); + MapEngine me = new MapEngine(1); for (StaticObject currentStaticObject : me.getAllMapObjects()) { GameInterface.getGamePanel().add(currentStaticObject); @@ -23,7 +31,10 @@ public class GameLoop { //GameInterface.getGamePanel().repaint(); //GameInterface.getGamePanel().setComponentZOrder(dynO1, 1); //GameInterface.getGamePanel().add(dynO1); - logic.startMovement(dynO1); + //logic.startMovement(dynO1); + //logic.startMovement(dynO2); + logic.startMovement(dynO3); + //logic.startMovement(dynO4); } } diff --git a/HeatUp/src/de/heatup/ui/GameInterface.java b/HeatUp/src/de/heatup/ui/GameInterface.java index 434a942..3be2d03 100644 --- a/HeatUp/src/de/heatup/ui/GameInterface.java +++ b/HeatUp/src/de/heatup/ui/GameInterface.java @@ -1,14 +1,22 @@ package de.heatup.ui; import java.awt.BorderLayout; import java.awt.Dimension; +import java.awt.DisplayMode; import java.awt.EventQueue; +import java.awt.Frame; +import java.awt.GraphicsDevice; +import java.awt.GraphicsEnvironment; import java.awt.GridLayout; import java.awt.Point; +import java.awt.Toolkit; +import java.awt.Window; import java.io.IOException; import javax.swing.BorderFactory; import javax.swing.JFrame; import javax.swing.JPanel; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; import de.heatup.mapengine.MapEngine; import de.heatup.objects.DynamicObject; @@ -29,15 +37,34 @@ public class GameInterface extends JFrame { private static JPanel actionPanel; //private BufferedImage image; + public static void createGUI() { + + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + final JFrame frame = new JFrame(); +// Fullscreen testing +// frame.setUndecorated(true); +// frame.setResizable(false); +// frame.setExtendedState(Frame.MAXIMIZED_BOTH); +// frame.validate(); +// GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().setFullScreenWindow(frame); + frame.setTitle("HeatUP!"); frame.setDefaultCloseOperation(EXIT_ON_CLOSE); - frame.setVisible(true); - frame.setResizable(true); + //frame.setResizable(true); //frame.createBufferStrategy(2); + //Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + //frame.setBounds(0,0,screenSize.width, screenSize.height); + + outerPanel = new JPanel(); outerPanel.setLayout(new BorderLayout()); //outerPanel.setBorder(BorderFactory.createTitledBorder("outerPanel")); @@ -64,7 +91,6 @@ public class GameInterface extends JFrame { outerPanel.add(actionPanel,BorderLayout.SOUTH); frame.add(outerPanel); - frame.pack(); frame.setVisible(true); frame.repaint(); @@ -72,6 +98,8 @@ public class GameInterface extends JFrame { /* * We need to use EQ for EDT + * + * TODO: add fullscreen mode */ public static void main(String[] args) throws IOException, InterruptedException {