lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow lovr.graphics.setFont(nil);

This commit is contained in:
bjorn 2017-08-08 17:53:03 -07:00
parent abbe5e36d0
commit 58931f01e2
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/graphics.c
View File

@ -352,7 +352,7 @@ int l_lovrGraphicsGetFont(lua_State* L) {
}
int l_lovrGraphicsSetFont(lua_State* L) {
Font* font = luax_checktype(L, 1, Font);
Font* font = lua_isnoneornil(L, 1) ? NULL : luax_checktype(L, 1, Font);
lovrGraphicsSetFont(font);
return 0;
}

5
src/graphics/graphics.c
View File

@ -85,8 +85,8 @@ void lovrGraphicsInit() {
}
void lovrGraphicsDestroy() {
lovrGraphicsSetFont(NULL);
lovrGraphicsSetShader(NULL);
lovrGraphicsSetFont(NULL);
glUseProgram(0);
if (state.defaultFont) {
lovrRelease(&state.defaultFont->ref);
@ -134,10 +134,9 @@ void lovrGraphicsPresent() {
}
void lovrGraphicsPrepare() {
Shader* shader = lovrGraphicsGetShader();
mat4 transform = state.transforms[state.transform];
mat4 projection = state.canvases[state.canvas].projection;
lovrShaderBind(shader, transform, projection, state.color, 0);
lovrShaderBind(state.shader, transform, projection, state.color, 0);
}
// State