From 5749abee920e7f68496db000f4f949dbdeca5e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Tue, 7 May 2019 21:31:33 +0200
Subject: [PATCH] Move cube data to s3l

---
 s3l.h     | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 testSDL.c | 55 +++----------------------------------------------------
 2 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/s3l.h b/s3l.h
index 335bfe4..258ed1c 100644
--- a/s3l.h
+++ b/s3l.h
@@ -134,6 +134,58 @@ typedef int32_t S3L_Unit; /**< Units of measurement in 3D space. There is
 #define S3L_nonzero(value) ((value) != 0 ? (value) : 1) /**< prevents division
                                                              by zero */
 
+/** Predefined vertices of a cube to simply insert in an array. These come with
+    S3L_CUBE_TRIANGLES and S3L_CUBE_TEXCOORDS. */
+#define S3L_CUBE_VERTICES\
+ /* 0 front, bottom, right */\
+ S3L_FRACTIONS_PER_UNIT/2,-S3L_FRACTIONS_PER_UNIT/2,-S3L_FRACTIONS_PER_UNIT/2,\
+ /* 1 front, bottom, left */\
+-S3L_FRACTIONS_PER_UNIT/2,-S3L_FRACTIONS_PER_UNIT/2,-S3L_FRACTIONS_PER_UNIT/2,\
+ /* 2 front, top,    right */\
+ S3L_FRACTIONS_PER_UNIT/2,S3L_FRACTIONS_PER_UNIT/2,-S3L_FRACTIONS_PER_UNIT/2,\
+ /* 3 front, top,    left */\
+-S3L_FRACTIONS_PER_UNIT/2,S3L_FRACTIONS_PER_UNIT/2,-S3L_FRACTIONS_PER_UNIT/2,\
+ /* 4 back,  bottom, right */\
+ S3L_FRACTIONS_PER_UNIT/2,-S3L_FRACTIONS_PER_UNIT/2,S3L_FRACTIONS_PER_UNIT/2,\
+ /* 5 back,  bottom, left */\
+-S3L_FRACTIONS_PER_UNIT/2,-S3L_FRACTIONS_PER_UNIT/2,S3L_FRACTIONS_PER_UNIT/2,\
+ /* 6 back,  top,    right */\
+ S3L_FRACTIONS_PER_UNIT/2,S3L_FRACTIONS_PER_UNIT/2,S3L_FRACTIONS_PER_UNIT/2,\
+ /* 7 back,  top,    left */\
+-S3L_FRACTIONS_PER_UNIT/2,S3L_FRACTIONS_PER_UNIT/2,S3L_FRACTIONS_PER_UNIT/2
+
+/** Predefined triangle indices of a cube, to be used with S3L_CUBE_VERTICES
+    and S3L_CUBE_TEXCOORDS. */
+#define S3L_CUBE_TRIANGLES\
+  0, 3, 2, /* front  */\
+  0, 1, 3,\
+  4, 0, 2, /* right  */\
+  4, 2, 6,\
+  5, 4, 6, /* back   */\
+  6, 7, 5,\
+  7, 3, 1, /* left   */\
+  7, 1, 5,\
+  3, 6, 2, /* top    */\
+  3, 7, 6,\
+  4, 1, 0, /* bottom */\
+  4, 5, 1
+
+/** Predefined texture coordinates of a cube, corresponding to triangles (NOT
+    vertices), to be used with S3L_CUBE_VERTICES and S3L_CUBE_TRIANGLES. */
+#define S3L_CUBE_TEXCOORDS\
+  1,1,  0,0,  1,0,\
+  1,1,  0,1,  0,0,\
+  1,0,  1,1,  0,1,\
+  1,0,  0,1,  0,0,\
+  0,0,  1,0,  1,1,\
+  1,1,  0,1,  0,0,\
+  0,1,  0,0,  1,0,\
+  0,1,  1,0,  1,1,\
+  1,1,  0,0,  1,0,\
+  1,1,  0,1,  0,0,\
+  0,1,  1,0,  1,1,\
+  0,1,  0,0,  1,0
+
 #define S3L_SIN_TABLE_LENGTH 128
 static const S3L_Unit S3L_sinTable[S3L_SIN_TABLE_LENGTH] =
 {
diff --git a/testSDL.c b/testSDL.c
index 9280eed..ee36199 100644
--- a/testSDL.c
+++ b/testSDL.c
@@ -26,58 +26,9 @@ const int16_t test_coords[] =
     496,15,  613,131,   552,203
   };
 
-#define S S3L_FRACTIONS_PER_UNIT
-
-S3L_Unit ver[] =
-{
-   S/2, -S/2, -S/2,    // 0 front, bottom, right
-  -S/2, -S/2, -S/2,    // 1 front, bottom, left
-   S/2,  S/2, -S/2,    // 2 front, top,    right
-  -S/2,  S/2, -S/2,    // 3 front, top,    left
-   S/2, -S/2,  S/2,    // 4 back,  bottom, right
-  -S/2, -S/2,  S/2,    // 5 back,  bottom, left
-   S/2,  S/2,  S/2,    // 6 back,  top,    right
-  -S/2,  S/2,  S/2     // 7 back,  top,    left
-};
-
-S3L_Unit tex_coords[] =
-{
-   1,1,  0,0,  1,0,
-   1,1,  0,1,  0,0,
-   1,0,  1,1,  0,1,
-   1,0,  0,1,  0,0,
-   0,0,  1,0,  1,1,
-   1,1,  0,1,  0,0,
-   0,1,  0,0,  1,0,
-   0,1,  1,0,  1,1,
-   1,1,  0,0,  1,0,
-   1,1,  0,1,  0,0,
-   0,1,  1,0,  1,1,
-   0,1,  0,0,  1,0
-};
-
-#undef S
-
-const S3L_Index tri[] =
-{
-  0, 3, 2, // front
-  0, 1, 3,
-  
-  4, 0, 2, // right
-  4, 2, 6,
-
-  5, 4, 6, // back
-  6, 7, 5,
-
-  7, 3, 1, // left
-  7, 1, 5,
-
-  3, 6, 2, // top
-  3, 7, 6,
-
-  4, 1, 0, // bottom
-  4, 5, 1
-};
+const S3L_Unit ver[] = { S3L_CUBE_VERTICES };
+const S3L_Index tri[] = { S3L_CUBE_TRIANGLES };
+const S3L_Unit tex_coords[] = { S3L_CUBE_TEXCOORDS };
 
 const uint8_t testTexture[] =
 {