merge upstream main

src/layout.rs

@@ -68,6 +68,18 @@ impl HexLayout {
         })
     }
 
+    #[must_use]
+    /// Computes hexagonal coordinates `hex` into world/pixel coordinates
+    pub fn hex_to_world_pos(&self, hex: Hex) -> Vec2 {
+        self.fractional_hex_to_world_pos(hex.as_vec2())
+    }
+
+    #[must_use]
+    /// Computes fractional hexagonal coordinates `hex` into world/pixel coordinates
+    pub fn fractional_hex_to_world_pos(&self, hex: Vec2) -> Vec2 {
+        self.hex_to_center_aligned_world_pos(hex) + self.origin
+    }
+
     #[allow(clippy::cast_precision_loss)]
     #[must_use]
     pub(crate) fn hex_to_center_aligned_world_pos(&self, hex: Vec2) -> Vec2 {
@@ -79,19 +91,6 @@ impl HexLayout {
             * self.axis_scale()
     }
 
-    #[must_use]
-    /// Computes hexagonal coordinates `hex` into world/pixel coordinates
-    pub fn hex_to_world_pos(&self, hex: Hex) -> Vec2 {
-        self.fractional_hex_to_world_pos(vec2(hex.x as f32, hex.y as f32))
-    }
-
-    #[allow(clippy::cast_precision_loss)]
-    #[must_use]
-    /// Computes fractional hexagonal coordinates `hex` into world/pixel coordinates
-    pub fn fractional_hex_to_world_pos(&self, hex: Vec2) -> Vec2 {
-        self.fractional_hex_to_world_pos(vec2(hex.x as f32, hex.y as f32)) + self.origin
-    }
-
     #[allow(clippy::cast_precision_loss, clippy::cast_possible_truncation)]
     #[must_use]
     /// Computes world/pixel coordinates `pos` into fractional hexagonal coordinates

src/mesh/column_builder.rs

@@ -214,7 +214,8 @@ impl<'l> ColumnMeshBuilder<'l> {
             .build();
         // We store the offset to match the `self.pos`
         let pos = if self.center_aligned {
-            self.layout.hex_to_center_aligned_world_pos(self.pos)
+            self.layout
+                .hex_to_center_aligned_world_pos(self.pos.as_vec2())
         } else {
             self.layout.hex_to_world_pos(self.pos)
         };

src/mesh/plane_builder.rs

@@ -121,7 +121,8 @@ impl<'l> PlaneMeshBuilder<'l> {
         let mut mesh = MeshInfo::center_aligned_hexagonal_plane(self.layout);
         // We store the offset to match the `self.pos`
         let pos = if self.center_aligned {
-            self.layout.hex_to_center_aligned_world_pos(self.pos)
+            self.layout
+                .hex_to_center_aligned_world_pos(self.pos.as_vec2())
         } else {
             self.layout.hex_to_world_pos(self.pos)
         };