aboutsummaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c201
1 files changed, 68 insertions, 133 deletions
diff --git a/src/main.c b/src/main.c
index cc83f4e..c02bc2f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
/* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/05/09 10:20:09 by charles #+# #+# */
-/* Updated: 2020/05/13 17:11:37 by charles ### ########.fr */
+/* Updated: 2020/05/14 14:49:02 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -18,38 +18,39 @@
** - parse vt
** - parse coord index of f
** - transition color/texture
+** - cleaner code
*/
-void handle_event(GLFWwindow *window, t_gl_state *state)
-{
- if (glfwGetKey(window, GLFW_KEY_ESCAPE) == GLFW_PRESS)
- glfwSetWindowShouldClose(window, true);
- else if (glfwGetKey(window, GLFW_KEY_P) == GLFW_PRESS)
- {
- if (state->polygon_mode_last_time + 0.1 > glfwGetTime())
- return ;
- if (state->polygon_mode == GL_FILL)
- state->polygon_mode = GL_LINE;
- else if (state->polygon_mode == GL_LINE)
- state->polygon_mode = GL_POINT;
- else if (state->polygon_mode == GL_POINT)
- state->polygon_mode = GL_FILL;
- GL_CALL(glPolygonMode(GL_FRONT_AND_BACK, state->polygon_mode));
- state->polygon_mode_last_time = glfwGetTime();
- }
- else if (glfwGetKey(window, GLFW_KEY_EQUAL) == GLFW_PRESS)
- {
- state->fov -= M_PI / 100.0f;
- if (state->fov <= M_PI_4 / 2)
- state->fov = M_PI_4 / 2;
- }
- else if (glfwGetKey(window, GLFW_KEY_MINUS) == GLFW_PRESS)
- {
- state->fov += M_PI / 100.0f;
- if (state->fov >= M_PI - M_PI_4 / 2)
- state->fov = M_PI - M_PI_4 / 2;
- }
-}
+/* void handle_event(GLFWwindow *window) */
+/* { */
+/* if (glfwGetKey(window, GLFW_KEY_ESCAPE) == GLFW_PRESS) */
+/* glfwSetWindowShouldClose(window, true); */
+/* else if (glfwGetKey(window, GLFW_KEY_P) == GLFW_PRESS) */
+/* { */
+/* if (state->polygon_mode_last_time + 0.1 > glfwGetTime()) */
+/* return ; */
+/* if (state->polygon_mode == GL_FILL) */
+/* state->polygon_mode = GL_LINE; */
+/* else if (state->polygon_mode == GL_LINE) */
+/* state->polygon_mode = GL_POINT; */
+/* else if (state->polygon_mode == GL_POINT) */
+/* state->polygon_mode = GL_FILL; */
+/* GL_CALL(glPolygonMode(GL_FRONT_AND_BACK, state->polygon_mode)); */
+/* state->polygon_mode_last_time = glfwGetTime(); */
+/* } */
+/* else if (glfwGetKey(window, GLFW_KEY_EQUAL) == GLFW_PRESS) */
+/* { */
+/* state->fov -= M_PI / 100.0f; */
+/* if (state->fov <= M_PI_4 / 2) */
+/* state->fov = M_PI_4 / 2; */
+/* } */
+/* else if (glfwGetKey(window, GLFW_KEY_MINUS) == GLFW_PRESS) */
+/* { */
+/* state->fov += M_PI / 100.0f; */
+/* if (state->fov >= M_PI - M_PI_4 / 2) */
+/* state->fov = M_PI - M_PI_4 / 2; */
+/* } */
+/* } */
void debugmat(t_ftmmat4 *mat)
{
@@ -64,13 +65,10 @@ void debugmat(t_ftmmat4 *mat)
printf("\n");
}
-extern bool g_window_resized;
-
int main(int argc, char **argv)
{
- GLFWwindow *window;
- t_object object;
- t_gl_state state;
+ t_state state;
+ t_model_data data;
if (argc != 2)
{
@@ -79,117 +77,54 @@ int main(int argc, char **argv)
ft_putendl(" [obj file]");
return (1);
}
- if (parse(argv[1], &object) == -1)
+ if (parse(argv[1], &data) == -1)
{
ft_putstr("Error: couldn't parse ");
ft_putendl(argv[1]);
return (1);
}
- unsigned int texture = texture_new("res/brick.bmp");
- float *coords = texture_coord_create(object.vertices, object.vertices_len);
-
- t_ftmmat4 center_trans;
- center_mat4_init_translate(&center_trans, object.vertices, object.vertices_len);
- /* debugmat(&center_trans); */
-
- if (!color_merge_vertices(&object, coords))
- {
- ft_putstr("Error: couldn't create colors");
- return (1);
- }
-
-
- /* for (size_t i = 0; i < object.indices_len * 3; i++) */
+ /* unsigned int texture = texture_new("res/brick.bmp"); */
+ /* float *coords = texture_coord_create(object.vertices, object.vertices_len); */
+ /* */
+ /* if (!color_merge_vertices(&object, coords)) */
/* { */
- /* printf("%u, ", object.indices[i++]); */
- /* printf("%u, ", object.indices[i++]); */
- /* printf("%u\n", object.indices[i]); */
+ /* ft_putstr("Error: couldn't create colors"); */
+ /* return (1); */
/* } */
- /* printf("yo %lu\n", object.indices_len); */
- for (size_t i = 0; i < object.vertices_len * 10; i++)
+ printf("size %lu\n", data.indices_size);
+ for (size_t i = 0; i < data.indices_size; i++)
{
- printf("% f, ", object.vertices[i++]);
- printf("% f, ", object.vertices[i++]);
- printf("% f, ", object.vertices[i++]);
- printf("% f\tcolor: ", object.vertices[i++]);
- printf("% f, ", object.vertices[i++]);
- printf("% f, ", object.vertices[i++]);
- printf("% f, ", object.vertices[i++]);
- printf("% f\ttex: ", object.vertices[i]);
- printf("% f", object.vertices[i++]);
- printf("% f\n", object.vertices[i]);
+ printf("%u, ", data.indices[i++]);
+ printf("%u, ", data.indices[i++]);
+ printf("%u\n", data.indices[i]);
}
- printf("yo %lu\n", object.vertices_len);
-
- t_ftmmat4 model;
- t_ftmmat4 view;
- t_ftmmat4 proj;
- t_ftmvec3 vec;
-
- ftm_mat4init_eye(&model, 1.0);
- /* ftm_mat4translate(&model, 0.0, 0.0, -10.0); */
- /* ftm_mat4rotate(&model, ftm_radian(45.0f), ftm_vec3init(&vec, 0.0, 1.0, 0.0)); */
- /* ftm_mat4mul(&model, &center_trans); */
- /* ftm_mat4rotate(&model, M_PI_4, ftm_vec3init(&vec, 0.0, 1.0, 0.0)); */
- /* ftm_mat4scale(&model, 1.1, 1.1, 1.1); */
-
- ftm_mat4init_eye(&view, 1.0);
- ftm_mat4init_perspective(&proj, M_PI_2 / 2.0, 1.0, 0.1, 100.0);
-
- /* debugmat(&model); */
- /* debugmat(&view); */
- /* debugmat(&proj); */
-
- if ((window = glfw_init(400, 400)) == NULL
- || gl_state_init(&state, &object) == -1)
- return (1);
-
- GL_CALL(glBindBuffer(GL_ARRAY_BUFFER, 0));
- GL_CALL(glBindVertexArray(0));
-
- GL_CALL(glUseProgram(state.shader));
- gl_state_set_mvp(&state, &model, &view, &proj);
-
- GL_CALL(glUniform1i(glGetUniformLocation(state.shader, "u_texture"), 0));
- GL_CALL(glActiveTexture(GL_TEXTURE0));
- /* printf("%u\n", texture); */
- /* GL_CALL(glBindTexture(GL_TEXTURE_2D, texture)); */
-
- float deg = 0.0;
- while (!glfwWindowShouldClose(window))
+ printf("size %lu\n", data.vertices_size);
+ for (size_t i = 0; i < data.vertices_size; i++)
{
- handle_event(window, &state);
- GL_CALL(glClearColor(0.2f, 0.3f, 0.3f, 1.0f));
- GL_CALL(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
-
-
- GL_CALL(glUseProgram(state.shader));
-
- ftm_mat4init_eye(&model, 1.0);
- ftm_mat4translate(&model, 0.0, 0.0, -10.0);
- ftm_mat4rotate(&model, ftm_radian(deg), ftm_vec3init(&vec, 0.0, 1.0, 0.0));
- ftm_mat4mul(&model, &center_trans);
- deg += 0.4;
-
- int w, h;
- glfwGetFramebufferSize(window, &w, &h);
- ftm_mat4init_perspective(&proj, state.fov, (float)w / (float)h, 0.1, 100.0);
- g_window_resized = false;
-
- gl_state_set_mvp(&state, &model, &view, &proj);
-
+ printf("% f, ", data.vertices[i++]);
+ printf("% f, ", data.vertices[i++]);
+ printf("% f, ", data.vertices[i++]);
+ printf("% f\n", data.vertices[i]);
+ /* printf("% f, ", object.vertices[i++]); */
+ /* printf("% f, ", object.vertices[i++]); */
+ /* printf("% f, ", object.vertices[i++]); */
+ /* printf("% f\ttex: ", object.vertices[i]); */
+ /* printf("% f", object.vertices[i++]); */
+ /* printf("% f\n", object.vertices[i]); */
+ }
- GL_CALL(glBindVertexArray(state.vertex_array));
- GL_CALL(glDrawElements(GL_TRIANGLES, object.indices_len * sizeof(unsigned int) * 3, GL_UNSIGNED_INT, (void*)0));
+ /* GL_CALL(glUniform1i(glGetUniformLocation(state.shader, "u_texture"), 0)); */
+ /* GL_CALL(glActiveTexture(GL_TEXTURE0)); */
+ /* GL_CALL(glBindTexture(GL_TEXTURE_2D, texture)); */
- glfwSwapBuffers(window);
- glfwPollEvents();
- }
- gl_state_quit(&state, &object);
- glfwDestroyWindow(window);
- glfwTerminate();
+ if (!state_init(&state, &data))
+ return (1);
+ state_run(&state);
+ state_quit(&state);
+ free(data.vertices);
+ free(data.indices);
return 0;
}
generated by cgit (git 2.34.1) at 2026-05-16 08:52:32 +0000