Merge pull request #5714 from kwvanderlinde/bugfix/5709-transfer-from-map

Fix token topology transfers and other issues with token bounds

Author: kwvanderlinde

src/main/java/net/rptools/lib/image/ImageUtil.java

@@ -148,7 +148,7 @@ public static BufferedImage getScaledTokenImage(
         }
       }
     } else {
-      Rectangle b = token.getBounds(grid.getZone());
+      Rectangle b = token.getImageBounds(grid.getZone());
       try {
         return ImageUtil.scaleBufferedImage(
             img, (int) Math.ceil(b.width * zoom), (int) Math.ceil(b.height * zoom));

src/main/java/net/rptools/maptool/client/functions/TokenLocationFunctions.java

@@ -241,7 +241,7 @@ private String tokenMoveMap(boolean fromCurrentMap, List<Object> args) throws Pa
   private TokenLocation getTokenLocation(boolean useDistancePerCell, Token token) {
     TokenLocation loc = new TokenLocation();
     if (useDistancePerCell) {
-      Rectangle tokenBounds = token.getBounds(token.getZoneRenderer().getZone());
+      Rectangle tokenBounds = token.getImageBounds(token.getZoneRenderer().getZone());
       loc.x = tokenBounds.x;
       loc.y = tokenBounds.y;
     } else {
@@ -337,10 +337,10 @@ public double getDistance(Token source, Token target, boolean units, String metr
       }
     } else {
       // take distance between center of the two tokens
-      Rectangle sourceBounds = source.getBounds(zone);
+      Rectangle sourceBounds = source.getImageBounds(zone);
       double sourceCenterX = sourceBounds.x + sourceBounds.width / 2.0;
       double sourceCenterY = sourceBounds.y + sourceBounds.height / 2.0;
-      Rectangle targetBounds = target.getBounds(zone);
+      Rectangle targetBounds = target.getImageBounds(zone);
       double targetCenterX = targetBounds.x + targetBounds.width / 2.0;
       double targetCenterY = targetBounds.y + targetBounds.height / 2.0;
 
@@ -418,7 +418,7 @@ public double getDistance(
       }
 
       // get the pixel coords for the center of the token
-      Rectangle sourceBounds = source.getBounds(zone);
+      Rectangle sourceBounds = source.getImageBounds(zone);
       double sourceCenterX = sourceBounds.x + sourceBounds.width / 2.0;
       double sourceCenterY = sourceBounds.y + sourceBounds.height / 2.0;
       double a = (int) (sourceCenterX - targetX);
@@ -452,7 +452,7 @@ public static boolean isTokenAtXY(Token token, Zone zone, Point[] points) {
         }
       }
     } else {
-      Rectangle bounds = token.getBounds(zone);
+      Rectangle bounds = token.getImageBounds(zone);
       for (Point point : points) {
         if (bounds.contains(point)) return true;
       }

src/main/java/net/rptools/maptool/client/functions/TokenMoveFunctions.java

@@ -267,7 +267,7 @@ private List<Map<String, Integer>> crossedPoints(
                 .getFootprint(grid)
                 .getBounds(grid, grid.convert(new ZonePoint(entry.get("x"), entry.get("y"))));
       } else {
-        originalArea = tokenInContext.getBounds(zone);
+        originalArea = tokenInContext.getImageBounds(zone);
       }
       Rectangle2D oa = originalArea.getBounds2D();
       if (targetArea.contains(oa) || targetArea.intersects(oa)) {
@@ -300,7 +300,7 @@ private List<Map<String, Integer>> crossedToken(
      * if-else sequence...
      */
     Grid grid = zone.getGrid();
-    Rectangle targetArea = target.getBounds(zone);
+    Rectangle targetArea = target.getImageBounds(zone);
 
     if (pathPoints == null) {
       return returnPoints;
@@ -326,7 +326,7 @@ private List<Map<String, Integer>> crossedToken(
       Map<String, Integer> firstPoint = new HashMap<String, Integer>(),
           secondPoint = new HashMap<String, Integer>();
       for (Map<String, Integer> entry : pathPoints) {
-        Rectangle tokenArea = tokenInContext.getBounds(zone);
+        Rectangle tokenArea = tokenInContext.getImageBounds(zone);
         Point currentPoint = new Point(entry.get("x"), entry.get("y"));
         if (ctr > 0) {
           if (targetArea.intersectsLine(new Line2D.Double(previousPoint, currentPoint))

src/main/java/net/rptools/maptool/client/functions/TokenPropertyFunctions.java

@@ -779,7 +779,7 @@ public Object childEvaluate(
       Zone zone = zoneR.getZone();
 
       // Get the pixel width or height of a given token
-      Rectangle tokenBounds = token.getBounds(zone);
+      Rectangle tokenBounds = token.getImageBounds(zone);
 
       if (functionName.equalsIgnoreCase("getTokenWidth")) {
         return BigDecimal.valueOf(tokenBounds.width);
@@ -803,7 +803,7 @@ public Object childEvaluate(
       Zone zone = zoneR.getZone();
 
       double magnitude = getBigDecimalFromParam(functionName, parameters, 0).doubleValue();
-      Rectangle tokenBounds = token.getBounds(zone);
+      Rectangle tokenBounds = token.getImageBounds(zone);
 
       double oldWidth = tokenBounds.width;
       double oldHeight = tokenBounds.height;

src/main/java/net/rptools/maptool/client/functions/TokenSightFunctions.java

@@ -110,7 +110,7 @@ public Object childEvaluate(
           target
               .getFootprint(grid)
               .getBounds(grid, grid.convert(new ZonePoint(target.getX(), target.getY())));
-      if (!target.isSnapToGrid()) bounds = target.getBounds(zone);
+      if (!target.isSnapToGrid()) bounds = target.getImageBounds(zone);
 
       int x = (int) bounds.getX();
       int y = (int) bounds.getY();

src/main/java/net/rptools/maptool/client/tool/PointerTool.java

@@ -1955,7 +1955,7 @@ private boolean validateMove(
             }
           }
 
-          Rectangle tokenSize = token.getBounds(zone);
+          Rectangle tokenSize = token.getFootprintBounds(zone);
           Rectangle destination =
               new Rectangle(
                   tokenSize.x + deltaX, tokenSize.y + deltaY, tokenSize.width, tokenSize.height);
@@ -1990,7 +1990,7 @@ private boolean validateMove_legacy(Set<GUID> tokenSet, ZonePoint leadTokenNewAn
           int x = token.getX() + deltaX;
           int y = token.getY() + deltaY;
 
-          Rectangle tokenSize = token.getBounds(zone);
+          Rectangle tokenSize = token.getFootprintBounds(zone);
           /*
            * Perhaps create a counter and count the number of times that the contains() check returns true? There are currently 9 rectangular areas checked by this code (note the "/3" in the two
            * 'interval' variables) so checking for 5 or more would mean more than 55%+ of the destination was visible...

src/main/java/net/rptools/maptool/client/tool/StampTool.java

@@ -999,7 +999,7 @@ public void paintOverlay(ZoneRenderer renderer, Graphics2D g) {
         // Resize
         if (!token.isSnapToScale()) {
           double scale = renderer.getScale();
-          Rectangle footprintBounds = token.getBounds(renderer.getZone());
+          Rectangle footprintBounds = token.getFootprintBounds(renderer.getZone());
 
           double scaledWidth = (footprintBounds.width * scale);
           double scaledHeight = (footprintBounds.height * scale);
@@ -1194,7 +1194,7 @@ public void moveByKey(int dx, int dy, boolean micro) {
         zp.x += snapOffsetX;
         zp.y += snapOffsetY;
       } else {
-        Rectangle tokenSize = tokenBeingDragged.getBounds(renderer.getZone());
+        Rectangle tokenSize = tokenBeingDragged.getFootprintBounds(renderer.getZone());
         int x = tokenDragCurrent.x + (micro ? dx : (tokenSize.width * dx));
         int y = tokenDragCurrent.y + (micro ? dy : (tokenSize.height * dy));
         zp = new ZonePoint(x, y);

src/main/java/net/rptools/maptool/client/ui/exportdialog/ExportDialog.java

@@ -923,7 +923,7 @@ public Rectangle zoneExtents(PlayerView view) {
     // Note: order doesn't matter, so don't need to go back-to-front.
     for (Token element :
         zone.getTokensForLayers(layer -> view.isGMView() || layer.isVisibleToPlayers())) {
-      Rectangle drawnBounds = element.getBounds(zone);
+      Rectangle drawnBounds = element.getImageBounds(zone);
       if (element.hasFacing()) {
         // Get the facing and do a quick fix to make the math easier: -90 is 'unrotated' for some
         // reason

src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/TokenTopologyPanel.java

@@ -223,7 +223,7 @@ protected void paintComponent(Graphics g) {
 
     // Gather info
     BufferedImage image = ImageManager.getImage(token.getImageAssetId());
-    java.awt.Rectangle tokenSize = token.getBounds(zone);
+    java.awt.Rectangle tokenSize = token.getFootprintBounds(zone);
     Dimension originalImgSize = new Dimension(image.getWidth(), image.getHeight());
     Dimension imgSize = new Dimension(image.getWidth(), image.getHeight());
 

src/main/java/net/rptools/maptool/client/ui/zone/FogUtil.java

@@ -467,7 +467,7 @@ public static Point calculateVisionCenter(Token token, Zone zone) {
               .getFootprint(grid)
               .getBounds(grid, grid.convert(new ZonePoint(token.getX(), token.getY())));
     } else {
-      bounds = token.getBounds(zone);
+      bounds = token.getFootprintBounds(zone);
     }
 
     x = bounds.x + bounds.width / 2;