Commit 8b5aff2a authored by Nico Mack's avatar Nico Mack

Minor API changes

parent 2fe5cd47
...@@ -34,12 +34,19 @@ public class Bounds2D { ...@@ -34,12 +34,19 @@ public class Bounds2D {
public boolean includes(double x, double y) { public boolean includes(double x, double y) {
boolean includes = true; boolean includes = true;
includes &= (x >= this.x1) && (x <= this.x2); includes &= (x >= this.x1) && (x <= this.x2);
includes &= (y >= this.y1) && (y <= this.y2); includes &= (y >= this.y1) && (y <= this.y2);
return includes; return includes;
} }
public boolean includes(Bounds2D candidate) {
boolean includes = true;
includes &= (candidate.x1 >= this.x1) && (candidate.x2 <= this.x2);
includes &= (candidate.y1 >= this.y1) && (candidate.y2 <= this.y2);
return includes;
}
public Bounds2D translate(double x, double y) { public Bounds2D translate(double x, double y) {
double tx1 = x1 + x; double tx1 = x1 + x;
double tx2 = x2 + x; double tx2 = x2 + x;
......
...@@ -111,21 +111,6 @@ public class Point extends Float implements Comparable<Point>, KdComparator<Poin ...@@ -111,21 +111,6 @@ public class Point extends Float implements Comparable<Point>, KdComparator<Poin
public Point(Class<? extends CoordinateState> initialState) { public Point(Class<? extends CoordinateState> initialState) {
super(0, 0); super(0, 0);
angle = 0; angle = 0;
// switch (initialState.getSimpleName()) {
// case "CameraCoordinates": //$NON-NLS-1$
// state = new CameraCoordinates(this, x, y);
// break;
// case "ScreenCoordinates": //$NON-NLS-1$
// state = new ScreenCoordinates(this, x, y);
// break;
// case "TableCoordinates": //$NON-NLS-1$
// state = new TableCoordinates(this, x, y);
// break;
// default:
// state = new CameraCoordinates(this, x, y);
// break;
// }
state = CoordinateStateFactory.newInstance(initialState, this, x, y); state = CoordinateStateFactory.newInstance(initialState, this, x, y);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment