Преглед на файлове

Enums added and calibration

Supermaniac101 преди 10 години
родител
ревизия
9316826264
променени са 4 файла, в които са добавени 39 реда и са изтрити 7 реда
  1. 8 1
      src/gui/simulator/AccessPoint.java
  2. 17 1
      src/gui/simulator/DrawEngine.java
  3. 2 0
      src/gui/simulator/ExitPoint.java
  4. 12 5
      src/gui/simulator/Terrain.java

+ 8 - 1
src/gui/simulator/AccessPoint.java

@@ -1,12 +1,16 @@
 package gui.simulator;
 
+import gui.simulator.Terrain.Location;
+
 import java.io.Serializable;
 
 public class AccessPoint extends DrawEngine implements Serializable {
 	
 	private static Images.ImageType images = Images.ImageType.Entrance;
 	private static String facilityName = "Ingang";
-		private Terrain terrain;
+	private Terrain terrain;
+	
+	
 
     public AccessPoint(Terrain terrain, int x, int y) {
         super(images, x, y, 1, 0, SimulatorPane.Objects.ENTRANCE, terrain);
@@ -26,4 +30,7 @@ public class AccessPoint extends DrawEngine implements Serializable {
     public String getFacilityName(){
     	return facilityName;
     }
+    
+    
+    
 }

+ 17 - 1
src/gui/simulator/DrawEngine.java

@@ -1,5 +1,7 @@
 package gui.simulator;
 
+import gui.simulator.Terrain.Location;
+
 import javax.imageio.ImageIO;
 
 import java.awt.*;
@@ -111,6 +113,20 @@ public abstract class DrawEngine {
     }
     
     public abstract String getFacilityName();
-
+    
+    public void changeLocation(Location loc){
+		switch(loc){
+		case NORTH:
+			//Visitors spawn north
+		case EAST:
+			//Visitors spawn east
+		case SOUTH:
+			//Visitors spawn south
+		case WEST:
+			//Visitors spawn west
+		default:
+			break;
+		}
+	}
 
 }

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

@@ -1,5 +1,7 @@
 package gui.simulator;
 
+import gui.simulator.Terrain.Location;
+
 import java.io.Serializable;
 
 public class ExitPoint extends DrawEngine implements Serializable {

+ 12 - 5
src/gui/simulator/Terrain.java

@@ -67,6 +67,8 @@ public class Terrain extends JPanel {
 	TexturePaint p;
 
 	private Agenda agenda;
+	
+	public enum Location{NORTH, EAST, SOUTH, WEST};
 
     public Terrain(int length, int width, SimulatorPane.Terrains terrain, Agenda agenda, SimulatorPane simulator){
     	//get values
@@ -225,7 +227,8 @@ public class Terrain extends JPanel {
                 if(dragObject != null){
                 	if(SwingUtilities.isLeftMouseButton(e) && (dragObject instanceof AccessPoint || dragObject instanceof ExitPoint)){    
                 		if(e.getX()<200){
-                			dragObject.setX(-25);
+                			dragObject.changeLocation(Location.WEST);
+                			dragObject.setX(-75);
                     		dragObject.setRotation(90);
                     		if(dragObject.getY()<80){
                     		dragObject.setY(80);
@@ -236,7 +239,8 @@ public class Terrain extends JPanel {
                     		}   
                 		} else if (e.getX()>200 && e.getX()< getFestivalWidth()-200){
                 			if(e.getY()<(getFestivalHeight()/2)){
-                				dragObject.setY(40);
+                				dragObject.changeLocation(Location.NORTH);
+                				dragObject.setY(0);
                         		dragObject.setRotation(180);
                         		   
                         		if(dragObject.getX()<100){
@@ -248,7 +252,8 @@ public class Terrain extends JPanel {
                             		}   
                         		
                 			} else if(e.getY()>(getFestivalHeight()/2)){
-                				dragObject.setY(getFestivalHeight()-100);
+                				dragObject.changeLocation(Location.SOUTH);
+                				dragObject.setY(getFestivalHeight()-75);
                         		dragObject.setRotation(180);
                         		
                         		if(dragObject.getX()<100){
@@ -260,12 +265,14 @@ public class Terrain extends JPanel {
                             		}    
                 			}
                 		} else if(e.getX()>getFestivalWidth()-200){
-                			dragObject.setX(getFestivalWidth()-200);
+                			dragObject.changeLocation(Location.EAST);
+                			dragObject.setX(getFestivalWidth()-125);
                     		dragObject.setRotation(90);
                     		if(dragObject.getY()<80){
                         		dragObject.setY(80);
-                        		} else if(dragObject.getY()>getFestivalHeight()-150){
+                        		} else if(dragObject.getY()>getFestivalHeight()-200){
                         		dragObject.setY(getFestivalHeight()-150);
+                        		dragObject.setRotation(90);
                         		} else {
                         		dragObject.setY(dragObject.getY() - (lastClickPosition.getY() - clickPoint.getY()));    
                         		}