corrected types of static arrays: Merge branch 'pakanek'

fogleman/Craft#173 #25
satoshinm · Apr 6, 2017 · 7c2b666 · 7c2b666
2 parents d545011 + 83287d6
commit 7c2b666
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/cube.c b/src/cube.c
@@ -26,23 +26,23 @@ void make_cube_faces(
         {0, 0, -1},
         {0, 0, +1}
     };
-    static const float uvs[6][4][2] = {
+    static const int uvs[6][4][2] = {
         {{0, 0}, {1, 0}, {0, 1}, {1, 1}},
         {{1, 0}, {0, 0}, {1, 1}, {0, 1}},
         {{0, 1}, {0, 0}, {1, 1}, {1, 0}},
         {{0, 0}, {0, 1}, {1, 0}, {1, 1}},
         {{0, 0}, {0, 1}, {1, 0}, {1, 1}},
         {{1, 0}, {1, 1}, {0, 0}, {0, 1}}
     };
-    static const float indices[6][6] = {
+    static const int indices[6][6] = {
         {0, 3, 2, 0, 1, 3},
         {0, 3, 1, 0, 2, 3},
         {0, 3, 2, 0, 1, 3},
         {0, 3, 1, 0, 2, 3},
         {0, 3, 2, 0, 1, 3},
         {0, 3, 1, 0, 2, 3}
     };
-    static const float flipped[6][6] = {
+    static const int flipped[6][6] = {
         {0, 1, 2, 1, 3, 2},
         {0, 2, 1, 2, 3, 1},
         {0, 1, 2, 1, 3, 2},
@@ -113,13 +113,13 @@ void make_plant(
         {0, 0, -1},
         {0, 0, +1}
     };
-    static const float uvs[4][4][2] = {
+    static const int uvs[4][4][2] = {
         {{0, 0}, {1, 0}, {0, 1}, {1, 1}},
         {{1, 0}, {0, 0}, {1, 1}, {0, 1}},
         {{0, 0}, {0, 1}, {1, 0}, {1, 1}},
         {{1, 0}, {1, 1}, {0, 0}, {0, 1}}
     };
-    static const float indices[4][6] = {
+    static const int indices[4][6] = {
         {0, 3, 2, 0, 1, 3},
         {0, 3, 1, 0, 2, 3},
         {0, 3, 2, 0, 1, 3},
@@ -259,7 +259,7 @@ void make_character_3d(
         {{+2, 0, -1}, {-2, 0, +1}, {+2, 0, +1},
          {+2, 0, -1}, {-2, 0, -1}, {-2, 0, +1}}
     };
-    static const float uvs[8][6][2] = {
+    static const int uvs[8][6][2] = {
         {{0, 0}, {1, 1}, {0, 1}, {0, 0}, {1, 0}, {1, 1}},
         {{1, 0}, {0, 1}, {0, 0}, {1, 0}, {1, 1}, {0, 1}},
         {{1, 0}, {0, 1}, {0, 0}, {1, 0}, {1, 1}, {0, 1}},
@@ -364,7 +364,7 @@ void make_sphere(float *data, float r, int detail) {
         { 0,-1, 0}, {-1, 0, 0},
         { 0, 1, 0}, { 0, 0, 1}
     };
-    static float uvs[6][3] = {
+    static float uvs[6][2] = {
         {0, 0.5}, {0, 0.5},
         {0, 0}, {0, 0.5},
         {0, 1}, {0, 0.5}