Refactor field, refactor next shape drawing

Refactor field functions names. Transfer next shape drawing to painter.
Introduce idlist struct with foreach function. Refactor config.
Introduce color map array instead of "switch case" statement bloating
while coloring rectangles. Decouple field and shape structs from SFML
sfVector2 structs by introducing own vector2i and vector2ui structs.
Also remove sfRectangleShape members form field an shape structs.

1 files changed, 43 insertions, 30 deletions

diff --git a/include/tet_conf.h b/include/tet_conf.h
index 134e8a9..14a8c2a 100644
--- a/include/tet_conf.h
+++ b/include/tet_conf.h
@@ -1,42 +1,55 @@
-#define windowName_conf "Tetris CSFML" // Window name
-#define UIBGCOLOR sfColor_fromRGB(26, 26, 26) // Field background
-#define UIFGINACTIVECOLOR sfColor_fromRGB(55, 59, 65) // Field inactive cell outline
-#define OUT_THICK 1
-#define UIFGACTIVECOLOR sfColor_fromRGB(40, 42, 46) // Field active cell outline
-#define LCOLOR sfColor_fromRGB(222, 147, 95) // Orange color of L shape
-#define RLCOLOR sfColor_fromRGB(95, 129, 157)
-#define SCOLOR sfColor_fromRGB(140, 148, 64)
-#define ZCOLOR sfColor_fromRGB(165, 66, 66)
-#define BCOLOR sfColor_fromRGB(197, 200, 198)
-#define ICOLOR sfColor_fromRGB(94, 141, 135)
-#define TCOLOR sfColor_fromRGB(133, 103, 143)
+#define windowName_conf   "Tetris CSFML" // Window name
+#define OUT_THICK         1
+#define UITRANSPARENT     {0,   0,   0,   0  } // Field background
+#define UIBGCOLOR         {26,  26,  26,  255} // Field background
+#define UIFGINACTIVECOLOR {55,  59,  65,  255} // Field inactive cell outline
+#define UIFGACTIVECOLOR   {40,  42,  46,  255} // Field active cell outline
+#define LCOLOR            {222, 147, 95,  255} // Orange color of L shape
+#define RLCOLOR           {95,  129, 157, 255}
+#define ZCOLOR            {165, 66,  66,  255}
+#define SCOLOR            {140, 148, 64,  255}
+#define BCOLOR            {197, 200, 198, 255}
+#define ICOLOR            {94,  141, 135, 255}
+#define TCOLOR            {133, 103, 143, 255}
+
 #define moveRepeatLatency1 150000 // microseconds, only for left-right arrows,
-                  // first repeat move when long push
+                                  // first repeat move when long push
 #define moveRepeatLatency2  30000 // microseconds, for Left, Right and Down
-                  // arrows, the rest repeat move when long push
+                                  // arrows, the rest repeat move when long push
 #define basicLatency 500000
-#define L00LATENCY 800000
-#define L01LATENCY 716667
-#define L02LATENCY 633334
-#define L03LATENCY 550000
-#define L04LATENCY 466667
-#define L05LATENCY 383334
-#define L06LATENCY 300000
-#define L07LATENCY 216667
-#define L08LATENCY 133334
-#define L09LATENCY 100000
-#define L10LATENCY  83334
-#define L13LATENCY  66667
-#define L16LATENCY  50000
-#define L19LATENCY  33334
-#define L29LATENCY  16667
-#define PUT_LATENCY 300000
+#define L00LATENCY   800000
+#define L01LATENCY   716667
+#define L02LATENCY   633334
+#define L03LATENCY   550000
+#define L04LATENCY   466667
+#define L05LATENCY   383334
+#define L06LATENCY   300000
+#define L07LATENCY   216667
+#define L08LATENCY   133334
+#define L09LATENCY   100000
+#define L10LATENCY    83334
+#define L13LATENCY    66667
+#define L16LATENCY    50000
+#define L19LATENCY    33334
+#define L29LATENCY    16667
+#define PUT_LATENCY  300000
 #define RM_1LINES_SCORE 40
 #define RM_2LINES_SCORE 100
 #define RM_3LINES_SCORE 300
 #define RM_4LINES_SCORE 1200
 #define LEVELUP_LINES 10
 
+#define FLD_SIZE_Y  22
+#define FLD_SIZE_X  10
+#define FLD_BOUND_Y FLD_SIZE_Y + 4
+#define FLD_BOUND_X FLD_SIZE_X
+#define FLD_POS     (struct vector2i){.x = 10, .y = 10+550-24}
+#define CELL_SIZE   (sfVector2f){.x = 23, .y = 23}
+
+#define NXT_SIZE_Y  8
+#define NXT_SIZE_X  4
+#define NXT_POS     (struct vector2i){.x = 250 + 10 + 30, .y = 300}
+#define NXT_SIZE    (struct vector2ui){.x = NXT_SIZE_X, .y = NXT_SIZE_Y}
 
 /*
  * 22..........