alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-24 00:31:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

implement base changing

Browse source
This commit is contained in:
Corwin Kuiper 2021-06-08 15:54:25 +01:00
parent 527729f5ba
commit 0ea0f1df3f
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
agb/src/number.rs
View file

@ -94,21 +94,6 @@ pub struct Num<I: FixedWidthUnsignedInteger, const N: usize>(I);
pub type FixedNum<const N: usize> = Num<i32, N>; pub type FixedNum<const N: usize> = Num<i32, N>;
pub type Integer = Num<i32, 0>; pub type Integer = Num<i32, 0>;
pub fn change_base<
I: FixedWidthUnsignedInteger,
J: FixedWidthUnsignedInteger + Into<I>,
const N: usize,
const M: usize,
>(
num: Num<J, N>,
) -> Num<I, M> {
if N < M {
Num(num.0.into() << (M - N))
} else {
Num(num.0.into() >> (N - M))
}
}
impl<I: FixedWidthUnsignedInteger, const N: usize> From<I> for Num<I, N> { impl<I: FixedWidthUnsignedInteger, const N: usize> From<I> for Num<I, N> {
fn from(value: I) -> Self { fn from(value: I) -> Self {
Num(value << N) Num(value << N)
@ -232,6 +217,15 @@ impl<I: FixedWidthSignedInteger, const N: usize> Neg for Num<I, N> {
} }
impl<I: FixedWidthUnsignedInteger, const N: usize> Num<I, N> { impl<I: FixedWidthUnsignedInteger, const N: usize> Num<I, N> {
pub fn change_base<J: FixedWidthUnsignedInteger + From<I>, const M: usize>(self) -> Num<J, M> {
let n: J = self.0.into();
if N < M {
Num(n << (M - N))
} else {
Num(n >> (N - M))
}
}
pub fn from_raw(n: I) -> Self { pub fn from_raw(n: I) -> Self {
Num(n) Num(n)
} }
@ -358,8 +352,8 @@ fn test_change_base(_gba: &mut super::Gba) {
let two: Num<i32, 9> = 2.into(); let two: Num<i32, 9> = 2.into();
let three: Num<i32, 4> = 3.into(); let three: Num<i32, 4> = 3.into();
assert_eq!(two + change_base(three), 5.into()); assert_eq!(two + three.change_base(), 5.into());
assert_eq!(three + change_base(two), 5.into()); assert_eq!(three + two.change_base(), 5.into());
} }
#[test_case] #[test_case]
@ -511,6 +505,12 @@ impl<T: Number> From<(T, T)> for Vector2D<T> {
} }
} }
impl<T: Number> Vector2D<T> {
pub fn change_base<U: Number + From<T>>(self) -> Vector2D<U> {
(self.x.into(), self.y.into()).into()
}
}
impl<I: FixedWidthUnsignedInteger, const N: usize> From<Vector2D<I>> for Vector2D<Num<I, N>> { impl<I: FixedWidthUnsignedInteger, const N: usize> From<Vector2D<I>> for Vector2D<Num<I, N>> {
fn from(n: Vector2D<I>) -> Self { fn from(n: Vector2D<I>) -> Self {
Vector2D { Vector2D {
@ -525,6 +525,12 @@ pub struct Rect<T: Number> {
pub size: Vector2D<T>, pub size: Vector2D<T>,
} }
impl<T: Number> Rect<T> {
pub fn new(position: Vector2D<T>, size: Vector2D<T>) -> Self {
Rect { position, size }
}
}
impl<T: Number> Vector2D<T> { impl<T: Number> Vector2D<T> {
pub fn new(x: T, y: T) -> Self { pub fn new(x: T, y: T) -> Self {
Vector2D { x, y } Vector2D { x, y }