Re-organize code

Author: mal-w

src/main/java/net/rptools/maptool/model/drawing/RightAngleConeTemplate.java

@@ -27,13 +27,6 @@
 import net.rptools.maptool.server.proto.drawing.DrawableDto;
 import net.rptools.maptool.server.proto.drawing.RightAngleConeTemplateDto;
 
-/**
- * The radius template draws a highlight over all the squares effected from a specific spine.
- *
- * @author jgorrell
- * @version $Revision: 5945 $ $Date: 2013-06-03 04:35:50 +0930 (Mon, 03 Jun 2013) $ $Author:
- *     azhrei_fje $
- */
 public class RightAngleConeTemplate extends AbstractTemplate {
   // The definition of the cone is it is as wide as it is
   // long, so the cone angle is tan inverse of 1/2, since
@@ -95,40 +88,6 @@ public void calculateTheta(MouseEvent e, ZoneRenderer renderer) {
     setTheta(Math.atan2(opposite, adjacent));
   }
 
-  /**
-   * Paint the border at a specific radius.
-   *
-   * @param g Where to paint
-   * @param x Distance from vertex along X axis in cell coordinates.
-   * @param y Distance from vertex along Y axis in cell coordinates.
-   * @param xOff Distance from vertex along X axis in screen coordinates.
-   * @param yOff Distance from vertex along Y axis in screen coordinates.
-   * @param gridSize The size of one side of the grid in screen coordinates.
-   * @param distance The distance in cells from the vertex to the cell which is offset from the
-   *     vertex by {@code x & y}.
-   * @param radius The radius where the border is painted.
-   * @see AbstractTemplate#paintBorder(Graphics2D, int, int, int, int, int, int)
-   */
-  protected void paintBorderAtRadius(
-      Graphics2D g, int x, int y, int xOff, int yOff, int gridSize, int distance, int radius) {
-    // At the border?
-    if (distance == radius) {
-      // Paint lines between vertical boundaries if needed
-      if (getDistance(x + 1, y) > radius) {
-        for (Quadrant q : Quadrant.values()) {
-          paintFarVerticalBorder(g, xOff, yOff, gridSize, q);
-        }
-      }
-
-      // Paint lines between horizontal boundaries if needed
-      if (getDistance(x, y + 1) > radius) {
-        for (Quadrant q : Quadrant.values()) {
-          paintFarHorizontalBorder(g, xOff, yOff, gridSize, q);
-        }
-      }
-    }
-  }
-
   /*---------------------------------------------------------------------------------------------
    * Overridden AbstractTemplate Methods
    *-------------------------------------------------------------------------------------------*/
@@ -139,7 +98,14 @@ protected void paintBorderAtRadius(
   @Override
   protected void paintBorder(
       Graphics2D g, int x, int y, int xOff, int yOff, int gridSize, int distance) {
-    paintBorderAtRadius(g, x, y, xOff, yOff, gridSize, distance, getRadius());
+    // NO-OP, not used. I overrode AbstractTemplate#paint in this class and I don't call paintBorder
+    // and paintArea separately anymore.
+  }
+
+  @Override
+  protected void paintArea(Graphics2D g, int x, int y, int xOff, int yOff, int gridSize, int distance) {
+    // NO-OP, not used. I overrode AbstractTemplate#paint in this class and I don't call paintBorder
+    // and paintArea separately anymore.
   }
 
   private void splitAndQueueVertically(Rectangle r, PriorityQueue<Rectangle> q, int gridSize) {
@@ -179,20 +145,54 @@ private void splitAndQueueHorizontally(Rectangle r, PriorityQueue<Rectangle> q,
 
   @Override
   protected void paint(Graphics2D g, boolean border, boolean area) {
-    if (MapTool.getCampaign().getZone(getZoneId()) == null) {
-      return;
+    Area aoe = this.getArea();
+    Path2D.Double path = getConePath();
+
+    // Paint what is needed.
+    if (area) {
+      g.fill(aoe);
+    }
+    if (border) {
+      if (this.showAOEOverlay) { // While drawing, it's helpful to see the cone overlay.
+        g.draw(path);
+      }
+      // g.draw(boundingBox);
+      // g.draw(gridSnappedBoundingBox);
+      g.draw(aoe);
     }
+    // endif
+  }
+
+  /*---------------------------------------------------------------------------------------------
+   * Drawable Interface Methods
+   *-------------------------------------------------------------------------------------------*/
+
+  /**
+   * @see Drawable#getBounds()
+   */
+  public Rectangle getBounds() {
+    if (getZoneId() == null) {
+      // This avoids a NPE when loading up a campaign
+      return new Rectangle();
+    }
+    Zone zone = MapTool.getCampaign().getZone(getZoneId());
+    if (zone == null) {
+      return new Rectangle();
+    }
+    int gridSize = zone.getGrid().getSize();
+    int quadrantSize = getRadius() * gridSize + BOUNDS_PADDING;
+    ZonePoint vertex = getVertex();
+    return new Rectangle(
+        vertex.x - quadrantSize, vertex.y - quadrantSize, quadrantSize * 2, quadrantSize * 2);
+  }
+
+  private Path2D.Double getConePath() {
     ZonePoint sp = getVertex();
 
     // Only paint if the start and endpoints are not equal and the
     // radius is non-zero.
-    // TODO: Radius is pretty "sticky" when going cornerwise.. It flips from
-    // 5 -> 15 too easily...
-    // Might need to checkout how getRadius is being calculated? It's probably
-    // snapping to an endpoint when all you really want to do is round to
-    // the nearest "gridSize" in game units.
     double radius = getRadius();
-    if (getRadius() == 0) return;
+    if (getRadius() == 0) return new Path2D.Double();
 
     Grid grid = MapTool.getCampaign().getZone(getZoneId()).getGrid();
     int gridSize = grid.getSize();
@@ -212,37 +212,49 @@ protected void paint(Graphics2D g, boolean border, boolean area) {
     path.lineTo(vertex1X, vertex1Y);
     path.lineTo(vertex2X, vertex2Y);
     path.lineTo(sp.x, sp.y);
+    return path;
+  }
+
+  @Override
+  public Area getArea() {
+    if (MapTool.getCampaign().getZone(getZoneId()) == null) {
+      return new Area();
+    }
+    Grid grid = MapTool.getCampaign().getZone(getZoneId()).getGrid();
+    int gridSize = grid.getSize();
+
+    Path2D.Double path = getConePath();
 
     //  boundingBox is the minimal bounding box of the cone.
     //  griddedBoundingBox is the bounding box of all game squares
     // that the boundingBox intersects.
     Rectangle boundingBox = path.getBounds();
     ZonePoint leftUpper =
-        new ZonePoint(
-            gridSize * (int) Math.floor(boundingBox.x / gridSize),
-            gridSize * (int) Math.floor(boundingBox.y / gridSize));
+            new ZonePoint(
+                    gridSize * (int) Math.floor(boundingBox.x / gridSize),
+                    gridSize * (int) Math.floor(boundingBox.y / gridSize));
 
     float bottomRightX = boundingBox.x + boundingBox.width;
     int bottomRightXSnapped = gridSize * (int) Math.ceil(bottomRightX / gridSize);
     float bottomRightY = boundingBox.y + boundingBox.height;
     int bottomRightYSnapped = gridSize * (int) Math.ceil(bottomRightY / gridSize);
     ZonePoint bottomRight = new ZonePoint(bottomRightXSnapped, bottomRightYSnapped);
     Rectangle gridSnappedBoundingBox =
-        new Rectangle(
-            leftUpper.x, leftUpper.y, bottomRight.x - leftUpper.x, bottomRight.y - leftUpper.y);
+            new Rectangle(
+                    leftUpper.x, leftUpper.y, bottomRight.x - leftUpper.x, bottomRight.y - leftUpper.y);
 
     Area cone = new Area(path);
     Area aoe = new Area(); // Empty rectangle that we will update.
     /** */
     PriorityQueue<Rectangle> queue =
-        new PriorityQueue<Rectangle>(
-            new Comparator<Rectangle>() {
-              @Override
-              /** We prioritize smaller rectangles so the Queue stays smaller. */
-              public int compare(Rectangle o1, Rectangle o2) {
-                return o1.height * o1.width - o2.height * o2.width;
-              }
-            });
+            new PriorityQueue<Rectangle>(
+                    new Comparator<Rectangle>() {
+                      @Override
+                      /** We prioritize smaller rectangles so the Queue stays smaller. */
+                      public int compare(Rectangle o1, Rectangle o2) {
+                        return o1.height * o1.width - o2.height * o2.width;
+                      }
+                    });
     queue.add(gridSnappedBoundingBox);
     while (queue.size() > 0) {
       // if fully contained, then add it to the shape
@@ -313,95 +325,13 @@ else if (!candidateAreaForAoe.equals(new Area(candidateRectForAoe))) {
       } // else there is no overlap, so there is nothing to do.
     }
 
-    // Paint what is needed.
-    if (area) {
-      g.fill(aoe);
-    }
-    if (border) {
-      if (this.showAOEOverlay) { // While drawing, it's helpful to see the cone overlay.
-        g.draw(path);
-      }
-      // g.draw(boundingBox);
-      // g.draw(gridSnappedBoundingBox);
-      g.draw(aoe);
-    }
-    // endif
-
-    // debugging timings...
-    // System.out.println(System.nanoTime() - startTime);
-  }
-
-  /**
-   * @see AbstractTemplate#paintArea(Graphics2D, int, int, int, int, int, int)
-   */
-  @Override
-  protected void paintArea(
-      Graphics2D g, int x, int y, int xOff, int yOff, int gridSize, int distance) {
-    // Only squares w/in the radius
-    if (distance <= getRadius()) {
-      // Paint the squares
-      for (Quadrant q : Quadrant.values()) {
-        paintArea(g, xOff, yOff, gridSize, q);
-      }
-    }
-  }
-
-  /*---------------------------------------------------------------------------------------------
-   * Drawable Interface Methods
-   *-------------------------------------------------------------------------------------------*/
-
-  /**
-   * @see Drawable#getBounds()
-   */
-  public Rectangle getBounds() {
-    if (getZoneId() == null) {
-      // This avoids a NPE when loading up a campaign
-      return new Rectangle();
-    }
-    Zone zone = MapTool.getCampaign().getZone(getZoneId());
-    if (zone == null) {
-      return new Rectangle();
-    }
-    int gridSize = zone.getGrid().getSize();
-    int quadrantSize = getRadius() * gridSize + BOUNDS_PADDING;
-    ZonePoint vertex = getVertex();
-    return new Rectangle(
-        vertex.x - quadrantSize, vertex.y - quadrantSize, quadrantSize * 2, quadrantSize * 2);
+    return aoe;
   }
 
   public PathIterator getPathIterator() {
     return getArea().getPathIterator(new AffineTransform());
   }
 
-  public Area getArea() {
-    if (getZoneId() == null) {
-      return new Area();
-    }
-    Zone zone = getCampaign().getZone(getZoneId());
-    if (zone == null) {
-      return new Area();
-    }
-    int gridSize = zone.getGrid().getSize();
-    int r = getRadius();
-    ZonePoint vertex = getVertex();
-    Area result = new Area();
-    for (int x = 0; x < r; x++) {
-      for (int y = 0; y < r; y++) {
-        if (getDistance(x, y) <= r) {
-          int xOff = x * gridSize;
-          int yOff = y * gridSize;
-          // Add all four quadrants
-          for (Quadrant q : Quadrant.values()) {
-            int rx = vertex.x + getXMult(q) * xOff + ((getXMult(q) - 1) / 2) * gridSize;
-            int ry = vertex.y + getYMult(q) * yOff + ((getYMult(q) - 1) / 2) * gridSize;
-            result.add(new Area(new Rectangle(rx, ry, gridSize, gridSize)));
-          }
-        }
-      }
-    }
-    return result;
-  }
-
   @Override
   public DrawableDto toDto() {
     var dto = RightAngleConeTemplateDto.newBuilder();