neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kleine fixes

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@364 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-05-31 22:06:23 +02:00
parent d7aba3d722
commit 63192810a3
6 changed files with 71 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/jrummikub/control/turn/HumanTurnControl.java
View file

@ -439,7 +439,7 @@ public class HumanTurnControl extends AbstractTurnControl {
table.drop(
new StoneSet(selectedStones),
new Position(
pos.getX() + (set.size() - selectedStones.size()) * 0.5f, pos
pos.getX() + (set.getSize() - selectedStones.size()) * 0.5f, pos
.getY()));
}

2
src/jrummikub/model/StoneSet.java
View file

@ -208,7 +208,7 @@ public class StoneSet implements Iterable<Stone>, Sizeable {
*
* @return number of stones
*/
public int size() {
public int getSize() {
return stones.size();
}

65
src/jrummikub/model/StoneTray.java
View file

@ -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,7 +50,8 @@ 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
@ -60,23 +61,22 @@ 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,7 +100,7 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
return null;
}
private boolean lessOrEqual(float x, float y) {
private static boolean lessOrEqual(float x, float y) {
if (-0.000001f < y && y < 0.000001f) {
return (x < y + 0.000001f);
}
@ -120,13 +120,15 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
if (lessOrEqual(position1.getX() + object1.getWidth(), position2.getX())) {
return false;
}
if (lessOrEqual(position1.getY() + object1.getHeight(), position2.getY())) {
if (lessOrEqual(position1.getY() + object1.getHeight(),
position2.getY())) {
return false;
}
if (lessOrEqual(position2.getX() + object2.getWidth(), position1.getX())) {
return false;
}
if (lessOrEqual(position2.getY() + object2.getHeight(), position1.getY())) {
if (lessOrEqual(position2.getY() + object2.getHeight(),
position1.getY())) {
return false;
}
return true;
@ -156,19 +158,26 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
}
}
/**
* Will the object be moved horizontally or vertically
*
* @return boolean vertical movement
*/
private boolean getMoveOrientation(E object, Position position,
Pair<E, Position> blocking) {
float objectRight = position.getX() + object.getWidth();
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

8
src/jrummikub/view/impl/TablePanel.java
View file

@ -147,8 +147,8 @@ class TablePanel extends AbstractStonePanel implements ITablePanel {
if (p.getY() < miny)
miny = p.getY();
if (p.getX() + stoneSet.size() > maxx)
maxx = p.getX() + stoneSet.size();
if (p.getX() + stoneSet.getSize() > maxx)
maxx = p.getX() + stoneSet.getSize();
if (p.getY() + 1 > maxy)
maxy = p.getY() + 1;
@ -204,7 +204,7 @@ class TablePanel extends AbstractStonePanel implements ITablePanel {
}
// right connector
rect = new Rectangle2D.Float(x + stoneSet.size(), y, CONNECTOR_WIDTH, 1);
rect = new Rectangle2D.Float(x + stoneSet.getSize(), y, CONNECTOR_WIDTH, 1);
if (rect.contains(pos.getX(), pos.getY())) {
rightConnectorClickEvent.emit(stoneSet);
return true;
@ -235,7 +235,7 @@ class TablePanel extends AbstractStonePanel implements ITablePanel {
}
// right connector
rect = new Rectangle2D.Float(x + stoneSet.size(), y, CONNECTOR_WIDTH, 1);
rect = new Rectangle2D.Float(x + stoneSet.getSize(), y, CONNECTOR_WIDTH, 1);
if (rect.contains(pos.getX(), pos.getY())) {
rightHoveredConnector = stoneSet;
break;