aaaa
This commit is contained in:
parent
cd590661cb
commit
0aae751ee5
1 changed files with 4 additions and 10 deletions
14
skr/skr.h
14
skr/skr.h
|
|
@ -374,13 +374,10 @@ typedef struct SkrMesh {
|
||||||
int VertexCount;
|
int VertexCount;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Index data count.
|
* @brief Index data.
|
||||||
*
|
|
||||||
* Number of indices used to draw this mesh.
|
|
||||||
*/
|
*/
|
||||||
unsigned int Indices;
|
unsigned int* Indices;
|
||||||
|
unsigned int IndexCount;
|
||||||
SkrShaderProgram* Program;
|
|
||||||
} SkrMesh;
|
} SkrMesh;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1005,7 +1002,7 @@ static inline void m_skr_gl_renderer_render(SkrState* s) {
|
||||||
if (mesh->VAO == 0 || mesh->VertexCount == 0)
|
if (mesh->VAO == 0 || mesh->VertexCount == 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
glUseProgram(mesh->Program->Backend.GL.ID);
|
// use shaders
|
||||||
glBindVertexArray(mesh->VAO);
|
glBindVertexArray(mesh->VAO);
|
||||||
glDrawArrays(GL_TRIANGLES, 0, mesh->VertexCount);
|
glDrawArrays(GL_TRIANGLES, 0, mesh->VertexCount);
|
||||||
}
|
}
|
||||||
|
|
@ -1268,10 +1265,7 @@ static inline void m_skr_gl_triangle(SkrState* s) {
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
||||||
glBindVertexArray(0);
|
glBindVertexArray(0);
|
||||||
|
|
||||||
SkrShaderProgram program = {.Backend.GL.ID = prog};
|
|
||||||
|
|
||||||
mesh.VertexCount = 3;
|
mesh.VertexCount = 3;
|
||||||
mesh.Program = &program;
|
|
||||||
model.Meshes = &mesh;
|
model.Meshes = &mesh;
|
||||||
model.MeshCount = 1;
|
model.MeshCount = 1;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue