Merge pull request #470 from Piturnah/feat/impl-from

Implement `From<TilePos>` for `CubePos`
StarArawn · Dec 17, 2023 · d6d8511 · d6d8511
2 parents 3ee9862 + ac731f2
commit d6d8511
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/helpers/hex_grid/axial.rs b/src/helpers/hex_grid/axial.rs
@@ -35,15 +35,21 @@ pub struct AxialPos {
     pub r: i32,
 }
 
-impl From<&TilePos> for AxialPos {
-    fn from(tile_pos: &TilePos) -> Self {
+impl From<TilePos> for AxialPos {
+    fn from(tile_pos: TilePos) -> Self {
         AxialPos {
             q: tile_pos.x as i32,
             r: tile_pos.y as i32,
         }
     }
 }
 
+impl From<&TilePos> for AxialPos {
+    fn from(tile_pos: &TilePos) -> Self {
+        AxialPos::from(*tile_pos)
+    }
+}
+
 impl From<CubePos> for AxialPos {
     fn from(cube_pos: CubePos) -> Self {
         let CubePos { q, r, .. } = cube_pos;

diff --git a/src/helpers/hex_grid/cube.rs b/src/helpers/hex_grid/cube.rs
@@ -1,6 +1,9 @@
 //! Code for the cube coordinate system
 
-use crate::helpers::hex_grid::axial::{AxialPos, FractionalAxialPos};
+use crate::{
+    helpers::hex_grid::axial::{AxialPos, FractionalAxialPos},
+    tiles::TilePos,
+};
 use std::ops::{Add, Mul, Sub};
 
 /// Identical to [`AxialPos`], but has an extra component `s`. Together, `q`, `r`, `s`
@@ -31,6 +34,13 @@ impl From<AxialPos> for CubePos {
     }
 }
 
+impl From<TilePos> for CubePos {
+    #[inline]
+    fn from(tile_pos: TilePos) -> Self {
+        AxialPos::from(tile_pos).into()
+    }
+}
+
 impl Add<CubePos> for CubePos {
     type Output = CubePos;