summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gl.c5
-rw-r--r--src/lua_core.c1
-rw-r--r--src/rgui.c16
-rw-r--r--src/state.c1
4 files changed, 20 insertions, 3 deletions
diff --git a/src/gl.c b/src/gl.c
index 18947d5..a6777a9 100644
--- a/src/gl.c
+++ b/src/gl.c
@@ -55,10 +55,11 @@ int lglBlitFramebuffer( lua_State *L ) {
dstRect.x, dstRect.y, dstRect.width, dstRect.height,
mask,
filter
- // GL_COLOR_BUFFER_BIT, // mask
- // GL_NEAREST // filter
);
+ glBindFramebuffer( GL_READ_FRAMEBUFFER, 0 );
+ glBindFramebuffer( GL_DRAW_FRAMEBUFFER, 0 );
+
lua_pushboolean( L, true );
return 1;
diff --git a/src/lua_core.c b/src/lua_core.c
index 3c839c6..6bb6237 100644
--- a/src/lua_core.c
+++ b/src/lua_core.c
@@ -1290,6 +1290,7 @@ void luaRegister() {
assingGlobalFunction( "GuiGetState", lguiGuiGetState );
/* Font. */
assingGlobalFunction( "GuiSetFont", lguiGuiSetFont );
+ assingGlobalFunction( "GuiGetFont", lguiGuiGetFont );
/* Style. */
assingGlobalFunction( "GuiSetStyle", lguiGuiSetStyle );
assingGlobalFunction( "GuiGetStyle", lguiGuiGetStyle );
diff --git a/src/rgui.c b/src/rgui.c
index 57f4a4d..e2c1fa0 100644
--- a/src/rgui.c
+++ b/src/rgui.c
@@ -131,7 +131,7 @@ int lguiGuiGetState( lua_State *L ) {
/*
> success = RL.GuiSetFont( Font font )
-Set gui custom font ( Global state )
+Set gui custom font ( global state )
- Failure return false
- Success return true
@@ -143,6 +143,7 @@ int lguiGuiSetFont( lua_State *L ) {
return 1;
}
size_t fontId = lua_tointeger( L, 1 );
+ state->guiFont = fontId;
GuiSetFont( *state->fonts[ fontId ] );
lua_pushboolean( L, true );
@@ -151,6 +152,19 @@ int lguiGuiSetFont( lua_State *L ) {
}
/*
+> font = RL.GuiGetFont()
+
+Get gui custom font ( global state )
+
+- Success return int
+*/
+int lguiGuiGetFont( lua_State *L ) {
+ lua_pushinteger( L, state->guiFont );
+
+ return 1;
+}
+
+/*
## Gui - Style
*/
diff --git a/src/state.c b/src/state.c
index e9e12f4..877464e 100644
--- a/src/state.c
+++ b/src/state.c
@@ -17,6 +17,7 @@ bool stateInit( const char *exePath ) {
state->resolution = (Vector2){ 800, 600 };
state->luaState = NULL;
state->textureSource = TEXTURE_SOURCE_TEXTURE;
+ state->guiFont = 0;
/* Images. */
state->imageAlloc = ALLOC_PAGE_SIZE;
state->imageCount = 0;