diff --git a/src/k3.h b/src/k3.h index bfb7ca8..1898d9f 100644 --- a/src/k3.h +++ b/src/k3.h @@ -168,6 +168,7 @@ void k3StorageUnref(struct k3Storage*); struct k3Mdl; struct k3Mdl *k3MdlCreate(size_t verts, size_t indices, size_t boneCount, vec3 *pos, uint8_t *nrm, float *uvs, uint8_t *cols, uint8_t *boneids, uint16_t *boneweights, uint16_t *inds, mat4 *invBind, uint8_t *boneParents); void k3MdlUpdatePos(struct k3Mdl *mdl, vec3 *pos); +void k3MdlUpdateNrm(struct k3Mdl *mdl, uint8_t *nrm); void k3MdlAddMesh(struct k3Mdl*, struct k3Mat*, uint32_t idxStart, uint32_t idxNumber); struct k3Mesh *k3MdlGetMeshes(struct k3Mdl*, size_t *count); void k3MdlAddAnim(struct k3Mdl*, struct k3AnimationFountain*); diff --git a/src/k3_internal.h b/src/k3_internal.h index 27d681d..50bfb48 100644 --- a/src/k3_internal.h +++ b/src/k3_internal.h @@ -103,7 +103,7 @@ static inline struct k3Timer k3StartTimer(char *name) { struct k3Timer t = {}; if(!GLAD_GL_ARB_timer_query) { - return; + return t; } glGenQueries(2, (GLuint*) &t); diff --git a/src/k3batch.h b/src/k3batch.h index 43b50c3..dbba3bb 100644 --- a/src/k3batch.h +++ b/src/k3batch.h @@ -10,6 +10,8 @@ struct k3RectF { float h; }; +void k3BatchInit(); + void k3BatchAdd(struct k3Tex *tex, struct k3RectF src, struct k3RectF dst, float rot, vec4 color, float borderRadius, float minAlpha); void k3BatchFlush(); diff --git a/src/k3font.c b/src/k3font.c index 3b44e28..b7508a7 100644 --- a/src/k3font.c +++ b/src/k3font.c @@ -4,6 +4,7 @@ #include #include"gl.h" #include +#include #define GLCA_IMPLEMENTATION #include"glyphcache/glca.h"