Final: Illumination

src/data/axis.h

@@ -7,39 +7,35 @@
 #undef G
 #undef H
 
-const float X = 2.0;
-const float Y = 0.05;
-const float Z = 0.05;
-
-#define A -X,-Y,-Z,
-#define B -X,-Y, Z,
-#define C -X, Y,-Z,
-#define D -X, Y, Z,
-#define E  X,-Y,-Z,
-#define F  X,-Y, Z,
-#define G  X, Y,-Z,
-#define H  X, Y, Z,
+#define A -2.0,-0.05,-0.05,
+#define B -2.0,-0.05, 0.05,
+#define C -2.0, 0.05,-0.05,
+#define D -2.0, 0.05, 0.05,
+#define E  2.0,-0.05,-0.05,
+#define F  2.0,-0.05, 0.05,
+#define G  2.0, 0.05,-0.05,
+#define H  2.0, 0.05, 0.05,
 
 narray_float_t d_axis =
 {
 	3*3*2*6,
 
 	A C E
-	C E G
+	G E D
 
 	E G F
-	G F H
+	H F G 
 
 	F H B
-	H B D
+	D B H
 
 	B D A
-	D A C
+	C A D 
 
 	C D G
-	D G H
+	H G D
 
-	A B E 
+	E B A 
 	B E F
 
 };

src/data/cube.h

@@ -1,5 +1,3 @@
-#include <cglm/cglm.h>
-
 #define A -1,-1,-1,
 #define B -1,-1, 1,
 #define C -1, 1,-1,
@@ -9,43 +7,25 @@
 #define G  1, 1,-1,
 #define H  1, 1, 1,
 
-narray_float_t d_cube =
+float d_cube[] =
 {
 	3*3*2*6,
 
 	A C E
-	C E G
+	G E C
 
 	E G F
-	G F H
+	H F G
 
 	F H B
-	H B D
+	D B H
 
 	B D A
-	D A C
+	C A D 
 
 	C D G
-	D G H
+	H G D
 
-	A B E 
+	E B A
 	B E F
-
-    A C E
-    C E G
-    
-    E G F
-    G F H
-
-    F H B
-    H B D
-
-    B D A 
-    D A C
-
-    C D G 
-    D G H
-
-    A B E
-    B E F
 };

src/data/shaders.h

@@ -37,14 +37,12 @@ const char * fs =
 	"{"
 
 	"	vec4 color = texture( palette, vec3( 0, 0, index ) ).rgba;"
-	"	vec3 lightColor = vec3(1,1,1);"
-	"	vec3 lightPos = vec3(0,000,-15);"
+	"	vec3 lightPos = vec3(0,0,-15);"
 	"	vec3 lightDir = normalize(lightPos - FragPos);"
-	"	vec3 norm = normalize(Normal);"
 
-	"	float diffuse = max(dot(norm, lightDir), 0.0);"
+	"	float diffuse = max(dot(Normal, lightDir), 0.0);"
 	"	float ambient = 0.5;"
-	"	FragColor = vec4((ambient + diffuse)*lightColor,1.0)*color;"
+	"	FragColor = (ambient + diffuse)*color;"
 	"}";