From 5c579bed9088f3b67d5793969240d2bde172aa8d Mon Sep 17 00:00:00 2001
From: Adog64 <amsharpe102@pm.me>
Date: Wed, 13 Dec 2023 10:50:20 -0500
Subject: [PATCH] Seg faults with planet generation, probaly struct pointer fix

---
 PlanetMiner       | Bin 23752 -> 23880 bytes
 bin/imagefiles.o  | Bin 0 -> 952 bytes
 bin/main.o        | Bin 11600 -> 11192 bytes
 bin/textfiles.o   | Bin 2808 -> 2864 bytes
 bin/worldgen.o    | Bin 1480 -> 2456 bytes
 src/collections.h |  19 +++++++++
 src/imagefiles.c  |   4 +-
 src/imagefiles.h  |   3 +-
 src/main.c        | 104 +++++++++-------------------------------------
 src/textfiles.c   |   2 +-
 src/worldgen.c    |  65 ++++++++++++++++++++++++-----
 src/worldgen.h    |   9 +++-
 todo.md           |  13 +++---
 13 files changed, 112 insertions(+), 107 deletions(-)
 create mode 100644 bin/imagefiles.o
 create mode 100644 src/collections.h

diff --git a/PlanetMiner b/PlanetMiner
index 3e8c029492c510f4894a33c3ea3f9a8e90baf4ec..22ad1a19d5e2df7444694bae0f240e7e7f3a73c0 100755
GIT binary patch
delta 6417
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
E0cTC;LjV8(

delta 6487
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
SR68~0pB{@!(-5R;^#22tp<7n~

diff --git a/bin/imagefiles.o b/bin/imagefiles.o
new file mode 100644
index 0000000000000000000000000000000000000000..7d9faa6fbb93305f06f3b87902ae2b3772015c31
GIT binary patch
literal 952
zcmbVK%}N6?5T32|_aJx^yu_0&*tok@5D&6YYCVVtLGYSxV=cNr>_)IBU&Tl95qtvQ
z!6(oeo6$5q>A>Wh@0<COY}n`i#aSZ=fFpoY_+_jD96Mt2Ehn%6>i~mZ??ki)m)C6(
zb!99g5r=U%3ZqE0uJlNpD`Oj-!!|$@y#jL?6HU;7;FUCvz;fp}Zp|U}oAB{DClZ-t
zYOHT354x5qfUKvPQA0#i&G3#Zqn`}OkunP8u&zO-MV9FtwY)G|;^jKEQR%(q<NQ&U
zRZ;57OcxIQyRd^6`i2$Hns}V4{~o*8AZ>{UEG8aj>ihSwv4;6y|2}$Y&k)m%#F7J7
z#G21%JaRO5v~Y=2vyY`d7OR*I7A%$){d>{3x<UK-Uh2Qlg28_B(H#4?sfmGq{=(al
c{zePN<_vyT|NdLp@!y_?->u`uB7^V$0!EZM?f?J)

literal 0
HcmV?d00001

diff --git a/bin/main.o b/bin/main.o
index f89d2547f371e30c0ff9c89327589e30b85bede2..75c8d16ff3dbd615afef2c0ab9ab102146ec9ff3 100644
GIT binary patch
delta 3653
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

literal 11600
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
bm;(EbtJ0l6(sa4Vb_aF*d08s{xZD3Pq4;7T

diff --git a/bin/textfiles.o b/bin/textfiles.o
index 76147113f6d01359ed146dd72103435ea3cc965d..779fb7be1077f7a163651323b7ca8e8716a38976 100644
GIT binary patch
delta 345
zcmew%x<PD$24lfQ&2q--i3@`zeLA1NU;qN2&R6?DwBZ4dZd(vzGArX_F+&4GLj{eX
z)D#7e#1aKVV?851LtT@}{}{s<|4a^L+RgZ9vmi4+BV+VrLuT>G3M|nqX+^22o9kHu
z84Y)UOaTHGAQlATKmQ@%0FVs=TtEzxvjA~`;N;{&R&mC2lNYjzOWuG8f#n5&Y?$8r
zAT^TDp|UU&pj?J`Aiaz~HdnIAGXmW=lii$i0mud*(3pIa-JH>8vLJ^&kPHNq6M<yG
z<cmP^=43%mdq$4QfnahXkhGY55lEhxEXZZgIe`gc#)ip}T;`k(P!kg-Ph=9FyoO7K
K@xkPaT<QSUe_8SX

delta 287
zcmdlW_Cs`n2BXD9&2q-#i3@`TJ-TfffWW8o)jkkycwjOw<6|)cb0Z4{jiA&N1&_oM
z1w&&!BRxZ1!^vz+VT@lU$1?3^{IXe+nV)g814}duNZaQ5EP;%S+b2(C6_?x(5&!}&
zAO=ZVfH**KZ1O=?amEXi1KGqGuY*)F-k;nEWIqFof7rZ{O`Z{G`bBng&IYid3=9I3
z1v$)_Oc*CmWD=X4z@Y(SF5u8$G?{#o!=5o?GAE}!<HgCIoc5E8xkM+=<<w?mn0yi_
tW-ytP%bsz<WKS-8&JHGs6J|`F$Ysu{05v^&@<kwT1sg=JYjPlmJOH>BMkxRQ

diff --git a/bin/worldgen.o b/bin/worldgen.o
index 3e9a882ac9629ed783ada29ca6f337f018d9f04d..3f8f7f3aadf01c8db267c70bb8c156d2b0e4fd5c 100644
GIT binary patch
literal 2456
zcmbVN&uiR96n?vQ8aGK-aww%Gfe5-SPD#|2V~QKvAY&&{z;#W2w1uS9%C6SCbXQs=
zIkt1D!8v3xF1;mxMna(Y5YmPA(o?TJ<?KMA6dxOK-zU9M*7CZCJQ%$<-+bSj8O<B%
zhl{h9iiH9xE6@dc)l(?Z!$YrPI|*&lNh4ePdAF|p{rj~YO;0F0+DCtEgYXL;JKCAv
z=J49)3>7y|+E%aoJQ?dgPe!fY%@<(R>!x<<9wNH-46{4kf300-{jYgvW2S7^wP2=P
zak?{Q-Rfzh!{sE$#`W^VMqI8~J!kzlBgvQGkQgkPE$dEqn%ke+=uxIrZvLvBN>^p|
zl4<9Hu<f>*cbopA@j=bF<Argv>P1KB3omLUU2ny3!_Zwds=<;UpJ&#QWR*noL1(Gu
z#$L@>4#HN=XhX8xj2kKwORGV<6ZoDVM~3UyFc61L*I#UT*<74$&8ExK)8~z`%X2qQ
z8`e2<+_a4G%J?~}Vp+!6Ri46eV;ML*aXMYVFgt@A-Z=}YNQE9Sb#?{mzsVTv?bK1>
z?o}$R=!Fx<4v+lA<aZfADPtGmuaxxl;&N$(LxbBSH`up$Okr%Uw9qWs)sj9167t@{
z7~8Sb{qGa&8>WAD2a$%d)$bi0N_M#yLvM)Q*axO-IJ^%ZW#o8Y{$#I=z0XbG$0iy(
z0RNbA<e3*u@?JRpT<}MNXYV2@k44Wnt7OhjSEwU}bEO(YorV{Bj4aow6E^+0PE7Pd
zE~~FmROCy6dS6Lt61^q)i|ldsFLzUWM{v{tcCYXgf}?JSB!(N87<`<y;(sc*;=d>T
zJL18|TUY$9;NW9S*^d(B^FJ0`<yZWv1Nd79;D+FM4`|9hlR)9>oECDpIwvxt)pqRO
zW*>*CZ>T8rTCN#;D>0chH+IRq9Yth@0Xm>trnR>_nRTmCJV7RZ0NQ;0$@GKRGx?gH
zjbgX@z4RCTC9@L-9X{Jt7Gg55@m)Q1+n(CZ>wANxxNG?vVlxJNn!4<%XHgoUZg6&X
z+RdJiq=-h4oDKDe5H$qD_XPGKH{ks>2mB=-15DCoBWE~5&ezpjtVK>$=Nu-c=Kn+i
z;??}h+l&v=PYS`w>DB&~{!7sx&+*oT(0^AzQGMlaiN2E4-xEE)L;a@aRURdz;(p$f
zLEr%H5@Yy|^xrMy*%EzzU26Z}z&5#on%8fOz5`O9<@NV@Y*77e$qRBsi~2jtP3cwr
w4VoL0Z)8ELeoKtuj^y?DZ{}-{AzBa+=i6_xtqj8dW{_U}${u9QG|21!0|4|Npa1{>

literal 1480
zcmbV~PiqrV5Wr{CYNN(l#Y3=y>qT0y&ur3z6p=uyT}65*h$oSk&9eb_v&-%)wq88+
zqPHIXDBdjU2k>L`&_lfobtaifUY9*}V0PyH=FfYX$>(RUp4U7NL_By3)00quFSV)P
z9l2e&4h;woPMSYX5gZc?4}LepuRp&(LI2l{dmH$L&Gq#)e`#~;^|BvyR9gjpyVdRl
ztswB1woTs;wdKId>N3n?rH^_E6>Fdd-VreokI(YP+Z^ydZG*SB;4L=h>W3I4ewSm5
zWH;vht@-+huQHb&e5^E-GYfyus)92WlWJh%Er*ZpMs^2vp`yus&i6SsdDF)<kNZ1j
zs3O3x$+b0a2tlIbIE^4nv)vfsizqF!fyvFd!By@<Gb8<XHWr^bt<hN}JT7s`16AxN
zR`<}_d~65e<tEn3nmr4uudN2vD+*9inj~h3Y?xZ3aCa+()zJq&?+kZUmZzD??LMec
z2Qzs0KGz99oZoR#L+_^9T`o1~@|ouBN_iKwCz@B+O+x<<FQmzw=1Zu~XW<W+&oCFG
z#VJ{CJE0HJqn;P753rVcwoqM>`yaUweYs!kn#0`GL-*kLQYYvoI&-M*e~V&LUw)U&
zk8((QsMNDue}s%A9Gl6vT>lm$Rr@>Uhsyo5KdO~_*<aP&bXlG2<#${|Mms9kUtx~s
eoP6W@&N(`rzu=qbly^_DCJ!W*M7G>^LjMEJ1Z%DU

diff --git a/src/collections.h b/src/collections.h
new file mode 100644
index 0000000..b702c6f
--- /dev/null
+++ b/src/collections.h
@@ -0,0 +1,19 @@
+typedef struct intHashTableItem
+{
+    int key;
+    int value;
+}
+
+typedef struct intHashTable
+{
+    intHashTableItem** items;
+    int size;
+    int count;
+}
+
+intHashTable* createTable(int);
+intHashTableItem* createIntHashTableItem(int key, int value);
+void freeIntHashTableItem(intHashTableItem*);
+void freeIntHashTable(intHashTable*);
+void intHashTableInsert(intHashTable*, int, int);
+
diff --git a/src/imagefiles.c b/src/imagefiles.c
index d42409d..628fef8 100644
--- a/src/imagefiles.c
+++ b/src/imagefiles.c
@@ -1,7 +1,7 @@
 #include "imagefiles.h"
 #include <stdlib.h>
 #include <stdio.h>
-
+/*
 bmp loadBitmapImage(char* path)
 {
     FILE* inFile;
@@ -58,4 +58,4 @@ bmp loadBitmapImage(char* path)
     fread(data, 1, imageSize, inFile);
 
     fclose(inFile);
-}
+}*/
diff --git a/src/imagefiles.h b/src/imagefiles.h
index 7e5c827..07a1581 100644
--- a/src/imagefiles.h
+++ b/src/imagefiles.h
@@ -1,4 +1,5 @@
-typedef struct bmp {
+typedef struct bmp
+{
     unsigned char header[54];
     unsigned int dataPos;
     unsigned int width, height;
diff --git a/src/main.c b/src/main.c
index fb61c1e..17d2d45 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,6 +11,8 @@ GLFWwindow* window;
 
 #include <cglm/struct.h>
 
+#include "worldgen.h"
+
 #define WINW 800
 #define WINH 450
 
@@ -19,6 +21,9 @@ GLFWwindow* window;
 #define SHADER_BUF_SIZE 1000
 
 GLuint loadShaders(const char*, const char*);
+static GLfloat vertexBufferData[1000];
+
+void setVertexBufferData(GLfloat*, unsigned int*, unsigned int);
 
 int main()
 {
@@ -72,93 +77,14 @@ int main()
     vec3s center = {0.0f, 0.0f, 0.0f};
     vec3s up = {0.0f, 1.0f, 0.0f};
     
-    static const GLfloat g_vertex_buffer_data[] = {
-        // BAC
-        1.0f, 0.0f, 2.0f,
-        2.0f, 1.0f, 0.0f,
-        0.0f, 2.0f, 1.0f,
-        // BCH
-        1.0f, 0.0f, 2.0f,
-        0.0f, 2.0f, 1.0f,
-        -1.0f, 0.0f, 2.0f,
-        // BHF
-        1.0f, 0.0f, 2.0f,
-        -1.0f, 0.0f, 2.0f,
-        0.0f, -2.0f, 1.0f,
-        // BFG
-        1.0f, 0.0f, 2.0f,
-        0.0f, -2.0f, 1.0f,
-        2.0f, -1.0f, 0.0f,
-        // BGA
-        1.0f, 0.0f, 2.0f,
-        2.0f, -1.0f, 0.0f,
-        2.0f, 1.0f, 0.0f,
-        // AIC
-        2.0f, 1.0f, 0.0f,
-        0.0f, 2.0f, -1.0f,
-        0.0f, 2.0f, 1.0f,
-        // ICD
-        0.0f, 2.0f, -1.0f,
-        0.0f, 2.0f, 1.0f,
-        -2.0f, 1.0f, 0.0f,
-        // CDH
-        0.0f, 2.0f, 1.0f,
-        -2.0f, 1.0f, 0.0f,
-        -1.0f, 0.0f, 2.0f,
-        // DHJ
-        -2.0f, 1.0f, 0.0f,
-        -1.0f, 0.0f, 2.0f,
-        -2.0f, -1.0f, 0.0f,
-        // HJF
-        -1.0f, 0.0f, 2.0f,
-        -2.0f, -1.0f, 0.0f,
-        0.0f, -2.0f, 1.0f,
-        // JFL
-        -2.0f, -1.0f, 0.0f,
-        0.0f, -2.0f, 1.0f,
-        0.0f, -2.0f, -1.0f,
-        // FLG
-        0.0f, -2.0f, 1.0f,
-        0.0f, -2.0f, -1.0f,
-        2.0f, -1.0f, 0.0f,
-        // LGE
-        0.0f, -2.0f, -1.0f,
-        2.0f, -1.0f, 0.0f,
-        1.0f, 0.0f, -2.0f,
-        // GEA
-        2.0f, -1.0f, 0.0f,
-        1.0f, 0.0f, -2.0f,
-        2.0f, 1.0f, 0.0f,
-        // EAI
-        1.0f, 0.0f, -2.0f,
-        2.0f, 1.0f, 0.0f,
-        0.0f, 2.0f, -1.0f,
-        // KEI
-        -1.0f, 0.0f, -2.0f,
-        1.0f, 0.0f, -2.0f,
-        0.0f, 2.0f, -1.0f,
-        // KID
-        -1.0f, 0.0f, -2.0f,
-        0.0f, 2.0f, -1.0f,
-        -2.0f, 1.0f, 0.0f,
-        // KDJ
-        -1.0f, 0.0f, -2.0f,
-        -2.0f, 1.0f, 0.0f,
-        -2.0f, -1.0f, 0.0f,
-        // KJL
-        -1.0f, 0.0f, -2.0f,
-        -2.0f, -1.0f, 0.0f,
-        0.0f, -2.0f, -1.0f,
-        // KLE
-        -1.0f, 0.0f, -2.0f,
-        0.0f, -2.0f, -1.0f,
-        1.0f, 0.0f, -2.0f
-    };
+    vec3s planetPos = {0.0f, 0.0f, 0.0f};
+    worldMesh mesh = generateWorld(planetPos);
+    setVertexBufferData(mesh.vertices, mesh.triangles, mesh.triangleArrayCount);
 
     GLuint vertexbuffer;
     glGenBuffers(1, &vertexbuffer);
     glBindBuffer(GL_ARRAY_BUFFER, vertexbuffer);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(g_vertex_buffer_data), g_vertex_buffer_data, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertexBufferData), vertexBufferData, GL_STATIC_DRAW);
     
     vec3s direction = {0.0f, 0.0f, -5.0f};
 
@@ -197,8 +123,8 @@ int main()
         }
 
         // center = glms_vec3_add(eye, direction);
-        eye.x = radius * (float) sin((double) theta);
-        eye.z = radius * (float) cos((double) theta);
+        eye.x = radius * sinf(theta);
+        eye.z = radius * cosf(theta);
 
         mat4s view = glms_lookat(eye, center, up);
         mat4s model = glms_mat4_identity();
@@ -301,3 +227,11 @@ GLuint loadShaders(const char* vertexShaderPath, const char* fragmentShaderPath)
     glDeleteShader( fragmentShaderID );
     return programID;
 }
+
+void setVertexBufferData(GLfloat* vertices, unsigned int* triangles, unsigned int triangleCount)
+{
+    printf("Loading %d triangles into buffer\n", triangleCount);
+    for( int i = 0; i < triangleCount; ++i )
+    {
+    }
+}
diff --git a/src/textfiles.c b/src/textfiles.c
index 7bd8c61..b033f36 100644
--- a/src/textfiles.c
+++ b/src/textfiles.c
@@ -16,7 +16,7 @@ char* readTextFile(char* fname)
     if( inFile == NULL )
     {
         fprintf( stderr, "Failed open file, [%s].\n", fname );
-        exit();
+        exit(1);
     }
 
     fseek( inFile, 0, SEEK_END );
diff --git a/src/worldgen.c b/src/worldgen.c
index f46472b..7f4c3e6 100644
--- a/src/worldgen.c
+++ b/src/worldgen.c
@@ -1,24 +1,67 @@
 #include "worldgen.h"
 #include <cglm/struct.h>
 #include <GL/glew.h>
+#include <math.h>
+#include <string.h>
 
-#define ORDER 1
-#define RSQRT5 0.4472135954999579
-#define TWICE_RSQRT5 = 0.8944271909999159
+#define ORDER 0
+#define RSQRT5 0.4472135954999579f
+#define TWICE_RSQRT5 0.8944271909999159f
+#define GOLDEN 1.618033988749895f
 
 worldMesh generateWorld(vec3s position)
 {
     // placeholder struct for world mesh
-    worldMesh mesh;
-    mesh.count = 20 * ORDER * 3;      // Icosahedron has 20 triangular sides
-
-    mesh.vertices = (GLfloat*) malloc(sizeof(GLfloat) * mesh.count);
-    populateIcosphere(mesh, ORDER, 1);
-
+    world
     return mesh;
 }
 
-void populateIcosphere(worldMesh mesh, unsigned char order, float radius)
+void populateIcosphere(unsigned char order, GLfloat radius)
 {
-       
+    int T = powf(4, order);
+    mesh.vertexArrayCount = (10*T + 2) * 3; // Final heap array size for vertices
+
+    // Initial vertex array. Not used other than to initialize heap array in mesh
+    GLfloat vertices[] = {
+        -1.0f, GOLDEN, 0.0f, 1.0f, GOLDEN, 0.0f, -1.0f, -GOLDEN, 0.0f, 1.0f, -GOLDEN, 0.0f,
+        0.0f, -1.0f, GOLDEN, 0.0f, 1.0f, GOLDEN, 0.0f, -1.0f, -GOLDEN, 0.0f, 1.0f, -GOLDEN,
+        GOLDEN, 0.0f, -1.0f, GOLDEN, 0.0f, 1.0f, -GOLDEN, 0.0f, -1.0f, -GOLDEN, 0.0f, 1.0f
+    };
+
+
+    unsigned int triangles[] = {
+        0, 11, 5, 0, 5, 1, 0, 1, 7, 0, 7, 10, 0, 10, 11, 
+        11, 10, 2, 5, 11, 4, 1, 5, 9, 7, 1, 8, 10, 7, 6, 
+        3, 9, 4, 3, 4, 2, 3, 2, 6, 3, 6, 8, 3, 8, 9, 
+        9, 8, 1, 4, 9, 5, 2, 4, 11, 6, 2, 10, 8, 6, 7
+    };
+
+    mesh.triangleArrayCount = 20*T*3;
+    normalizeVertices(vertices, mesh.vertexArrayCount, radius);
+
+    // Move vetex and triangle data into mesh struct
+    mesh.vertices = (GLfloat*) malloc(sizeof(GLfloat) * mesh.vertexArrayCount);
+    memcpy(mesh.vertices, vertices, sizeof(GLfloat) * mesh.vertexArrayCount);
+
+    mesh.triangles = (unsigned int*) malloc(sizeof(unsigned int) * mesh.triangleArrayCount);
+    memcpy(mesh.triangles, triangles, sizeof(unsigned int) * 60);
+}
+
+void normalizeVertices(GLfloat* vertices, unsigned int vertexArrayCount, GLfloat radius)
+{
+    printf("Normalizing %d vertices\n", vertexArrayCount);
+    vec3s vertex;
+    for( int i = 0; i < vertexArrayCount; i += 3)
+    {
+            vertex.x = vertices[i];
+            vertex.y = vertices[i + 1];
+            vertex.z = vertices[i + 2];
+
+            glms_vec3_normalize(vertex);
+            glms_vec3_scale(vertex, radius);
+
+            vertices[i] = vertex.x;
+            vertices[i + 1] = vertex.y;
+            vertices[i + 2] = vertex.z;
+    }
 }
diff --git a/src/worldgen.h b/src/worldgen.h
index 0fafaa4..0786695 100644
--- a/src/worldgen.h
+++ b/src/worldgen.h
@@ -1,9 +1,12 @@
 #include <cglm/struct.h>
 #include <GL/glew.h>
 
-typedef struct worldMesh {
-    long int count;
+typedef struct worldMesh
+{
+    unsigned int vertexArrayCount;
+    unsigned int triangleArrayCount;
     GLfloat* vertices;
+    unsigned int* triangles;
 } worldMesh;
 
 
@@ -14,3 +17,5 @@ typedef struct worldMesh {
  * @return          the world mesh as a heap-allocated list of vertices.
  */
 worldMesh generateWorld(vec3s pos);
+worldMesh populateIcosphere(unsigned char order, GLfoat radius);
+
diff --git a/todo.md b/todo.md
index 05c7b8b..5a96f7d 100644
--- a/todo.md
+++ b/todo.md
@@ -2,12 +2,15 @@
 
 ## Priority List
 1. Render stuff
-    1. Render a cube
-    2. Render a bunch of cubes
-    3. Diffuse lighting
-    4. Ray tracing?
+    - [x] Render a cube
+    - [x] Render icosahedron
+    - [ ] Vertices to triangle mesh
+    - [ ] Subdivide icosahedron
 2. Procedural worlds
-    1. Optimize rendering for this many cubes
+    - [ ] Morph vertices of the subdivided icosphere
+    - [ ] Terrain generation
+    - [ ] Planet scaling
+    - [ ] 
 3. Block game
     1. World editing