teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
raze/source/common/utility/m_fixed.h

60 lines
1.7 KiB
C
Raw Normal View History

- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
#ifndef __M_FIXED__
#define __M_FIXED__
#include <stdlib.h>
#include <stdint.h>
#include "basics.h"
- backend update from GZDoom.
2020-11-23 14:54:06 +00:00
__forceinline constexpr int32_t MulScale(int32_t a, int32_t b, int32_t shift) { return (int32_t)(((int64_t)a * b) >> shift); }
- m_fixed.h: Fix incorrect return type for `MulScaleF()` originating from 8cf2588badb20a86732fa9d55b71f7ee5ca7bd45.
2021-01-29 10:19:15 +00:00
__forceinline constexpr double MulScaleF(double a, double b, int32_t shift) { return (a * b) * (1. / (uint32_t(1) << shift)); }
- backend update from GZDoom.
2020-11-23 14:54:06 +00:00
__forceinline constexpr int32_t DMulScale(int32_t a, int32_t b, int32_t c, int32_t d, int32_t shift) { return (int32_t)(((int64_t)a * b + (int64_t)c * d) >> shift); }
- Replace `tmulscale##()` calls with `TMulScale()` from common.
2021-01-04 10:18:07 +00:00
__forceinline constexpr int32_t TMulScale(int32_t a, int32_t b, int32_t c, int32_t d, int32_t e, int32_t f, int32_t shift) { return (int32_t)(((int64_t)a * b + (int64_t)c * d + (int64_t)e * f) >> shift); }
- backend update from GZDoom.
2020-11-23 14:54:06 +00:00
__forceinline constexpr int32_t DivScale(int32_t a, int32_t b, int shift) { return (int32_t)(((int64_t)a << shift) / b); }
- Replace `divscale64()` calls with `DivScaleU()` from common.
2021-01-04 11:49:29 +00:00
__forceinline constexpr int64_t DivScaleL(int64_t a, int64_t b, int shift) { return ((a << shift) / b); }
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
#include "xs_Float.h"
inline fixed_t FloatToFixed(double f)
{
return xs_Fix<16>::ToFix(f);
}
- minor optimization of m_fixed.h Use constexpr where possible to allow using these function in static initializers. Avoid dividing by constant values. Better multiply with the inverse which is quite a bit faster.
2020-09-01 17:37:05 +00:00
inline constexpr fixed_t IntToFixed(int32_t f)
- Major cleanup of Q16.16 utilisation within games and engine. * Remove fix16.h/cpp and utilise library from m_fixed.h. * Extend m_fixed.h with two inline functions for int to/from float operations. * Replace fix16_floor operations with those from xs_Float.h * Replace multiple Q16.16 conversions from 0 to just be 0. * Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h * Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion. * Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly. * Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 13:00:35 +00:00
{
- undid the workarounds for undefined-ness of negative shifts. For any mainstream platform that is totally irrelevant and besides, in C++20 it will be well defined and all current compilers on the relevant platforms treat it accordingly. This is not worth deoptimizing the code.
2020-09-01 17:47:01 +00:00
return f << FRACBITS;
- Major cleanup of Q16.16 utilisation within games and engine. * Remove fix16.h/cpp and utilise library from m_fixed.h. * Extend m_fixed.h with two inline functions for int to/from float operations. * Replace fix16_floor operations with those from xs_Float.h * Replace multiple Q16.16 conversions from 0 to just be 0. * Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h * Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion. * Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly. * Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 13:00:35 +00:00
}
- minor optimization of m_fixed.h Use constexpr where possible to allow using these function in static initializers. Avoid dividing by constant values. Better multiply with the inverse which is quite a bit faster.
2020-09-01 17:37:05 +00:00
inline constexpr double FixedToFloat(fixed_t f)
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
{
- minor optimization of m_fixed.h Use constexpr where possible to allow using these function in static initializers. Avoid dividing by constant values. Better multiply with the inverse which is quite a bit faster.
2020-09-01 17:37:05 +00:00
return f * (1/65536.);
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
}
- minor optimization of m_fixed.h Use constexpr where possible to allow using these function in static initializers. Avoid dividing by constant values. Better multiply with the inverse which is quite a bit faster.
2020-09-01 17:37:05 +00:00
inline constexpr int32_t FixedToInt(fixed_t f)
- Major cleanup of Q16.16 utilisation within games and engine. * Remove fix16.h/cpp and utilise library from m_fixed.h. * Extend m_fixed.h with two inline functions for int to/from float operations. * Replace fix16_floor operations with those from xs_Float.h * Replace multiple Q16.16 conversions from 0 to just be 0. * Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h * Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion. * Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly. * Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 13:00:35 +00:00
{
- undid the workarounds for undefined-ness of negative shifts. For any mainstream platform that is totally irrelevant and besides, in C++20 it will be well defined and all current compilers on the relevant platforms treat it accordingly. This is not worth deoptimizing the code.
2020-09-01 17:47:01 +00:00
return (f + FRACUNIT/2) >> FRACBITS;
- Major cleanup of Q16.16 utilisation within games and engine. * Remove fix16.h/cpp and utilise library from m_fixed.h. * Extend m_fixed.h with two inline functions for int to/from float operations. * Replace fix16_floor operations with those from xs_Float.h * Replace multiple Q16.16 conversions from 0 to just be 0. * Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h * Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion. * Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly. * Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 13:00:35 +00:00
}
- removed constexpr from FloatToAngle. I overlooked the xs_CRoundToInt call in there.
2020-09-01 17:48:21 +00:00
inline unsigned FloatToAngle(double f)
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
{
return xs_CRoundToInt((f)* (0x40000000 / 90.));
}
- minor optimization of m_fixed.h Use constexpr where possible to allow using these function in static initializers. Avoid dividing by constant values. Better multiply with the inverse which is quite a bit faster.
2020-09-01 17:37:05 +00:00
inline constexpr double AngleToFloat(unsigned f)
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
{
return f * (90. / 0x40000000);
}
- minor optimization of m_fixed.h Use constexpr where possible to allow using these function in static initializers. Avoid dividing by constant values. Better multiply with the inverse which is quite a bit faster.
2020-09-01 17:37:05 +00:00
inline constexpr double AngleToFloat(int f)
- migrated to GZDoom's utility code.
2020-04-11 21:50:43 +00:00
{
return f * (90. / 0x40000000);
}
#define FLOAT2FIXED(f) FloatToFixed(f)
#define FIXED2FLOAT(f) float(FixedToFloat(f))
#define FIXED2DBL(f) FixedToFloat(f)
#define ANGLE2DBL(f) AngleToFloat(f)
#endif
Reference in a new issue Copy permalink