From 93901847d3e6d35577e97d2d7026e8ae586cefb5 Mon Sep 17 00:00:00 2001
From: Sryder <sryder13@gmail.com>
Date: Mon, 12 Dec 2016 00:06:48 +0000
Subject: [PATCH] Fix the Fixed Rounding functions
---
src/m_fixed.h | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/m_fixed.h b/src/m_fixed.h
index 70402f27a..d7db9bf2e 100644
--- a/src/m_fixed.h
+++ b/src/m_fixed.h
@@ -283,9 +283,16 @@ FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FixedFloor(fixed_t x)
{
const fixed_t a = abs(x); //absolute of x
const fixed_t i = (a>>FRACBITS)<<FRACBITS; // cut out the fractional part
- const fixed_t f = i-a; // cut out the integral part
+ const fixed_t f = a-i; // cut out the integral part
+ if (f == 0)
+ return x;
if (x != INT32_MIN)
- return x-f; // return largest integral value not greater than argument
+ { // return rounded down to nearest whole number
+ if (x > 0)
+ return x-f;
+ else
+ return x-(FRACUNIT-f);
+ }
return INT32_MIN;
}
@@ -301,7 +308,7 @@ FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FixedTrunc(fixed_t x)
{
const fixed_t a = abs(x); //absolute of x
const fixed_t i = (a>>FRACBITS)<<FRACBITS; // cut out the fractional part
- const fixed_t f = i-a; // cut out the integral part
+ const fixed_t f = a-i; // cut out the integral part
if (x != INT32_MIN)
{ // return rounded to nearest whole number, towards zero
if (x > 0)
@@ -324,11 +331,18 @@ FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FixedCeil(fixed_t x)
{
const fixed_t a = abs(x); //absolute of x
const fixed_t i = (a>>FRACBITS)<<FRACBITS; // cut out the fractional part
- const fixed_t f = i-a; // cut out the integral part
+ const fixed_t f = a-i; // cut out the integral part
+ if (f == 0)
+ return x;
if (x == INT32_MIN)
return INT32_MIN;
else if (x < FixedFloor(INT32_MAX))
- return x+(FRACUNIT-f); // return smallest integral value not less than argument
+ { // return rounded up to nearest whole number
+ if (x > 0)
+ return x+(FRACUNIT-f);
+ else
+ return x+f;
+ }
return INT32_MAX;
}
@@ -344,7 +358,9 @@ FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FixedRound(fixed_t x)
{
const fixed_t a = abs(x); //absolute of x
const fixed_t i = (a>>FRACBITS)<<FRACBITS; // cut out the fractional part
- const fixed_t f = i-a; // cut out the integral part
+ const fixed_t f = a-i; // cut out the integral part
+ if (f == 0)
+ return x;
if (x == INT32_MIN)
return INT32_MIN;
else if (x < FixedFloor(INT32_MAX))
--
GitLab