aboutsummaryrefslogtreecommitdiff
path: root/Client/Source/Phy2DLite/Settings.h
diff options
context:
space:
mode:
Diffstat (limited to 'Client/Source/Phy2DLite/Settings.h')
-rw-r--r--Client/Source/Phy2DLite/Settings.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/Client/Source/Phy2DLite/Settings.h b/Client/Source/Phy2DLite/Settings.h
index 73639ef..9345b32 100644
--- a/Client/Source/Phy2DLite/Settings.h
+++ b/Client/Source/Phy2DLite/Settings.h
@@ -18,7 +18,7 @@ namespace Phy2D
#if NUMBER_ALIAS == NUMBER_FLOAT
-typedef float number;
+typedef float fixed;
#define NUMBER_MAX (FLT_MAX)
#define NUMBER_MIN (FLT_MIN)
#define SQRT(a) (sqrt((a)))
@@ -28,7 +28,7 @@ typedef float number;
#elif NUMBER_ALIAS == NUMBER_LIBFIX
// 同时一定要开启内联函数扩展,否则执行效率会非常低
-typedef Fix16 number;
+typedef Fix16 fixed;
#define NUMBER_MAX (fix16_maximum)
#define NUMBER_MIN (fix16_minimum)
#define SQRT(a) ((a).sqrt())
@@ -83,13 +83,13 @@ struct Limits<fpm::fixed_8_24>
static constexpr fpm::fixed_8_24 max() noexcept { return fpm::fixed_8_24::from_raw_value(2147483647); }
};
-typedef fpm::fixed_16_16 number;
-#define NUMBER_MAX (Limits<number>::max())
-#define NUMBER_MIN (Limits<number>::min())
+typedef fpm::fixed_16_16 fixed;
+#define NUMBER_MAX (Limits<fixed>::max())
+#define NUMBER_MIN (Limits<fixed>::min())
#define SQRT(a) (fpm::sqrt((a)))
#define SIN(a) (fpm::sin((a)))
#define COS(a) (fpm::cos((a)))
-#define PI (number::pi())
+#define PI (fixed::pi())
#endif