Merge pull request #12322 from uckelman/board_rounding

Scale summed board locations instead of summing scaled board locations to reduce rounding error
vassalengine · Jun 18, 2023 · 96101d4 · 96101d4
2 parents 1213581 + 84c509b
commit 96101d4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/vassal-app/src/main/java/VASSAL/build/module/Map.java b/vassal-app/src/main/java/VASSAL/build/module/Map.java
@@ -2719,12 +2719,15 @@ public Point getLocation(Board b, double zoom) {
    */
   protected Point getLocation(int column, int row, double zoom) {
     final Point p = new Point();
+    int dx = 0;
     for (int x = 0; x < column; ++x) {
-      p.translate((int) Math.floor(zoom * boardWidths[x][row]), 0);
+      dx += boardWidths[x][row];
     }
+    int dy = 0;
     for (int y = 0; y < row; ++y) {
-      p.translate(0, (int) Math.floor(zoom * boardHeights[column][y]));
+      dy += boardHeights[column][y];
     }
+    p.translate((int) round(zoom * dx), (int) round(zoom * dy));
     return p;
   }