소스 검색

stage walkarea with constant now.
removed some unused imports.

Gilian Joosen 10 년 전
부모
커밋
9b38692c6c

+ 5 - 4
src/gui/simulator/DrawEngine.java

@@ -1,16 +1,13 @@
 package gui.simulator;
 
 import gui.simulator.Terrain.Location;
-
-import javax.imageio.ImageIO;
-
 import java.awt.*;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-import java.io.IOException;
 
 /**
+ *
  * Created by gjoosen on 07/03/15.
  * Edited by master D Mathijssen on 17-3-2015 and some other days
  */
@@ -24,6 +21,10 @@ public abstract class DrawEngine {
     private boolean drawWalkArea;
     private Rectangle2D.Double walkArea;
 
+    public DrawEngine(){
+
+    }
+
     public DrawEngine(Images.ImageType image, int x, int y, double scale, double distanceToOtherObjects, SimulatorPane.Objects objecttype, Terrain terrain, Rectangle2D.Double walkArea, boolean drawWalkArea){
         this.image = image;
         this.type = objecttype;

+ 2 - 4
src/gui/simulator/ExitPoint.java

@@ -1,7 +1,5 @@
 package gui.simulator;
 
-import gui.simulator.Terrain.Location;
-
 import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
@@ -21,8 +19,8 @@ public class ExitPoint extends DrawEngine implements Serializable {
         super(images, x, y, scale, distance, SimulatorPane.Objects.EXIT, terrain, new Rectangle2D.Double(-10, -10, 430, 170), true);
         this.terrain = terrain;
     }
-    
+
     public String getFacilityName(){
     	return facilityName;
     }
-}
+}

+ 1 - 0
src/gui/simulator/Images.java

@@ -54,6 +54,7 @@ public class Images{
 			e.printStackTrace();
 		}
 	}
+
 	public static BufferedImage getImage(ImageType img)
 	{
 		return images.get(img.ordinal());

+ 2 - 3
src/gui/simulator/Visitor.java

@@ -1,7 +1,6 @@
 package gui.simulator;
 
 import gui.simulator.facilities.SimulatorStage;
-
 import java.awt.Graphics2D;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
@@ -129,6 +128,7 @@ public class Visitor implements Serializable {
 		}
 		return false;
 	}
+
 	private boolean hasCollisionObject(List<DrawEngine> objects){ // check collision with rigid objects
 		for(DrawEngine o:objects){
 			if(o.type != SimulatorPane.Objects.WAYPOINT && o.type != SimulatorPane.Objects.EXIT && o.type != SimulatorPane.Objects.ENTRANCE )
@@ -196,5 +196,4 @@ public class Visitor implements Serializable {
 			this.pis = pis;
 	}
 	
-}
-
+}

+ 1 - 4
src/gui/simulator/VisitorsDialogPanel.java

@@ -1,7 +1,5 @@
 package gui.simulator;
 
-import gui.frames.MainFrame;
-
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Font;
@@ -13,7 +11,6 @@ import java.awt.event.ActionListener;
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
-import javax.swing.JComboBox;
 import javax.swing.JDialog;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -47,7 +44,7 @@ public class VisitorsDialogPanel extends JDialog{
 	        super.add(main);
 	        super.setVisible(true);
 	        super.pack();
-	    } 
+	    }
 	    
 	    private JPanel lengthPanel(){
 	        JPanel name = new JPanel();

+ 8 - 6
src/gui/simulator/facilities/SimulatorStage.java

@@ -5,7 +5,6 @@ import java.awt.Graphics2D;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
-import java.util.GregorianCalendar;
 
 import agenda.Act;
 import agenda.Stage;
@@ -22,26 +21,29 @@ public class SimulatorStage extends DrawEngine implements Serializable {
     private Act playingact;
     private int movement1,movement2;
     private long lastTime;
-	private Rectangle2D.Double walkArea = new Rectangle2D.Double(20, 250, 350, 100);
+	private Rectangle2D.Double walkArea = new Rectangle2D.Double(20, 250, 350, 200);
+
+	//walk area
+	private static final int WALKAREAHEIGHT = 200;
 
     public SimulatorStage(int x, int y, Terrain terrain, boolean drawWalkArea) {
-        super(images, x, y, 1, 0, SimulatorPane.Objects.STAGE, terrain, new Rectangle2D.Double(20, 250, 350, 100), drawWalkArea);
+        super(images, x, y, 1, 0, SimulatorPane.Objects.STAGE, terrain, new Rectangle2D.Double(20, 250, 350, WALKAREAHEIGHT), drawWalkArea);
         changeLightbeam();
     }
 
     public SimulatorStage(int x, int y, double scale, double distance, Terrain terrain, boolean drawWalkArea) {
-        super(images, x, y, scale, distance, SimulatorPane.Objects.STAGE, terrain, new Rectangle2D.Double(20, 250, 350, 100), drawWalkArea);
+        super(images, x, y, scale, distance, SimulatorPane.Objects.STAGE, terrain, new Rectangle2D.Double(20, 250, 350, WALKAREAHEIGHT), drawWalkArea);
         changeLightbeam();
     }
 
 	public SimulatorStage(int x, int y, double scale, double distance, Terrain terrain) {
-		super(images, x, y, scale, distance, SimulatorPane.Objects.STAGE, terrain, new Rectangle2D.Double(20, 250, 350, 100), false);
+		super(images, x, y, scale, distance, SimulatorPane.Objects.STAGE, terrain, new Rectangle2D.Double(20, 250, 350, WALKAREAHEIGHT), false);
 		changeLightbeam();
 	}
 
 
 	public SimulatorStage(int x, int y, Terrain terrain) {
-		super(images, x, y, 1, 0,SimulatorPane.Objects.STAGE, terrain, new Rectangle2D.Double(20, 250, 350, 100), false);
+		super(images, x, y, 1, 0,SimulatorPane.Objects.STAGE, terrain, new Rectangle2D.Double(20, 250, 350, WALKAREAHEIGHT), false);
 		changeLightbeam();
 	}