mirror of
https://github.com/Ed94/Odin.git
synced 2026-08-05 23:28:48 +00:00
Merge pull request #3082 from edyu/master
Fix math/fixed floor/ceil/round
This commit is contained in:
@@ -88,17 +88,19 @@ div_sat :: proc(x, y: $T/Fixed($Backing, $Fraction_Width)) -> (z: T) {
|
|||||||
|
|
||||||
@(require_results)
|
@(require_results)
|
||||||
floor :: proc(x: $T/Fixed($Backing, $Fraction_Width)) -> Backing {
|
floor :: proc(x: $T/Fixed($Backing, $Fraction_Width)) -> Backing {
|
||||||
return x.i >> Fraction_Width
|
if x.i >= 0 {
|
||||||
|
return x.i >> Fraction_Width
|
||||||
|
} else {
|
||||||
|
return (x.i - (1 << (Fraction_Width - 1)) + (1 << (Fraction_Width - 2))) >> Fraction_Width
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@(require_results)
|
@(require_results)
|
||||||
ceil :: proc(x: $T/Fixed($Backing, $Fraction_Width)) -> Backing {
|
ceil :: proc(x: $T/Fixed($Backing, $Fraction_Width)) -> Backing {
|
||||||
Integer :: 8*size_of(Backing) - Fraction_Width
|
return (x.i + (1 << Fraction_Width - 1)) >> Fraction_Width
|
||||||
return (x.i + (1 << Integer-1)) >> Fraction_Width
|
|
||||||
}
|
}
|
||||||
@(require_results)
|
@(require_results)
|
||||||
round :: proc(x: $T/Fixed($Backing, $Fraction_Width)) -> Backing {
|
round :: proc(x: $T/Fixed($Backing, $Fraction_Width)) -> Backing {
|
||||||
Integer :: 8*size_of(Backing) - Fraction_Width
|
return (x.i + (1 << (Fraction_Width - 1))) >> Fraction_Width
|
||||||
return (x.i + (1 << (Integer - 1))) >> Fraction_Width
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user