fish-cannard/border-wars
fish-cannard/border-wars
5
3
Fork 0
generated from tipragot/rust
Code Issues 10 Pull requests 3 Actions Packages Projects Releases Wiki Activity

Remake utils for hexagon grids #55

Merged
CoCo_Sol merged 10 commits from remake-utile into main 2024-02-16 21:17:15 +00:00
Conversation 0 Commits 10 Files changed 3 +4 -7
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 008a8f73e6 - Show all commits

7
crates/border-wars/src/map/hex.rs
View file

@ -1,11 +1,11 @@
//! All functions related to calculations in a hexagonal grid. //! All functions related to calculations in a hexagonal grid.
use std::ops::{ use std::ops::{
Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Rem, RemAssign, Sub, SubAssign, Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Rem, RemAssign, Sub, SubAssign,
}; };
use num::{cast::AsPrimitive, FromPrimitive}; use num::cast::AsPrimitive;
use num::FromPrimitive;
use paste::paste; use paste::paste;
/// Represents a number that can be used in calculations for hexagonal grids. /// Represents a number that can be used in calculations for hexagonal grids.
@ -183,10 +183,8 @@ impl<T: Number + AsPrimitive<usize>+ FromPrimitive> Iterator for HexSpiral<T> {
} }
result result
} }
} }
impl<T: Number + AsPrimitive<usize> + FromPrimitive> HexPosition<T> { impl<T: Number + AsPrimitive<usize> + FromPrimitive> HexPosition<T> {
/// Creates a new hexagonal position. /// Creates a new hexagonal position.
pub fn new(x: T, y: T) -> Self { pub fn new(x: T, y: T) -> Self {
@ -256,7 +254,6 @@ macro_rules! impl_ops {
)*}}; )*}};
} }
impl_ops! { impl_ops! {
(Add, add), (Add, add),
(Sub, sub), (Sub, sub),