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

Tests für Sets mit mehr Farben, mehr Values, ...

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@332 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-05-31 00:58:46 +02:00
parent d66d73ea8f
commit f22ff5f0f1
12 changed files with 308 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

82
src/jrummikub/view/impl/StonePainter.java
View file

@ -60,7 +60,8 @@ class StonePainter {
int g = (int) (color.getGreen() * BRIGHTER_SCALE);
int b = (int) (color.getBlue() * BRIGHTER_SCALE);
return new Color(r > 255 ? 255 : r, g > 255 ? 255 : g, b > 255 ? 255 : b);
return new Color(r > 255 ? 255 : r, g > 255 ? 255 : g, b > 255 ? 255
: b);
}
private static Color hover(Color color) {
@ -68,19 +69,28 @@ class StonePainter {
int g = (int) (color.getGreen() * HOVER_RATIO + 255 * (1 - HOVER_RATIO));
int b = (int) (color.getBlue() * HOVER_RATIO + 255 * (1 - HOVER_RATIO));
return new Color(r > 255 ? 255 : r, g > 255 ? 255 : g, b > 255 ? 255 : b);
return new Color(r > 255 ? 255 : r, g > 255 ? 255 : g, b > 255 ? 255
: b);
}
private static Color getColor(StoneColor color) {
switch (color) {
case BLACK:
return new Color(0.15f, 0.15f, 0.15f);
case BLUE:
return new Color(0.0f, 0.0f, 1.0f);
case ORANGE:
return new Color(1.0f, 0.4f, 0.0f);
case RED:
return new Color(0.9f, 0.0f, 0.25f);
case BLACK:
return new Color(0.15f, 0.15f, 0.15f);
case BLUE:
return new Color(0.0f, 0.0f, 1.0f);
case ORANGE:
return new Color(1.0f, 0.4f, 0.0f);
case RED:
return new Color(0.9f, 0.0f, 0.25f);
case BROWN:
return new Color(0.5f, 0.25f, 0.0f);
case GREEN:
return new Color(0.0f, 0.75f, 0.0f);
case VIOLET:
return new Color(0.75f, 0.325f, 0.75f);
case WHITE:
return new Color(1.0f, 1.0f, 1.0f);
}
return null;
@ -90,7 +100,7 @@ class StonePainter {
* Sets the new grid scale
*
* @param scale
* the new scale
* the new scale
*/
public void setScale(float scale) {
this.scale = scale;
@ -104,9 +114,9 @@ class StonePainter {
/**
* @param x
* x position in screen coordinates
* x position in screen coordinates
* @param y
* y position in screen coordinates
* y position in screen coordinates
* @return position in grid coordinates
*/
public Position calculatePosition(int x, int y) {
@ -178,23 +188,29 @@ class StonePainter {
Color hoveredFg = hover(defaultFg);
Color hoveredSelectedFg = hover(selectedFg);
defaultStones.put(color, prepaintColor(defaultFg, defaultBackground));
selectedStones.put(color, prepaintColor(selectedFg, selectedBackground));
hoveredStones.put(color, prepaintColor(hoveredFg, hoveredBackground));
hoveredSelectedStones.put(color,
prepaintColor(hoveredSelectedFg, hoveredSelectedBackground));
defaultStones.put(color,
prepaintColor(defaultFg, defaultBackground));
selectedStones.put(color,
prepaintColor(selectedFg, selectedBackground));
hoveredStones.put(color,
prepaintColor(hoveredFg, hoveredBackground));
hoveredSelectedStones
.put(color,
prepaintColor(hoveredSelectedFg,
hoveredSelectedBackground));
}
}
/**
* @param scale
* the scaling factor for the grid coordinates
* the scaling factor for the grid coordinates
*/
StonePainter(float scale) {
setScale(scale);
}
private void paintStoneBackground(Graphics2D g, Rectangle r, Color background) {
private void paintStoneBackground(Graphics2D g, Rectangle r,
Color background) {
// Paint background
g.setColor(background);
g.fillRect(r.x, r.y, r.width, r.height);
@ -294,8 +310,9 @@ class StonePainter {
pos + (fm.getAscent() - fm.getDescent()) / 2 + 1);
}
g.setColor(color);
g.drawString(value, (int) (r.x + r.width / 2 - stringRect.getWidth() / 2),
pos + (fm.getAscent() - fm.getDescent()) / 2);
g.drawString(value,
(int) (r.x + r.width / 2 - stringRect.getWidth() / 2), pos
+ (fm.getAscent() - fm.getDescent()) / 2);
}
private void paintCircle(Graphics2D g, Rectangle r, Color background) {
@ -304,26 +321,27 @@ class StonePainter {
// Paint circle
g.setColor(background.darker());
g.drawArc(r.x + r.width / 2 - size / 2, pos - size / 2, size, size, 50, 170);
g.drawArc(r.x + r.width / 2 - size / 2, pos - size / 2, size, size, 50,
170);
g.setColor(brighter(background));
g.drawArc((int) (r.x + r.width / 2 - size / 2), pos - size / 2, size, size,
-130, 170);
g.drawArc((int) (r.x + r.width / 2 - size / 2), pos - size / 2, size,
size, -130, 170);
}
/**
* Paints a stone
*
* @param g
* the graphics context to paint the stone on
* the graphics context to paint the stone on
* @param stone
* the stone to paint
* the stone to paint
* @param p
* the position of the stone
* the position of the stone
* @param selected
* if selected is true the stone will be painted darker
* if selected is true the stone will be painted darker
* @param hovered
* if hovered is true the stone will be painted brighter
* if hovered is true the stone will be painted brighter
*/
public void paintStone(Graphics2D g, Stone stone, Position p,
boolean selected, boolean hovered) {
@ -350,8 +368,8 @@ class StonePainter {
if (stone.isJoker()) {
g.drawImage(stoneMap.get(stone.getColor()).get(0), x, y, null);
} else {
g.drawImage(stoneMap.get(stone.getColor()).get(stone.getValue()), x, y,
null);
g.drawImage(stoneMap.get(stone.getColor()).get(stone.getValue()),
x, y, null);
}
}
}