Fixed Rotation in hexagon grid.

tudo-aqua · Nov 21, 2023 · 5ca9bda · 5ca9bda
1 parent e8deb9b
commit 5ca9bda
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/bgw-gui/src/main/kotlin/tools/aqua/bgw/components/container/HexagonGrid.kt b/bgw-gui/src/main/kotlin/tools/aqua/bgw/components/container/HexagonGrid.kt
@@ -17,6 +17,7 @@
 
 package tools.aqua.bgw.components.container
 
+import kotlin.math.sqrt
 import tools.aqua.bgw.components.gamecomponentviews.HexagonView
 import tools.aqua.bgw.visual.Visual
 
@@ -90,7 +91,8 @@ class HexagonGrid<T : HexagonView>(
             CoordinateSystem.AXIAL -> x + (y - (y and 1)) / 2 to y
           }
       with(hexagon) {
-        posXProperty.setSilent(width * q + if (r % 2 == 0) 0.0 else width / 2)
+        val actualWidth = width / 2 * sqrt(3.0)
+        posXProperty.setSilent(actualWidth * q + if (r % 2 == 0) 0.0 else actualWidth / 2)
         posYProperty.setSilent(height * r - r * height / 4)
       }
     }

diff --git a/bgw-gui/src/main/kotlin/tools/aqua/bgw/components/gamecomponentviews/HexagonView.kt b/bgw-gui/src/main/kotlin/tools/aqua/bgw/components/gamecomponentviews/HexagonView.kt
@@ -17,7 +17,6 @@
 
 package tools.aqua.bgw.components.gamecomponentviews
 
-import kotlin.math.sqrt
 import tools.aqua.bgw.core.DEFAULT_HEXAGON_SIZE
 import tools.aqua.bgw.visual.Visual
 
@@ -41,6 +40,6 @@ open class HexagonView(
     GameComponentView(
         posX = posX,
         posY = posY,
-        width = sqrt(3.0) * size.toDouble(),
+        width = 2 * size.toDouble(),
         height = 2 * size.toDouble(),
         visual = visual)