summaryrefslogtreecommitdiffstats
path: root/src/jrummikub
diff options
context:
space:
mode:
Diffstat (limited to 'src/jrummikub')
-rw-r--r--src/jrummikub/model/StoneTray.java73
1 files changed, 42 insertions, 31 deletions
diff --git a/src/jrummikub/model/StoneTray.java b/src/jrummikub/model/StoneTray.java
index ba8e2da..60b8cc3 100644
--- a/src/jrummikub/model/StoneTray.java
+++ b/src/jrummikub/model/StoneTray.java
@@ -11,7 +11,7 @@ import jrummikub.util.Pair;
* or {@link StoneSet}s.
*
* @param <E>
- * Type of positioned objects (must implement Sizeable)
+ * Type of positioned objects (must implement Sizeable)
*/
public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
protected HashMap<E, Pair<E, Position>> objects = new HashMap<E, Pair<E, Position>>();
@@ -50,8 +50,7 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
if (currentObject == object)
continue;
Position currentPosition = getPosition(currentObject);
- if (!objectsOverlap(object, position, currentObject,
- currentPosition)) {
+ if (!objectsOverlap(object, position, currentObject, currentPosition)) {
continue;
}
// Object would be placed inside the current object
@@ -61,22 +60,23 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
Position newPosition = null;
// Move object to avoid overlap
switch (newDirection) {
- case TOP:
- newPosition = new Position(currentPosition.getX(),
- position.getY() - currentObject.getHeight());
- break;
- case BOTTOM:
- newPosition = new Position(currentPosition.getX(),
- position.getY() + object.getHeight());
- break;
- case LEFT:
- newPosition = new Position(position.getX()
- - currentObject.getWidth(), currentPosition.getY());
- break;
- case RIGHT:
- newPosition = new Position(position.getX() + object.getWidth(),
- currentPosition.getY());
- break;
+ case TOP:
+ newPosition = new Position(currentPosition.getX(), position.getY()
+ - currentObject.getHeight());
+ break;
+ case BOTTOM:
+ newPosition = new Position(currentPosition.getX(), position.getY()
+ + object.getHeight());
+ break;
+ case LEFT:
+ newPosition = new Position(
+ position.getX() - currentObject.getWidth(),
+ currentPosition.getY());
+ break;
+ case RIGHT:
+ newPosition = new Position(position.getX() + object.getWidth(),
+ currentPosition.getY());
+ break;
}
objects.remove(currentObject);
@@ -85,14 +85,14 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
}
/**
- * Checks whether the object may be placed on the given position, computes
- * new position if not
+ * Checks whether the object may be placed on the given position, computes new
+ * position if not
*
* @param object
- * to be dropped
+ * to be dropped
* @param dir
* @param pos
- * the object is dropped at
+ * the object is dropped at
* @return null if the drop is valid, new position otherwise
*/
protected Pair<Position, Direction> fixInvalidDrop(E object, Position pos,
@@ -100,20 +100,33 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
return null;
}
+ private boolean lessOrEqual(float x, float y) {
+ if (-0.000001f < y && y < 0.000001f) {
+ return (x < y + 0.000001f);
+ }
+
+ float q = x / y;
+ if (0.999999f < q && q < 1.000001f) {
+ return true;
+ }
+
+ return x < y;
+ }
+
/** Tests whether two objects overlap **/
private boolean objectsOverlap(E object1, Position position1, E object2,
Position position2) {
// Tests if position is left of, above ... the current object
- if (position1.getX() + object1.getWidth() <= position2.getX()) {
+ if (lessOrEqual(position1.getX() + object1.getWidth(), position2.getX())) {
return false;
}
- if (position1.getY() + object1.getHeight() <= position2.getY()) {
+ if (lessOrEqual(position1.getY() + object1.getHeight(), position2.getY())) {
return false;
}
- if (position1.getX() >= position2.getX() + object2.getWidth()) {
+ if (lessOrEqual(position2.getX() + object2.getWidth(), position1.getX())) {
return false;
}
- if (position1.getY() >= position2.getY() + object2.getHeight()) {
+ if (lessOrEqual(position2.getY() + object2.getHeight(), position1.getY())) {
return false;
}
return true;
@@ -149,15 +162,13 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
float blockingRight = blocking.getSecond().getX()
+ blocking.getFirst().getWidth();
float overlapRight = Math.min(objectRight, blockingRight);
- float overlapLeft = Math.max(position.getX(), blocking.getSecond()
- .getX());
+ float overlapLeft = Math.max(position.getX(), blocking.getSecond().getX());
float overlapX = overlapRight - overlapLeft;
float objectBottom = position.getY() + object.getHeight();
float blockingBottom = blocking.getSecond().getY()
+ blocking.getFirst().getHeight();
float overlapBottom = Math.min(objectBottom, blockingBottom);
- float overlapTop = Math.max(position.getY(), blocking.getSecond()
- .getY());
+ float overlapTop = Math.max(position.getY(), blocking.getSecond().getY());
float overlapY = overlapBottom - overlapTop;
// vertical or horizontal Shift
// TODO magic factor