1 files changed, 12 insertions, 13 deletions

diff --git a/src/lua/modules/graphics/je_lua_graphics.cpp b/src/lua/modules/graphics/je_lua_graphics.cpp
index 867547d..7175309 100644
--- a/src/lua/modules/graphics/je_lua_graphics.cpp
+++ b/src/lua/modules/graphics/je_lua_graphics.cpp
@@ -40,7 +40,6 @@ namespace JinEngine
         {
             Color curRenderColor;
 		    Color curClearColor;
-            Font* curFont = nullptr; 
             Font* defaultFont = nullptr;
             bool initialized = false;
         } context;
@@ -74,8 +73,8 @@ namespace JinEngine
             TextureFont* tf = TextureFont::createTextureFont(bitmap, Text(Encode::UTF8, default_charset), default_font_split, bitmap->getHeight());
             delete bitmap;
             context.defaultFont = tf;
-            context.curFont = tf;
-            
+            gl.setFont(tf);
+
             luax_pushboolean(L, context.initialized);
             return 1;
         }
@@ -462,7 +461,7 @@ namespace JinEngine
         /* need set font */
         LUA_IMPLEMENT int l_print(lua_State* L)
         {
-            Font* font = context.curFont;
+            Font* font = gl.getFont();
             if (font == nullptr)
                 return 0;
             unsigned length;
@@ -509,18 +508,18 @@ namespace JinEngine
             if (luax_gettop(L) == 0)
             {
                 // bind to default canvas
-                Canvas::unbind(); 
+                gl.unbindCanvas();
                 return 0; 
             }
             LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Canvas);
 		    Shared<Canvas>& shared = luaObj->getShared<Canvas>();
-            Canvas::bind(shared.getObject());
+            gl.bindCanvas(shared.getObject());
             return 0;
         }
 
         LUA_IMPLEMENT int l_unbindCanvas(lua_State* L)
         {
-            Canvas::unbind(); 
+            gl.unbindCanvas();
             return 0;
         }
 
@@ -528,14 +527,14 @@ namespace JinEngine
         {
             if (luax_gettop(L) == 0)
             {
-                Shader::unuse();
+                gl.unuseShader();
                 return 0;
             }
             if (luax_istype(L, 1, Jin_Lua_Shader))
             {
                 LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Shader);
-                Shared<Shader>& jsl = luaObj->getShared<Shader>();
-                jsl->use();
+                Shared<Shader>& shader = luaObj->getShared<Shader>();
+                gl.useShader(shader.getObject());
             }
             else
             {
@@ -909,20 +908,20 @@ namespace JinEngine
             {
                 LuaObject* p = (LuaObject*)luax_checktype(L, 1, Jin_Lua_TTF);
                 TTF* ttf = p->getObject<TTF>();
-                context.curFont = ttf;
+                gl.setFont(ttf);
             }
             else if (luax_istype(L, 1, Jin_Lua_TextureFont))
             {
                 LuaObject* p = (LuaObject*)luax_checktype(L, 1, Jin_Lua_TextureFont);
                 TextureFont* tf = p->getObject<TextureFont>();
-                context.curFont = tf;
+                gl.setFont(tf);
             }
 		    return 0;
 	    }
 
         LUA_IMPLEMENT int l_unsetFont(lua_State* L)
         {
-            context.curFont = context.defaultFont;
+            gl.setFont(context.defaultFont);
             return 0;
         }