[vassalengine-svn] SF.net SVN: vassalengine: [1763] VASSAL-src/branches/uckelman-merge/VASSAL
Brought to you by:
rodneykinney,
uckelman
Menu
▾
▴
[vassalengine-svn] SF.net SVN: vassalengine: [1763] VASSAL-src/branches/uckelman-merge/VASSAL
|
From: <uck...@us...> - 2007-02-28 21:03:38
|
Revision: 1763
http://svn.sourceforge.net/vassalengine/?rev=1763&view=rev
Author: uckelman
Date: 2007-02-28 13:03:38 -0800 (Wed, 28 Feb 2007)
Log Message:
-----------
Every Graphics object may be cast to a Graphics2D, so checking instanceof
first is a waste of time.
Modified Paths:
--------------
VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/SelectionHighlighter.java
VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/HexGrid.java
VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/SquareGrid.java
VASSAL-src/branches/uckelman-merge/VASSAL/counters/AreaOfEffect.java
VASSAL-src/branches/uckelman-merge/VASSAL/counters/FreeRotator.java
VASSAL-src/branches/uckelman-merge/VASSAL/counters/Hideable.java
Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/SelectionHighlighter.java
===================================================================
--- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/SelectionHighlighter.java 2007-02-28 20:44:40 UTC (rev 1762)
+++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/SelectionHighlighter.java 2007-02-28 21:03:38 UTC (rev 1763)
@@ -57,10 +57,10 @@
int x1 = x - (int) (image.getWidth(null) * zoom / 2);
int y1 = y - (int) (image.getHeight(null) * zoom / 2);
if (zoom == 1.0) {
- g.drawImage(image, x1, y1, null);
+ g2d.drawImage(image, x1, y1, null);
}
else {
- g.drawImage(GameModule.getGameModule().getDataArchive().getScaledImage(image, zoom), x1, y1, null);
+ g2d.drawImage(GameModule.getGameModule().getDataArchive().getScaledImage(image, zoom), x1, y1, null);
}
}
}
Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/HexGrid.java
===================================================================
--- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/HexGrid.java 2007-02-28 20:44:40 UTC (rev 1762)
+++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/HexGrid.java 2007-02-28 21:03:38 UTC (rev 1763)
@@ -635,13 +635,14 @@
if (!bounds.intersects(visibleRect)) {
return;
}
- if (g instanceof Graphics2D) {
- ((Graphics2D) g).addRenderingHints(new RenderingHints(RenderingHints.KEY_ANTIALIASING,
- RenderingHints.VALUE_ANTIALIAS_ON));
- }
+
+ Graphics2D g2d = (Graphics2D) g;
- g.setColor(color == null ? Color.black : color);
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+ g2d.setColor(color == null ? Color.black : color);
+
float x1,y1, x2,y2, x3,y3, x4, y4;
float deltaX = (float) (this.dx * zoom);
@@ -651,11 +652,11 @@
Rectangle region = bounds.intersection(visibleRect);
- Shape oldClip = g.getClip();
+ Shape oldClip = g2d.getClip();
if (oldClip != null) {
Area clipArea = new Area(oldClip);
clipArea.intersect(new Area(region));
- g.setClip(clipArea);
+ g2d.setClip(clipArea);
}
if (sideways) {
@@ -697,16 +698,16 @@
rotate(p3);
rotate(p4);
}
- g.drawLine(p1.x, p1.y, p2.x, p2.y);
- g.drawLine(p2.x, p2.y, p3.x, p3.y);
- g.drawLine(p3.x, p3.y, p4.x, p4.y);
+ g2d.drawLine(p1.x, p1.y, p2.x, p2.y);
+ g2d.drawLine(p2.x, p2.y, p3.x, p3.y);
+ g2d.drawLine(p3.x, p3.y, p4.x, p4.y);
if (dotsVisible) {
center.setLocation(Math.round(x), Math.round(y));
rotateIfSideways(center);
- g.fillRect(center.x, center.y, 2, 2);
+ g2d.fillRect(center.x, center.y, 2, 2);
center.setLocation(Math.round(x + deltaX), Math.round(y + deltaY / 2));
rotateIfSideways(center);
- g.fillRect(center.x, center.y, 2, 2);
+ g2d.fillRect(center.x, center.y, 2, 2);
}
x1 += deltaX;
x2 += deltaX;
@@ -726,9 +727,9 @@
rotate(p3);
rotate(p4);
}
- g.drawLine(p1.x, p1.y, p2.x, p2.y);
- g.drawLine(p2.x, p2.y, p3.x, p3.y);
- g.drawLine(p3.x, p3.y, p4.x, p4.y);
+ g2d.drawLine(p1.x, p1.y, p2.x, p2.y);
+ g2d.drawLine(p2.x, p2.y, p3.x, p3.y);
+ g2d.drawLine(p3.x, p3.y, p4.x, p4.y);
if (x == xmin) {
p1.setLocation(Math.round(x - r), Math.round(y));
p2.setLocation(Math.round(x - r / 2), Math.round(y + deltaY / 2));
@@ -736,11 +737,11 @@
rotate(p1);
rotate(p2);
}
- g.drawLine(p1.x, p1.y, p2.x, p2.y);
+ g2d.drawLine(p1.x, p1.y, p2.x, p2.y);
}
}
}
- g.setClip(oldClip);
+ g2d.setClip(oldClip);
}
public void setGridNumbering(GridNumbering numbering) {
Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/SquareGrid.java
===================================================================
--- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/SquareGrid.java 2007-02-28 20:44:40 UTC (rev 1762)
+++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/SquareGrid.java 2007-02-28 21:03:38 UTC (rev 1763)
@@ -429,18 +429,18 @@
if (!bounds.intersects(visibleRect)) {
return;
}
- if (g instanceof Graphics2D) {
- ((Graphics2D) g).addRenderingHints(new RenderingHints(RenderingHints.KEY_ANTIALIASING,
- RenderingHints.VALUE_ANTIALIAS_ON));
- }
+ Graphics2D g2d = (Graphics2D) g;
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+
Rectangle region = bounds.intersection(visibleRect);
- Shape oldClip = g.getClip();
+ Shape oldClip = g2d.getClip();
if (oldClip != null) {
Area clipArea = new Area(oldClip);
clipArea.intersect(new Area(region));
- g.setClip(clipArea);
+ g2d.setClip(clipArea);
}
double deltaX = scale * dx;
@@ -455,15 +455,15 @@
Point p1 = new Point();
Point p2 = new Point();
- g.setColor(color == null ? Color.black : color);
+ g2d.setColor(color == null ? Color.black : color);
// x is the location of a vertical line
for (double x = xmin; x < xmax; x += deltaX) {
p1.move((int) Math.round(x), region.y);
p2.move((int) Math.round(x), region.y + region.height);
- g.drawLine(p1.x, p1.y, p2.x, p2.y);
+ g2d.drawLine(p1.x, p1.y, p2.x, p2.y);
}
for (double y = ymin; y < ymax; y += deltaY) {
- g.drawLine(region.x, (int) Math.round(y), region.x + region.width, (int) Math.round(y));
+ g2d.drawLine(region.x, (int) Math.round(y), region.x + region.width, (int) Math.round(y));
}
if (dotsVisible) {
xmin = reversed ? bounds.x + scale * origin.x + bounds.width - deltaX * Math.round((bounds.x + scale * origin.x + bounds.width - region.x) / deltaX)
@@ -473,11 +473,11 @@
for (double x = xmin; x < xmax; x += deltaX) {
for (double y = ymin; y < ymax; y += deltaY) {
p1.move((int) Math.round(x - .5), (int) Math.round(y - .5));
- g.fillRect(p1.x, p1.y, 2, 2);
+ g2d.fillRect(p1.x, p1.y, 2, 2);
}
}
}
- g.setClip(oldClip);
+ g2d.setClip(oldClip);
}
public Configurer getConfigurer() {
Modified: VASSAL-src/branches/uckelman-merge/VASSAL/counters/AreaOfEffect.java
===================================================================
--- VASSAL-src/branches/uckelman-merge/VASSAL/counters/AreaOfEffect.java 2007-02-28 20:44:40 UTC (rev 1762)
+++ VASSAL-src/branches/uckelman-merge/VASSAL/counters/AreaOfEffect.java 2007-02-28 21:03:38 UTC (rev 1763)
@@ -174,25 +174,23 @@
// The transparency is only draw on a Map.View component. Only the GamePiece is drawn within
// other windows (Counter Palette, etc.)
if (obs instanceof Map.View) {
- if (g instanceof Graphics2D) {
- Graphics2D g2d = (Graphics2D) g;
+ Graphics2D g2d = (Graphics2D) g;
- Color oldColor = g2d.getColor();
- g2d.setColor(transparencyColor);
+ Color oldColor = g2d.getColor();
+ g2d.setColor(transparencyColor);
- Composite oldComposite = g2d.getComposite();
- g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, transparencyLevel));
+ Composite oldComposite = g2d.getComposite();
+ g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, transparencyLevel));
- Area a = getArea();
+ Area a = getArea();
- if (zoom != 1.0) {
- a = new Area(AffineTransform.getScaleInstance(zoom,zoom).createTransformedShape(a));
- }
- g2d.fill(a);
-
- g2d.setColor(oldColor);
- g2d.setComposite(oldComposite);
+ if (zoom != 1.0) {
+ a = new Area(AffineTransform.getScaleInstance(zoom,zoom).createTransformedShape(a));
}
+ g2d.fill(a);
+
+ g2d.setColor(oldColor);
+ g2d.setComposite(oldComposite);
}
}
Modified: VASSAL-src/branches/uckelman-merge/VASSAL/counters/FreeRotator.java
===================================================================
--- VASSAL-src/branches/uckelman-merge/VASSAL/counters/FreeRotator.java 2007-02-28 20:44:40 UTC (rev 1762)
+++ VASSAL-src/branches/uckelman-merge/VASSAL/counters/FreeRotator.java 2007-02-28 21:03:38 UTC (rev 1763)
@@ -228,7 +228,7 @@
}
public void draw(Graphics g, Map map) {
- if (drawGhost && g instanceof Graphics2D) {
+ if (drawGhost) {
Point p = map.componentCoordinates(getGhostPosition());
Graphics2D g2d = (Graphics2D) g;
AffineTransform t = g2d.getTransform();
Modified: VASSAL-src/branches/uckelman-merge/VASSAL/counters/Hideable.java
===================================================================
--- VASSAL-src/branches/uckelman-merge/VASSAL/counters/Hideable.java 2007-02-28 20:44:40 UTC (rev 1762)
+++ VASSAL-src/branches/uckelman-merge/VASSAL/counters/Hideable.java 2007-02-28 21:03:38 UTC (rev 1763)
@@ -144,20 +144,19 @@
return;
}
else if (invisibleToOthers()) {
+ Graphics2D g2d = (Graphics2D) g;
+
if (bgColor != null) {
- Graphics2D g2d = (Graphics2D) g;
g.setColor(bgColor);
AffineTransform t = AffineTransform.getScaleInstance(zoom, zoom);
t.translate(x / zoom, y / zoom);
g2d.fill(t.createTransformedShape(piece.getShape()));
}
- if (g instanceof Graphics2D) {
- Graphics2D g2d = (Graphics2D) g;
- Composite oldComposite = g2d.getComposite();
- g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3F));
- piece.draw(g, x, y, obs, zoom);
- g2d.setComposite(oldComposite);
- }
+
+ Composite oldComposite = g2d.getComposite();
+ g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3F));
+ piece.draw(g, x, y, obs, zoom);
+ g2d.setComposite(oldComposite);
}
else {
piece.draw(g, x, y, obs, zoom);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|