refactoring

[dragonblocks_alpha.git] / src / client / cube.c

diff --git a/src/client/cube.c b/src/client/cube.c
index 738407614a8b921265c00a8354a0f40e99418ca3..874d14dd1f84bd2f99db1d247a29a027ab293267 100644 (file)
--- a/src/client/cube.c
+++ b/src/client/cube.c
@@ -1,53 +1,53 @@
 #include "client/cube.h"
 
-Vertex3D cube_vertices[6][6] = {
+CubeVertex cube_vertices[6][6] = {
        {
-               {{-0.5, -0.5, -0.5}, {+0.0, +0.0, -1.0}, +0.0, {+0.0, +0.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, +0.5, -0.5}, {+0.0, +0.0, -1.0}, +0.0, {+1.0, +1.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, -0.5, -0.5}, {+0.0, +0.0, -1.0}, +0.0, {+1.0, +0.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, +0.5, -0.5}, {+0.0, +0.0, -1.0}, +0.0, {+1.0, +1.0}, {+1.0, +1.0, +1.0}},
-               {{-0.5, -0.5, -0.5}, {+0.0, +0.0, -1.0}, +0.0, {+0.0, +0.0}, {+1.0, +1.0, +1.0}},
-               {{-0.5, +0.5, -0.5}, {+0.0, +0.0, -1.0}, +0.0, {+0.0, +1.0}, {+1.0, +1.0, +1.0}},
+               {{-0.5, -0.5, -0.5}, {+0.0, +0.0, -1.0}, {+0.0, +0.0}},
+               {{+0.5, +0.5, -0.5}, {+0.0, +0.0, -1.0}, {+1.0, +1.0}},
+               {{+0.5, -0.5, -0.5}, {+0.0, +0.0, -1.0}, {+1.0, +0.0}},
+               {{+0.5, +0.5, -0.5}, {+0.0, +0.0, -1.0}, {+1.0, +1.0}},
+               {{-0.5, -0.5, -0.5}, {+0.0, +0.0, -1.0}, {+0.0, +0.0}},
+               {{-0.5, +0.5, -0.5}, {+0.0, +0.0, -1.0}, {+0.0, +1.0}},
        },
        {
-               {{-0.5, -0.5, +0.5}, {+0.0, +0.0, +1.0}, +0.0, {+0.0, +0.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, -0.5, +0.5}, {+0.0, +0.0, +1.0}, +0.0, {+1.0, +0.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, +0.5, +0.5}, {+0.0, +0.0, +1.0}, +0.0, {+1.0, +1.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, +0.5, +0.5}, {+0.0, +0.0, +1.0}, +0.0, {+1.0, +1.0}, {+1.0, +1.0, +1.0}},
-               {{-0.5, +0.5, +0.5}, {+0.0, +0.0, +1.0}, +0.0, {+0.0, +1.0}, {+1.0, +1.0, +1.0}},
-               {{-0.5, -0.5, +0.5}, {+0.0, +0.0, +1.0}, +0.0, {+0.0, +0.0}, {+1.0, +1.0, +1.0}},
+               {{-0.5, -0.5, +0.5}, {+0.0, +0.0, +1.0}, {+0.0, +0.0}},
+               {{+0.5, -0.5, +0.5}, {+0.0, +0.0, +1.0}, {+1.0, +0.0}},
+               {{+0.5, +0.5, +0.5}, {+0.0, +0.0, +1.0}, {+1.0, +1.0}},
+               {{+0.5, +0.5, +0.5}, {+0.0, +0.0, +1.0}, {+1.0, +1.0}},
+               {{-0.5, +0.5, +0.5}, {+0.0, +0.0, +1.0}, {+0.0, +1.0}},
+               {{-0.5, -0.5, +0.5}, {+0.0, +0.0, +1.0}, {+0.0, +0.0}},
        },
        {
-               {{-0.5, +0.5, +0.5}, {-1.0, +0.0, +0.0}, +0.0, {+1.0, +1.0}, {+1.0, +1.0, +1.0}},
-               {{-0.5, +0.5, -0.5}, {-1.0, +0.0, +0.0}, +0.0, {+0.0, +1.0}, {+1.0, +1.0, +1.0}},
-               {{-0.5, -0.5, -0.5}, {-1.0, +0.0, +0.0}, +0.0, {+0.0, +0.0}, {+1.0, +1.0, +1.0}},
-               {{-0.5, -0.5, -0.5}, {-1.0, +0.0, +0.0}, +0.0, {+0.0, +0.0}, {+1.0, +1.0, +1.0}},
-               {{-0.5, -0.5, +0.5}, {-1.0, +0.0, +0.0}, +0.0, {+1.0, +0.0}, {+1.0, +1.0, +1.0}},
-               {{-0.5, +0.5, +0.5}, {-1.0, +0.0, +0.0}, +0.0, {+1.0, +1.0}, {+1.0, +1.0, +1.0}},
+               {{-0.5, +0.5, +0.5}, {-1.0, +0.0, +0.0}, {+1.0, +1.0}},
+               {{-0.5, +0.5, -0.5}, {-1.0, +0.0, +0.0}, {+0.0, +1.0}},
+               {{-0.5, -0.5, -0.5}, {-1.0, +0.0, +0.0}, {+0.0, +0.0}},
+               {{-0.5, -0.5, -0.5}, {-1.0, +0.0, +0.0}, {+0.0, +0.0}},
+               {{-0.5, -0.5, +0.5}, {-1.0, +0.0, +0.0}, {+1.0, +0.0}},
+               {{-0.5, +0.5, +0.5}, {-1.0, +0.0, +0.0}, {+1.0, +1.0}},
        },
        {
-               {{+0.5, +0.5, +0.5}, {+1.0, +0.0, +0.0}, +0.0, {+1.0, +1.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, -0.5, -0.5}, {+1.0, +0.0, +0.0}, +0.0, {+0.0, +0.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, +0.5, -0.5}, {+1.0, +0.0, +0.0}, +0.0, {+0.0, +1.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, -0.5, -0.5}, {+1.0, +0.0, +0.0}, +0.0, {+0.0, +0.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, +0.5, +0.5}, {+1.0, +0.0, +0.0}, +0.0, {+1.0, +1.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, -0.5, +0.5}, {+1.0, +0.0, +0.0}, +0.0, {+1.0, +0.0}, {+1.0, +1.0, +1.0}},
+               {{+0.5, +0.5, +0.5}, {+1.0, +0.0, +0.0}, {+1.0, +1.0}},
+               {{+0.5, -0.5, -0.5}, {+1.0, +0.0, +0.0}, {+0.0, +0.0}},
+               {{+0.5, +0.5, -0.5}, {+1.0, +0.0, +0.0}, {+0.0, +1.0}},
+               {{+0.5, -0.5, -0.5}, {+1.0, +0.0, +0.0}, {+0.0, +0.0}},
+               {{+0.5, +0.5, +0.5}, {+1.0, +0.0, +0.0}, {+1.0, +1.0}},
+               {{+0.5, -0.5, +0.5}, {+1.0, +0.0, +0.0}, {+1.0, +0.0}},
        },
        {
-               {{-0.5, -0.5, -0.5}, {+0.0, -1.0, +0.0}, +0.0, {+0.0, +1.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, -0.5, -0.5}, {+0.0, -1.0, +0.0}, +0.0, {+1.0, +1.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, -0.5, +0.5}, {+0.0, -1.0, +0.0}, +0.0, {+1.0, +0.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, -0.5, +0.5}, {+0.0, -1.0, +0.0}, +0.0, {+1.0, +0.0}, {+1.0, +1.0, +1.0}},
-               {{-0.5, -0.5, +0.5}, {+0.0, -1.0, +0.0}, +0.0, {+0.0, +0.0}, {+1.0, +1.0, +1.0}},
-               {{-0.5, -0.5, -0.5}, {+0.0, -1.0, +0.0}, +0.0, {+0.0, +1.0}, {+1.0, +1.0, +1.0}},
+               {{-0.5, -0.5, -0.5}, {+0.0, -1.0, +0.0}, {+0.0, +1.0}},
+               {{+0.5, -0.5, -0.5}, {+0.0, -1.0, +0.0}, {+1.0, +1.0}},
+               {{+0.5, -0.5, +0.5}, {+0.0, -1.0, +0.0}, {+1.0, +0.0}},
+               {{+0.5, -0.5, +0.5}, {+0.0, -1.0, +0.0}, {+1.0, +0.0}},
+               {{-0.5, -0.5, +0.5}, {+0.0, -1.0, +0.0}, {+0.0, +0.0}},
+               {{-0.5, -0.5, -0.5}, {+0.0, -1.0, +0.0}, {+0.0, +1.0}},
        },
        {
-               {{-0.5, +0.5, -0.5}, {+0.0, +1.0, +0.0}, +0.0, {+0.0, +1.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, +0.5, +0.5}, {+0.0, +1.0, +0.0}, +0.0, {+1.0, +0.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, +0.5, -0.5}, {+0.0, +1.0, +0.0}, +0.0, {+1.0, +1.0}, {+1.0, +1.0, +1.0}},
-               {{+0.5, +0.5, +0.5}, {+0.0, +1.0, +0.0}, +0.0, {+1.0, +0.0}, {+1.0, +1.0, +1.0}},
-               {{-0.5, +0.5, -0.5}, {+0.0, +1.0, +0.0}, +0.0, {+0.0, +1.0}, {+1.0, +1.0, +1.0}},
-               {{-0.5, +0.5, +0.5}, {+0.0, +1.0, +0.0}, +0.0, {+0.0, +0.0}, {+1.0, +1.0, +1.0}},
+               {{-0.5, +0.5, -0.5}, {+0.0, +1.0, +0.0}, {+0.0, +1.0}},
+               {{+0.5, +0.5, +0.5}, {+0.0, +1.0, +0.0}, {+1.0, +0.0}},
+               {{+0.5, +0.5, -0.5}, {+0.0, +1.0, +0.0}, {+1.0, +1.0}},
+               {{+0.5, +0.5, +0.5}, {+0.0, +1.0, +0.0}, {+1.0, +0.0}},
+               {{-0.5, +0.5, -0.5}, {+0.0, +1.0, +0.0}, {+0.0, +1.0}},
+               {{-0.5, +0.5, +0.5}, {+0.0, +1.0, +0.0}, {+0.0, +0.0}},
        },
 };