Merge main, change compile.bat, add struct gui

Makefile

@@ -9,32 +9,24 @@ OBJ = \
 	src/input.o \
 	src/load.o \
 	src/mesh.o \
+	src/gui.o \
 	src/main.o 
 
 EXAMPLES = \
 	example/basic \
 	example/riemman \
 	example/n-cube \
+	example/n-hilbert-cube \
 	example/lens
 
 CFLAGS = \
 	-I./ext/cglm/include  \
 	-I./ext/glfw/include  \
 	-I./ext/glad  \
+	-I./ext/nuklear  \
 	-I./include  \
 	-Wall -Wno-unused-function -std=c99 -D_GNU_SOURCE \
 
-WAYLAND-LIB = \
-	xdg-shell \
-	relative-pointer-unstable-v1 \
-	xdg-decoration-unstable-v1 \
-	pointer-constraints-unstable-v1 \
-	viewporter \
-	idle-inhibit-unstable-v1  \
-	fractional-scale-v1 \
-	xdg-activation-v1 \
-	wayland
-
 help:
 	@echo "Usage:"
 	@echo "	$(MAKE) windows"
@@ -59,11 +51,11 @@ glfw.dll:
 # LINUX
 linux-wayland: $(OBJ)
 	cd ext; $(MAKE) -f glfw.mk linux-wayland; cd -
-	$(CC) -o $(BIN) $(OBJ) ext/libglfw.a -lGL -lm
+	$(CC) -o $(BIN) $(OBJ) ext/libglfw.a -lm
 
 linux-x11: $(OBJ)
 	cd ext; $(MAKE) -f glfw.mk linux-x11; cd -
-	$(CC) -o $(BIN) $(OBJ) ext/libglfw.a -lGL -lm
+	$(CC) -o $(BIN) $(OBJ) ext/libglfw.a -lm 
 
 cocoa: $(OBJ)
 	cd ext; $(MAKE) -f glfw.mk cocoa; cd -
@@ -73,9 +65,6 @@ wasm: $(OBJ)
 	$(CC) -sUSE_WEBGL2=1 -sUSE_GLFW=3 -o $(BIN).html $(OBJ)
 	chmod -x $(BIN).wasm
 
-libglfw.so: 
-	$(CC) -fPIC -shared $(DFLAGS) -D_GLFW_BUILD_DLL -Iext/glfw/deps/wayland ./ext/glfw/src/*.c -o $@ 
-
 clean:
 	rm $(OBJ) $(BIN) $(EXAMPLES)
 	cd ext; $(MAKE) -f glfw.mk clean; cd -
@@ -89,5 +78,4 @@ examples: $(EXAMPLES)
 	$(CC) -Wno-implicit-function-declaration $(CFLAGS) -c -o $@ $<
 
 .c:
-	$(CC) -lm -Wno-implicit-function-declaration $(CFLAGS) -c -o $@ $<
-	
+	$(CC) -I include  -o $@ $< -lm

compile.bat

@@ -1,3 +1,3 @@
 :: git submodule update --init --recursive
 :: gcc -fPIC -shared -Iext/glfw/deps/MinGW -D_GLFW_WIN32 -D_GLFW_BUILD_DLL ./ext/glfw/src/*.c -o  glfw.dll -lgdi32
-gcc -I ext/cglm/include -I ext/glfw/include src/*.c -o manigraph -L . -lglfw -lopengl32 -lglew32
+gcc -I ext/glad -I ext/cglm/include -I ext/nuklear -I ext/glfw/include src/*.c ext/glad/glad.c -o manigraph -L . -lglfw -lopengl32

include/klein/klein.h

@@ -39,8 +39,8 @@ int klein_export_file(struct klein klein, const char * filename)
 	fwrite("\0", 1, 1, file);
 	fwrite(&klein.dim, 1, 1, file);
 	fwrite(&klein.vertex_size, 8, 1, file);
-	fwrite(klein.vertex, 16, klein.vertex_size * klein.dim, file);
-	fwrite(klein.normals, 16, klein.vertex_size * klein.dim, file);
+	fwrite(klein.vertex, 4, klein.vertex_size * klein.dim, file);
+	fwrite(klein.normals, 4, klein.vertex_size * klein.dim, file);
 
 	fclose(file);
 	return 0;

src/context.c

@@ -9,7 +9,6 @@
 
 void set_clean_color_context(unsigned char r, unsigned char g, unsigned char b)
 {
-	glEnable(GL_DEPTH_TEST);
 	glClearColor((float)r / 0xff, (float)g / 0xff, (float)b / 0xff, 1.0);
 }
 
@@ -22,4 +21,11 @@ int init_context(void)
 #endif
 }
 
-void clean_context(void) { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); }
+void clean_context(void)
+{
+	/* This is important cos, Nuklear Disable DEPTH TEST */
+	glEnable(GL_BLEND);
+	glEnable(GL_DEPTH_TEST);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glClear(GL_COLOR_BUFFER_BIT| GL_DEPTH_BUFFER_BIT );
+}

src/data/cube.h

@@ -0,0 +1,32 @@
+#define A -1,-1,-1,
+#define B -1,-1, 1,
+#define C -1, 1,-1,
+#define D -1, 1, 1,
+#define E  1,-1,-1,
+#define F  1,-1, 1,
+#define G  1, 1,-1,
+#define H  1, 1, 1,
+
+narray_float_t d_cube =
+{
+	3*3*2*6,
+
+	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/gui.c

@@ -0,0 +1,83 @@
+#include <glad.h>
+#include "main.h"
+#define MAX_VERTEX_BUFFER 512 * 1024
+#define MAX_ELEMENT_BUFFER 128 * 1024
+#define NK_INCLUDE_FIXED_TYPES
+#define NK_INCLUDE_STANDARD_IO
+#define NK_INCLUDE_STANDARD_VARARGS
+#define NK_INCLUDE_DEFAULT_ALLOCATOR
+#define NK_INCLUDE_VERTEX_BUFFER_OUTPUT
+#define NK_INCLUDE_FONT_BAKING
+#define NK_INCLUDE_DEFAULT_FONT
+#define NK_IMPLEMENTATION
+#define NK_GLFW_GL3_IMPLEMENTATION
+#include <nuklear.h>
+#include <demo/glfw_opengl3/nuklear_glfw_gl3.h>
+
+struct gui gui =
+{
+	.file_name = {0},
+	.projection = (struct projection){ .mesh=NULL, .x =0, .y=1, .z=2 },
+};
+
+float surface_color[4] = {(float)0x2F/0xFF, (float)0x3C/0xFF, (float)0x7E/0xFF, (float)0xff/0xFF};
+
+
+static inline
+void restore_surface_color( void )
+{
+	gui.picked_color[0] = surface_color[0];
+	gui.picked_color[1] = surface_color[1];
+	gui.picked_color[2] = surface_color[2];
+	gui.picked_color[3] = surface_color[3];
+}
+
+struct nk_glfw glfw ={0};
+struct nk_context * context;
+
+void draw_gui( void )
+{
+	nk_glfw3_new_frame(&glfw);
+
+	if (nk_begin(context, "MANIGRAPH", nk_rect(10, 10, 256, 256),
+			NK_WINDOW_BORDER |NK_WINDOW_SCALABLE | NK_WINDOW_MOVABLE | NK_WINDOW_MINIMIZABLE) )
+	{
+
+		/* Color picker para personalización */
+		{
+			struct nk_colorf * p = (void*)&gui.picked_color;
+			nk_layout_row_dynamic(context, 120, 1);
+			*p = nk_color_picker(context, *p, NK_RGBA);
+		}
+
+		nk_layout_row_dynamic(context, 20, 1);
+		if (nk_button_label(context, "Restablecer"))
+			restore_surface_color();
+
+
+		nk_layout_row_dynamic(context, 12, 1);
+		nk_label(context, (char*)gui.file_name, NK_TEXT_ALIGN_LEFT);
+
+		nk_label_colored(context, "Atajos de teclado:", NK_TEXT_ALIGN_LEFT, nk_rgb(255, 255, 255)); // Encabezado
+		nk_label(context, "  - W/S: Rotar eje X", NK_TEXT_ALIGN_LEFT);
+		nk_label(context, "  - A/D: Rotar eje Y", NK_TEXT_ALIGN_LEFT);
+		nk_label(context, "  - Z/X: Rotar eje Z", NK_TEXT_ALIGN_LEFT);
+	}
+
+	nk_end(context);
+	nk_glfw3_render(&glfw, NK_ANTI_ALIASING_ON, MAX_VERTEX_BUFFER, MAX_ELEMENT_BUFFER);
+}
+
+
+void init_gui( window_t window )
+{
+	struct nk_font_atlas * atlas;
+
+	restore_surface_color();
+
+	{
+		context = nk_glfw3_init(&glfw,(GLFWwindow*) window, NK_GLFW3_DEFAULT );
+		nk_glfw3_font_stash_begin(&glfw, &atlas);
+		nk_glfw3_font_stash_end(&glfw);
+	}
+}

src/input.c

@@ -1,15 +1,18 @@
 #include "main.h"
+#include <glad.h>
 #include <GLFW/glfw3.h>
 #include <cglm/quat.h>
 #include <stdio.h>
+#include <string.h>
 
 #define ANGLE ((float)0x01 / 0xff * 2 * GLM_PI)
 
 unsigned char selected_axis = 0;
-int window_width;
-int window_height;
+int window_width = 512;
+int window_height = 512;
 
 unsigned char animate_index = 0;
+extern struct gui gui;
 
 versor q = GLM_QUAT_IDENTITY_INIT;
 
@@ -19,7 +22,13 @@ vec3 axis[3] = {
 	{0, 0, 1},
 };
 
-extern struct projection projection;
+
+void __error_callback_input(int x, const char * msg )
+{
+	mlog("[GLFW] ");
+	mlog(msg);
+	mlog("\n");
+}
 
 void __key_callback_input(
 	GLFWwindow *window, int key, int scancode, int action, int mods)
@@ -33,41 +42,41 @@ void __key_callback_input(
 
 		selected_coord = key - GLFW_KEY_0 - 1;
 
-		if (selected_coord >= projection.m)
+		if (selected_coord >= gui.projection.m)
 			return;
-		if (selected_coord == projection.x)
+		if (selected_coord == gui.projection.x)
 			return;
-		if (selected_coord == projection.y)
+		if (selected_coord == gui.projection.y)
 			return;
-		if (selected_coord == projection.z)
+		if (selected_coord == gui.projection.z)
 			return;
 
-		selected_coord = projection.w;
+		selected_coord = gui.projection.w;
 	}
 
-	if (projection.w >= projection.m)
+	if (gui.projection.w >= gui.projection.m)
 		return;
 
 	switch (key)
 	{
 		unsigned char tmp;
 	case GLFW_KEY_I:
-		tmp = projection.w;
-		projection.w = projection.x;
-		projection.x = tmp;
+		tmp = gui.projection.w;
+		gui.projection.w = gui.projection.x;
+		gui.projection.x = tmp;
 
 		animate_index = 1;
 		break;
 	case GLFW_KEY_O:
-		tmp = projection.w;
-		projection.w = projection.y;
-		projection.y = tmp;
+		tmp = gui.projection.w;
+		gui.projection.w = gui.projection.y;
+		gui.projection.y = tmp;
 		animate_index = 2;
 		break;
 	case GLFW_KEY_P:
-		tmp = projection.w;
-		projection.w = projection.z;
-		projection.z = tmp;
+		tmp = gui.projection.w;
+		gui.projection.w = gui.projection.z;
+		gui.projection.z = tmp;
 		animate_index = 3;
 		break;
 	}
@@ -128,18 +137,20 @@ void __scroll_callback_input(GLFWwindow *window, double xoffset, double yoffset)
 	glm_quat_rotatev(r, axis[2], axis[2]);
 }
 
-void __drop_callback_input(GLFWwindow *window, int count, char **path)
+void __drop_callback_input(GLFWwindow *window, int count, unsigned char **path)
 {
 	struct surface surface;
 
 	if (create_surface_klein(*path, &surface))
 		return;
 
-	if (!(projection.mesh = create_mesh(surface)))
+	if (!(gui.projection.mesh = create_mesh(surface)))
 		return;
 
-	projection.m = surface.dim;
-	set_projection_mesh(projection);
+	strcpy(gui.file_name, *path);
+
+	gui.projection.m = surface.dim;
+	set_projection_mesh(gui.projection);
 
 	free(surface.norm);
 	free(surface.data);
@@ -187,13 +198,5 @@ end:
 	glm_quat_rotatev(p, axis[2], axis[2]);
 	glm_quat_normalize(q);
 
-	// LOG INFO
-	if (0)
-	{
-		printf("QUAT: %2.5f %2.5f %2.5f %2.5f\n", q[0], q[1], q[2], q[3]);
-		printf("PROY: %3d %3d %3d (%3d)\n", projection.x, projection.y,
-			projection.z, projection.w);
-		printf("\n");
-	}
 	return q;
 }

src/klein.c

@@ -35,10 +35,10 @@ int create_surface_klein(unsigned char *path, struct surface *surface)
 
 	size = surface->dim * surface->vertex;
 
-	surface->data = malloc(16 * size);
-	fread(surface->data, 16, size, file);
+	surface->data = malloc(4 * size);
+	fread(surface->data, 4, size, file);
 
-	surface->norm = malloc(16 * size);
-	fread(surface->norm, 16, size, file);
+	surface->norm = malloc(4 * size);
+	fread(surface->norm, 4, size, file);
 	return 0;
 }

src/load.c

@@ -22,13 +22,7 @@ void rot_matrix_load(id_t shader, quat_t q)
 	load_mat4_to_shader(shader, "rot", (mat4_t)m);
 }
 
-void color_load(id_t shader, unsigned char color[4])
+void color_load(id_t shader, float res[4])
 {
-	float res[4];
-
-	res[0] = (float)color[0] / 0xff;
-	res[1] = (float)color[1] / 0xff;
-	res[2] = (float)color[2] / 0xff;
-	res[3] = (float)color[3] / 0xff;
 	load_float4_to_shader(shader, "color", res);
 }

src/main.c

@@ -7,6 +7,11 @@
 #define WIDTH 512
 #define HEIGHT 512
 
+#include <glad.h>
+
+float *generate_data_surface(unsigned int, unsigned char *);
+float *generate_normals_surface(float *, unsigned char);
+
 #ifdef EMSCRIPTEN
 #include <emscripten.h>
 #endif
@@ -15,11 +20,13 @@
 #define M_PI 3.14159
 #endif
 
-struct projection projection = {.x = 0, .y = 1, .z = 2, .w = 3, .mesh = NULL};
+window_t window;
+id_t shader, shader_plain;
 
 const char *wname = "manigraph: manifold grapher";
 
-unsigned char color[4] = {0x2F, 0x3C, 0x7E, 0xff};
+extern volatile unsigned char animate_index;
+extern struct gui gui;
 
 void mlog(char *msg)
 {
@@ -28,11 +35,6 @@ void mlog(char *msg)
 #endif
 }
 
-window_t window;
-id_t shader, shader_plain;
-
-extern volatile unsigned char animate_index;
-
 #ifndef EMSCRIPTEN
 static inline
 #endif
@@ -44,10 +46,16 @@ static inline
 
 	q = poll_input(window);
 
+	gui.quat[0] = q[0];
+	gui.quat[1] = q[1];
+	gui.quat[2] = q[2];
+	gui.quat[3] = q[3];
+
+
 	rot_matrix_load(shader, q);
 	rot_matrix_load(shader_plain, q);
-	color_load(shader, color);
-	color_load(shader_plain, color);
+	color_load(shader, gui.picked_color);
+	color_load(shader_plain, gui.picked_color);
 
 	{
 		static float angle = 0;
@@ -59,7 +67,7 @@ static inline
 
 			load_float_to_shader(shader, "angle", angle);
 			load_float_to_shader(shader_plain, "angle", angle);
-			set_projection_mesh(projection);
+			set_projection_mesh(gui.projection);
 		}
 
 		if (animate_index)
@@ -74,16 +82,19 @@ static inline
 	}
 	clean_context();
 
-	if (!projection.mesh)
-		return;
 
-	draw_mesh(shader, projection.mesh);
-	draw_mesh_lines(shader_plain, projection.mesh);
+	if (gui.projection.mesh)
+	{
+		draw_mesh(shader, gui.projection.mesh);
+		draw_mesh_lines(shader_plain, gui.projection.mesh);
+	}
+
+	draw_gui();
+	
 }
 
 int main(void)
 {
-
 	mlog("[VENTANA] Inicializando...\n");
 	{
 		if (!(window = init_window(WIDTH, HEIGHT, wname)))
@@ -129,6 +140,11 @@ int main(void)
 		fix_matrix_load(shader_plain, (float)WIDTH / HEIGHT);
 	}
 
+	mlog("[GUI] Inicializando...\n");
+	{
+		init_gui(window);
+	}
+
 	mlog("[MAIN LOOP] Inicializando...\n");
 #ifdef EMSCRIPTEN
 	emscripten_set_main_loop(&main_loop, 60, 1);
@@ -140,7 +156,7 @@ int main(void)
 	mlog("[MAIN LOOP] Terminando...\n");
 
 	mlog("[MESH] Destruyendo...\n");
-	destroy_mesh(projection.mesh);
+	destroy_mesh(gui.projection.mesh);
 	mlog("[SHADER] Destruyendo...\n");
 	destroy_shader(shader_plain);
 	mlog("[SHADER] Destruyendo...\n");
@@ -150,12 +166,12 @@ int main(void)
 	return 0;
 
 error_context:
-	mlog("[SHADER] Destruyendo...\n");
-	destroy_shader(shader_plain);
-error_shader_plain:
 	mlog("[SHADER] Destruyendo...\n");
 	destroy_shader(shader);
 error_shader:
+	mlog("[SHADER] Destruyendo...\n");
+	destroy_shader(shader_plain);
+error_shader_plain:
 	mlog("[WINDOW] Destruyendo...\n");
 	close_window(window);
 error_window:

src/main.h

@@ -5,6 +5,7 @@
 */
 
 #define DEBUG
+#define GLFW_INCLUDE_NONE
 
 typedef const void *window_t;
 typedef unsigned int id_t;
@@ -22,12 +23,19 @@ typedef float *mat4_t;
 		w: the coordanate of the w axis.
 */
 
+struct gui
+{
+	float quat[4];
+	float picked_color[4];
+	char file_name[0xff];
 	struct projection
 	{
 		mesh_t mesh;
 		unsigned char m, x, y, z, w;
+	} projection;
 };
 
+
 /*
 	this structure has all the information to generate
 	a mesh, where:
@@ -163,7 +171,7 @@ void rot_matrix_load(id_t shader, quat_t q);
 /*
  */
 
-void color_load(id_t shader, unsigned char color[4]);
+void color_load(id_t shader, float* color);
 
 id_t config_texture(unsigned short type);
 
@@ -179,3 +187,6 @@ void destroy_texture(id_t texture);
 id_t create_palette_texture(const unsigned char colors[][4], unsigned char n);
 
 quat_t poll_input(window_t window);
+
+void draw_gui( void );
+void init_gui(  window_t window );

src/mesh.c

@@ -111,6 +111,7 @@ void draw_mesh_lines(id_t shader, mesh_t p)
 #ifndef EMSCRIPTEN
 	glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 	glDrawArrays(GL_TRIANGLES, 0, obj->vertex);
+	glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 #else
 	glDrawArrays(GL_LINES, 0, obj->vertex);
 #endif

src/window.c

@@ -8,6 +8,7 @@ void __mouse_callback_input(GLFWwindow *, int, int, int);
 void __scroll_callback_input(GLFWwindow *, double, double);
 void __key_callback_input(GLFWwindow *, int, int, int, int);
 void __drop_callback_input(GLFWwindow *, int, const char **);
+void __error_callback_input(int, const char *);
 
 window_t init_window(unsigned int w, unsigned int h, const char *name);
 
@@ -44,6 +45,7 @@ static void __limit_fps_window(int max_fps)
 window_t init_window(unsigned int width, unsigned int height, const char *title)
 {
 	window_t window;
+	glfwSetErrorCallback(__error_callback_input);
 
 	if (!glfwInit())
 		return NULL;
@@ -51,6 +53,7 @@ window_t init_window(unsigned int width, unsigned int height, const char *title)
 	glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
 	glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
 	glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+	glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, 1); 
 
 	window = (window_t)glfwCreateWindow(width, height, title, NULL, NULL);
 	if (!(window))
@@ -67,15 +70,18 @@ window_t init_window(unsigned int width, unsigned int height, const char *title)
 	glfwSetKeyCallback((GLFWwindow *)window, __key_callback_input);
 	glfwSetDropCallback((GLFWwindow *)window, __drop_callback_input);
 
-	__window_callback_input((GLFWwindow *)window, width, height);
-
 	return window;
 }
 
 void use_window(window_t window) { glfwMakeContextCurrent((void *)window); }
 
+extern int window_width, window_height;
+
 int is_open_window(window_t window)
 {
+	/* Restore window proportions if Nuklear breaks it */
+	__window_callback_input((GLFWwindow *)window, window_width, window_height);
+
 	glfwSwapBuffers((void *)window);
 	glfwPollEvents();