aboutsummaryrefslogtreecommitdiff
path: root/src/gl.c
diff options
context:
space:
mode:
authorCharles <sircharlesaze@gmail.com>2020-05-13 17:14:08 +0200
committerCharles <sircharlesaze@gmail.com>2020-05-13 17:14:08 +0200
commit46f56c104218f675daf2feb1366f53f4d84a1886 (patch)
tree6b3a324e160bc601ff724d59dca5ed7d9f6a2766 /src/gl.c
parent0267b512527b85af6cd815bb9215bd659b75931e (diff)
downloadscop-46f56c104218f675daf2feb1366f53f4d84a1886.tar.gz
scop-46f56c104218f675daf2feb1366f53f4d84a1886.tar.bz2
scop-46f56c104218f675daf2feb1366f53f4d84a1886.zip
Very ugly and not working texture
Diffstat (limited to 'src/gl.c')
-rw-r--r--src/gl.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/gl.c b/src/gl.c
index e923e9b..4da958d 100644
--- a/src/gl.c
+++ b/src/gl.c
@@ -6,7 +6,7 @@
/* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/05/11 01:31:10 by charles #+# #+# */
-/* Updated: 2020/05/13 12:48:04 by charles ### ########.fr */
+/* Updated: 2020/05/13 16:44:20 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -33,7 +33,7 @@ int gl_state_init(t_gl_state *state, t_object *object)
GL_CALL(glBindVertexArray(state->vertex_array));
GL_CALL(glBindBuffer(GL_ARRAY_BUFFER, state->vertex_buf));
- GL_CALL(glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 8 * object->vertices_len,
+ GL_CALL(glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 10 * object->vertices_len,
object->vertices, GL_STATIC_DRAW));
GL_CALL(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, state->index_buf));
@@ -41,9 +41,15 @@ int gl_state_init(t_gl_state *state, t_object *object)
object->indices, GL_STATIC_DRAW));
GL_CALL(glEnableVertexAttribArray(0));
- GL_CALL(glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(float) * 8, (void*)0));
+ GL_CALL(glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(float) * 10, (void*)0));
GL_CALL(glEnableVertexAttribArray(1));
- GL_CALL(glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, sizeof(float) * 8, (void*)(4 * sizeof(float))));
+ GL_CALL(glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, sizeof(float) * 10, (void*)(4 * sizeof(float))));
+ GL_CALL(glEnableVertexAttribArray(2));
+ GL_CALL(glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 10, (void*)(8 * sizeof(float))));
+
+ state->polygon_mode = GL_FILL;
+ state->polygon_mode_last_time = glfwGetTime();
+ state->fov = M_PI_4;
return (0);
}