Merge pull request #38 from NineNineFive/Lars

Merge branch 'master' into Lars

Author: lmbek

.gitignore

@@ -2,4 +2,4 @@
 /workspace.xml
 /PathfindingProject.iml
 PathfindingProject.iml
-/out/
+/out/

src/files/Controller.java

@@ -1,7 +1,10 @@
 package files;
 
 import files.controllers.Input;
-import files.models.Graph;
+import files.interfaces.Geometry;
+import files.models.Shape;
+
+import java.util.ArrayList;
 
 public class Controller {
     private static boolean created = false;
@@ -15,6 +18,7 @@ public class Controller {
         this.view = view;
         this.input = new Input(model,view);
         this.run();
+        this.updateView();
     }
 
     private void onlyOneInstance (){
@@ -33,4 +37,14 @@ private void run(){
         //view.getUI().getGraphic().setGraph(graph);
         //view.getUI().getGraphic().draw();
     }
+
+    private void updateView(){
+        // TODO: Insert Environment
+        ArrayList<Shape> shapes = model.getEnvironment().getShapes();
+        //view.setEnvironment();
+    }
+
+    private void updateModel(){
+
+    }
 }

src/files/Model.java

@@ -11,11 +11,13 @@
 public class Model {
     private static boolean created = false;
     private Graph graph;
+    private Environment environment;
+    private Pathfinding pathfinding;
 
     public Model(){
         this.onlyOneInstance(); // Limit to only 1 instance of the Model class
-        Environment environment = new Environment();
-        Pathfinding pathfinding = new Pathfinding();
+        environment = new Environment();
+        pathfinding = new Pathfinding();
         //graph = new Graph(6);
         //graph.graphTest(6);
     }
@@ -36,4 +38,8 @@ public Graph getGraph() {
     public void setGraph(Graph graph) {
         this.graph = graph;
     }
+
+    public Environment getEnvironment() {
+        return environment;
+    }
 }

src/files/views/Environment.java renamed to src/files/interfaces/Environment.java

@@ -1,4 +1,4 @@
-package files.views;
+package files.interfaces;
 
 import javafx.scene.canvas.GraphicsContext;
 

src/files/interfaces/Geometry.java

@@ -0,0 +1,7 @@
+package files.interfaces;
+
+import files.models.shapes.Point;
+
+public interface Geometry {
+    boolean isColliding(Point point);
+}

src/files/models/Environment.java

@@ -1,4 +1,22 @@
 package files.models;
 
+import files.models.shapes.Rectangle2D;
+import java.util.ArrayList;
+
 public class Environment {
+    ArrayList<Shape> shapes = new ArrayList<Shape>();
+
+    public void generateEnvironment(){
+        //TODO: Make random map generator
+    }
+
+    public void addShape() {
+        shapes.add(new Rectangle2D(50, 50, 20, 50));
+        shapes.add(new Rectangle2D(350, 50, 15, 150));
+    }
+
+    public ArrayList<Shape> getShapes(){
+        return shapes;
+    }
 }
+

src/files/models/Shape.java

@@ -0,0 +1,6 @@
+package files.models;
+
+import files.interfaces.Geometry;
+
+public abstract class Shape implements Geometry {
+}

src/files/models/shapes/Line2D.java

@@ -0,0 +1,26 @@
+package files.models.shapes;
+
+import files.interfaces.Geometry;
+import files.models.Shape;
+
+public class Line2D extends Shape {
+    private Point start;
+    private Point end;
+
+    Line2D(Point start, Point end) {
+        this.start = start;
+        this.end = end;
+    }
+
+    public Point getStart() {
+        return start;
+    }
+
+    public Point getEnd() {
+        return end;
+    }
+
+    public boolean isColliding(Point point){
+        return point.isOnLine(this);
+    }
+}

src/files/models/shapes/Point.java

@@ -0,0 +1,62 @@
+package files.models.shapes;
+
+public class Point {
+    private double x, y, z;
+
+    Point(double x) {
+        this(x, 0, 0);
+    }
+
+    Point(double x, double y) {
+        this(x, y, 0);
+    }
+
+    Point(double x, double y, double z) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
+    int calcRelation(Line2D line) {
+        // Will return greater than 0 if point is left of line
+        // Will return 0 if point is on the line
+        // Will return left than 0 if point is right of line
+        // Formula: d=(x−x1)(y2−y1)−(y−y1)(x2−x1)
+        // we use d as result, we use x as point.getX(), we use y as point.getY(),
+        // we use x1 as start.getX(), we use y1 as start.getY(), we use x2 as end.getX(), and we use y2 as end.getY()
+        double result = (x - line.getStart().getX()) * (line.getEnd().getY() - line.getStart().getY()) - (y - line.getStart().getY()) * (line.getEnd().getX() - line.getStart().getX());
+        if (0 < result) {
+            return -1;
+        } else if (0 > result) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+
+    boolean isLeftOfLine(Line2D line) {
+        if (0 < calcRelation(line))
+            return true; // if the calculation is positive, the point is on the left side of the line
+        else return false;
+    }
+
+    boolean isOnLine(Line2D line) {
+        if (0 == calcRelation(line)) return true; // if the calculation is zero, the point is on the line
+        else return false;
+    }
+
+    boolean isRightOfLine(Line2D line) {
+        // Our Choice: This is the only important check, as we chose to use this continiously for collision detection in objects
+        if (0 > calcRelation(line))
+            return true; // if the calculation is negative, the point is on the right side of the line
+        else return false;
+    }
+
+    public double getX() {
+        return x;
+    }
+
+    public double getY() {
+        return y;
+    }
+}

src/files/models/shapes/Rectangle2D.java

@@ -0,0 +1,32 @@
+package files.models.shapes;
+import files.interfaces.Geometry;
+import files.models.Shape;
+
+public class Rectangle2D extends Shape {
+    private Point A, B, C, D;
+    private Line2D AB, BD, CD, AC;
+    private Point position;
+    private Point size;
+    private Triangle2D firstHalf;
+    private Triangle2D secondHalf;
+
+    public Rectangle2D(double x, double y, double width, double height) {
+        A = new Point(x,y);
+        B = new Point(x+width,y);
+        C = new Point(x,y+height);
+        D = new Point(x+width,y+height);
+        AB = new Line2D(A,B);
+        BD = new Line2D(B,D);
+        CD = new Line2D(C,D);
+        AC = new Line2D(A,C);
+        firstHalf = new Triangle2D(A, B, C);
+        secondHalf = new Triangle2D(D, B, C);
+
+        this.position = A;
+        this.size = new Point(width, height);
+    }
+
+    public boolean isColliding(Point obj) {
+        return firstHalf.isColliding(obj) || secondHalf.isColliding(obj);
+    }
+}