mirror of
https://github.com/italicsjenga/agb.git
synced 2024-12-24 08:41:34 +11:00
Make it so that multiplication doesn't overflow so easily
This commit is contained in:
parent
026dad0773
commit
1bb05560cb
|
@ -145,7 +145,11 @@ where
|
||||||
{
|
{
|
||||||
type Output = Self;
|
type Output = Self;
|
||||||
fn mul(self, rhs: T) -> Self::Output {
|
fn mul(self, rhs: T) -> Self::Output {
|
||||||
Num((self.0 * rhs.into().0) >> N)
|
let rhs: Self = rhs.into();
|
||||||
|
|
||||||
|
Num(((self.floor() * rhs.floor()) << N)
|
||||||
|
+ (self.floor() * rhs.frac() + rhs.floor() * self.frac())
|
||||||
|
+ ((self.frac() * rhs.frac()) >> N))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -245,6 +249,10 @@ impl<I: FixedWidthUnsignedInteger, const N: usize> Num<I, N> {
|
||||||
self.0 >> N
|
self.0 >> N
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn frac(&self) -> I {
|
||||||
|
self.0 & ((I::one() << N) - I::one())
|
||||||
|
}
|
||||||
|
|
||||||
pub fn new(integral: I) -> Self {
|
pub fn new(integral: I) -> Self {
|
||||||
Self(integral << N)
|
Self(integral << N)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue