From bcc11176480f403ab294de24d61bab993ce2fdfd Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Wed, 1 Dec 2021 19:30:25 +0800
Subject: *misc

---
 Client/Source/Phy2DLite/Settings.h | 52 +++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'Client/Source/Phy2DLite/Settings.h')

diff --git a/Client/Source/Phy2DLite/Settings.h b/Client/Source/Phy2DLite/Settings.h
index e50646c..73639ef 100644
--- a/Client/Source/Phy2DLite/Settings.h
+++ b/Client/Source/Phy2DLite/Settings.h
@@ -11,6 +11,32 @@
 #elif NUMBER_ALIAS == NUMBER_FPM
 #include "fpm/include/fpm/fixed.hpp"
 #include "fpm/include/fpm/math.hpp"
+#endif
+
+namespace Phy2D
+{
+
+#if NUMBER_ALIAS  == NUMBER_FLOAT
+
+typedef float number;
+#define NUMBER_MAX (FLT_MAX)
+#define NUMBER_MIN (FLT_MIN)
+#define SQRT(a) (sqrt((a)))
+#define SIN(a) (sin((a)))
+#define COS(a) (cos((a)))
+
+#elif  NUMBER_ALIAS == NUMBER_LIBFIX
+
+// 同时一定要开启内联函数扩展，否则执行效率会非常低
+typedef Fix16 number;
+#define NUMBER_MAX (fix16_maximum)
+#define NUMBER_MIN (fix16_minimum)
+#define SQRT(a) ((a).sqrt())
+#define SIN(a) ((a).sin())
+#define COS(a) ((a).cos())
+#define PI (fix16_pi)
+
+#elif NUMBER_ALIAS == NUMBER_FPM
 
 template <typename T>
 struct Limits {};
@@ -57,32 +83,6 @@ struct Limits<fpm::fixed_8_24>
     static constexpr fpm::fixed_8_24 max() noexcept { return fpm::fixed_8_24::from_raw_value(2147483647); }
 };
 
-#endif
-
-namespace Phy2D
-{
-
-#if NUMBER_ALIAS  == NUMBER_FLOAT
-
-typedef float number;
-#define NUMBER_MAX (FLT_MAX)
-#define NUMBER_MIN (FLT_MIN)
-#define SQRT(a) (sqrt((a)))
-#define SIN(a) (sin((a)))
-#define COS(a) (cos((a)))
-
-#elif  NUMBER_ALIAS == NUMBER_LIBFIX
-
-// 同时一定要开启内联函数扩展，否则执行效率会非常低
-typedef Fix16 number;
-#define NUMBER_MAX (fix16_maximum)
-#define NUMBER_MIN (fix16_minimum)
-#define SQRT(a) ((a).sqrt())
-#define SIN(a) ((a).sin())
-#define COS(a) ((a).cos())
-
-#elif NUMBER_ALIAS == NUMBER_FPM
-
 typedef fpm::fixed_16_16 number;
 #define NUMBER_MAX (Limits<number>::max())
 #define NUMBER_MIN (Limits<number>::min())
-- 
cgit v1.1-26-g67d0