Merge branch 'lonkaars:dev' into GameLogic

1 files changed, 14 insertions, 9 deletions

diff --git a/src/stm32/TODO/maths.h b/src/stm32/TODO/maths.h
index 7b68156..0889c47 100644
--- a/src/stm32/TODO/maths.h
+++ b/src/stm32/TODO/maths.h
@@ -1,11 +1,16 @@
-#include <math.h>
+#pragma once
 
-typedef struct vec2{
-    float x,y;
-};
+// #include <math.h>
 
-/// @brief clamps x between min and max
-/// @param x value to clamp
-/// @param min 
-/// @param max 
-float clamp( float& x, float &min, float &max );
+typedef struct {
+    u_int32_t x,y;
+} vec2;
+
+typedef vec2 vec_cen;//centered
+typedef vec2 vec_cor;//left upper corner
+
+#define HH_MATH_FIXED_POINT 7 //fixed point at decimal 7lsb (world positions in pixels (with fixed decimal point))
+
+#define MIN(a,b) (((a)<(b))?(a):(b))
+#define MAX(a,b) (((a)>(b))?(a):(b))
+#define CLAMP(N,LOWER,UPPER) (MIN(MAX(LOWER, N), UPPER))