diff options
| author | 0scar <qgt268@alumni.ku.dk> | 2024-02-11 13:55:09 +0000 |
|---|---|---|
| committer | 0scar <qgt268@alumni.ku.dk> | 2024-02-11 13:55:09 +0000 |
| commit | 83ef74fb576eb4a932b885da26837f31b09352b6 (patch) | |
| tree | 7d38fa5a0bd2e8720b4ab2a46e8b75e04a07d849 /src | |
| parent | 08b6783e8bdd957a6a082d785930b0027ae72f2a (diff) | |
Render model instead
Diffstat (limited to 'src')
| -rw-r--r-- | src/rendering/include/engine/rendering/rendering.h | 2 | ||||
| -rw-r--r-- | src/rendering/src/gl.c | 15 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/rendering/include/engine/rendering/rendering.h b/src/rendering/include/engine/rendering/rendering.h index cbdce83..23835f2 100644 --- a/src/rendering/include/engine/rendering/rendering.h +++ b/src/rendering/include/engine/rendering/rendering.h @@ -81,6 +81,6 @@ typedef struct { } data; } RenderDrawCall; -RenderObject RenderObject_new(); +RenderObject RenderObject_new(float* model, usize sz); #endif diff --git a/src/rendering/src/gl.c b/src/rendering/src/gl.c index d998dd0..f05c07d 100644 --- a/src/rendering/src/gl.c +++ b/src/rendering/src/gl.c @@ -121,17 +121,10 @@ GLuint LoadShaders( return ProgramID; } -RenderObject RenderObject_new() { +RenderObject RenderObject_new(float* model, usize sz) { GladGLContext *gl = GLOBAL_PLATFORM->window->context; RenderObject o; - static const float quad[8] = { - 0.f, 0.f, - 1.f, 0.f, - 1.f, 1.f, - 0.f, 1.f, - }; - // TODO: implement index buffer! gl->GenVertexArrays(1, &(o.vao)); @@ -139,7 +132,11 @@ RenderObject RenderObject_new() { gl->GenBuffers(1, &(o.vbo)); gl->BindBuffer(GL_ARRAY_BUFFER, o.vbo); - gl->BufferData(GL_ARRAY_BUFFER, sizeof(quad), quad, GL_STATIC_DRAW); + gl->BufferData(GL_ARRAY_BUFFER, sz, model, GL_STATIC_DRAW); + + //gl->GenBuffers(1, &(o.ibo)); + //gl->BindBuffer(GL_ARRAY_BUFFER, o.ibo); + //gl->BufferData(GL_ARRAY_BUFFER, sizeof(quad), quad, GL_STATIC_DRAW); o.shader.program = LoadShaders(gl, "shader.vertexshader", "shader.fragmentshader"); |
