Many bug fixes
This commit is contained in:
parent
c44e58c4ac
commit
2175d32da4
1
src/k3.h
1
src/k3.h
@ -168,6 +168,7 @@ void k3StorageUnref(struct k3Storage*);
|
|||||||
struct k3Mdl;
|
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);
|
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 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);
|
void k3MdlAddMesh(struct k3Mdl*, struct k3Mat*, uint32_t idxStart, uint32_t idxNumber);
|
||||||
struct k3Mesh *k3MdlGetMeshes(struct k3Mdl*, size_t *count);
|
struct k3Mesh *k3MdlGetMeshes(struct k3Mdl*, size_t *count);
|
||||||
void k3MdlAddAnim(struct k3Mdl*, struct k3AnimationFountain*);
|
void k3MdlAddAnim(struct k3Mdl*, struct k3AnimationFountain*);
|
||||||
|
|||||||
@ -103,7 +103,7 @@ static inline struct k3Timer k3StartTimer(char *name) {
|
|||||||
struct k3Timer t = {};
|
struct k3Timer t = {};
|
||||||
|
|
||||||
if(!GLAD_GL_ARB_timer_query) {
|
if(!GLAD_GL_ARB_timer_query) {
|
||||||
return;
|
return t;
|
||||||
}
|
}
|
||||||
|
|
||||||
glGenQueries(2, (GLuint*) &t);
|
glGenQueries(2, (GLuint*) &t);
|
||||||
|
|||||||
@ -10,6 +10,8 @@ struct k3RectF {
|
|||||||
float h;
|
float h;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
void k3BatchInit();
|
||||||
|
|
||||||
void k3BatchAdd(struct k3Tex *tex, struct k3RectF src, struct k3RectF dst, float rot, vec4 color, float borderRadius, float minAlpha);
|
void k3BatchAdd(struct k3Tex *tex, struct k3RectF src, struct k3RectF dst, float rot, vec4 color, float borderRadius, float minAlpha);
|
||||||
void k3BatchFlush();
|
void k3BatchFlush();
|
||||||
|
|
||||||
|
|||||||
@ -4,6 +4,7 @@
|
|||||||
#include<string.h>
|
#include<string.h>
|
||||||
#include"gl.h"
|
#include"gl.h"
|
||||||
#include<freetype/freetype.h>
|
#include<freetype/freetype.h>
|
||||||
|
#include<freetype/ftmodapi.h>
|
||||||
|
|
||||||
#define GLCA_IMPLEMENTATION
|
#define GLCA_IMPLEMENTATION
|
||||||
#include"glyphcache/glca.h"
|
#include"glyphcache/glca.h"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user