*修改代码结构

1 files changed, 12 insertions, 8 deletions

diff --git a/src/lua/modules/graphics/je_lua_ttf.cpp b/src/lua/modules/graphics/je_lua_ttf.cpp
index 0216a9a..1f5be50 100644
--- a/src/lua/modules/graphics/je_lua_ttf.cpp
+++ b/src/lua/modules/graphics/je_lua_ttf.cpp
@@ -1,8 +1,10 @@
 #include "lua/modules/luax.h"
-#include "lua/modules/types.h"
+
 #include "lua/common/je_lua_common.h"
 #include "libjin/jin.h"
+
 #include "je_lua_page.h"
+#include "je_lua_text.h"
 
 using namespace JinEngine::Graphics;
 using namespace JinEngine::Graphics::Fonts;
@@ -12,9 +14,11 @@ namespace JinEngine
     namespace Lua
     {
 
+        const char* Jin_Lua_TTF = "TTF";
+
         LUA_IMPLEMENT int l_gc(lua_State* L)
         {
-            Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_TTF);
+            Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_TTF);
             proxy->release();
             return 0; 
         }
@@ -22,7 +26,7 @@ namespace JinEngine
 	    /* typeset(Text | string, lineheight, spacing) */
         LUA_IMPLEMENT int l_typeset(lua_State* L)
         {
-            Proxy* pxyTTF = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_TTF);
+            Proxy* pxyTTF = (Proxy*)luax_checktype(L, 1, Jin_Lua_TTF);
             Shared<TTF>& shrTTF = pxyTTF->getShared<TTF>();
 		    TTF* ttf = pxyTTF->getObject<TTF>();
             int lineheight = luax_optnumber(L, 3, ttf->getFontSize());
@@ -35,14 +39,14 @@ namespace JinEngine
 			    Text text(Encode::UTF8, str, length);
 			    page = ttf->typeset(text, lineheight, spacing);
 		    }
-		    else if (luax_istype(L, 2, JIN_GRAPHICS_TEXT))
+		    else if (luax_istype(L, 2, Jin_Lua_Text))
 		    {
-			    Proxy* pxyText = (Proxy*)luax_checktype(L, 2, JIN_GRAPHICS_TEXT);
+			    Proxy* pxyText = (Proxy*)luax_checktype(L, 2, Jin_Lua_Text);
 			    Text* text = pxyText->getObject<Text>();
 			    page = ttf->typeset(*text, lineheight, spacing);
 		    }
-            Proxy* pxyPage = luax_newinstance(L, JIN_GRAPHICS_PAGE);
-		    Shared<Page>* refPage = new Shared<Page>(page, JIN_GRAPHICS_PAGE);
+            Proxy* pxyPage = luax_newinstance(L, Jin_Lua_Page);
+		    Shared<Page>* refPage = new Shared<Page>(page, Jin_Lua_Page);
             refPage->setDependency((int)PageDependency::DEP_TTF, &shrTTF);
             pxyPage->bind(refPage);
             return 1;
@@ -55,7 +59,7 @@ namespace JinEngine
                 { "typeset", l_typeset },
                 { 0,         0         }
             };
-            luax_newtype(L, JIN_GRAPHICS_TTF, f);
+            luax_newtype(L, Jin_Lua_TTF, f);
 
             return 0;
         }