*修改代码结构

1 files changed, 24 insertions, 36 deletions

diff --git a/src/lua/modules/graphics/je_lua_graphics.cpp b/src/lua/modules/graphics/je_lua_graphics.cpp
index 3befdde..639a542 100644
--- a/src/lua/modules/graphics/je_lua_graphics.cpp
+++ b/src/lua/modules/graphics/je_lua_graphics.cpp
@@ -165,7 +165,7 @@ namespace JinEngine
                 }
             }
             Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_GRAPHICS_BITMAP, sizeof(Proxy));
-            proxy->bind(new Ref<Bitmap>(bitmap, JIN_GRAPHICS_BITMAP));
+            proxy->bind(new Shared<Bitmap>(bitmap, JIN_GRAPHICS_BITMAP));
             return 1;
         }
 
@@ -176,7 +176,7 @@ namespace JinEngine
             if (luax_istype(L, 1, JIN_GRAPHICS_BITMAP))
             {
                 Proxy* p = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_BITMAP);
-                Ref<Bitmap>& refBitmap = p->getRef<Bitmap>();
+                Shared<Bitmap>& refBitmap = p->getShared<Bitmap>();
                 Bitmap* bitmap = refBitmap.getObject();
                 texture = Texture::createTexture(bitmap);
             }
@@ -186,7 +186,7 @@ namespace JinEngine
                 texture = Texture::createTexture(path);
             }
             Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_GRAPHICS_TEXTURE, sizeof(Proxy));
-            proxy->bind(new Ref<Texture>(texture, JIN_GRAPHICS_TEXTURE));
+            proxy->bind(new Shared<Texture>(texture, JIN_GRAPHICS_TEXTURE));
             return 1;
         }
 
@@ -201,7 +201,7 @@ namespace JinEngine
                 return 1;
             }
             Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_GRAPHICS_SHADER, sizeof(Proxy));
-            proxy->bind(new Ref<Shader>(jsl, JIN_GRAPHICS_SHADER));
+            proxy->bind(new Shared<Shader>(jsl, JIN_GRAPHICS_SHADER));
             return 1;
         }
 
@@ -225,7 +225,7 @@ namespace JinEngine
                 return 1;
             }
             Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_GRAPHICS_SHADER, sizeof(Proxy));
-            proxy->bind(new Ref<Shader>(jsl, JIN_GRAPHICS_SHADER));
+            proxy->bind(new Shared<Shader>(jsl, JIN_GRAPHICS_SHADER));
             return 1;
         }
 
@@ -235,7 +235,7 @@ namespace JinEngine
             int h = luax_checknumber(L, 2);
             Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_GRAPHICS_CANVAS, sizeof(Proxy));
             Canvas* cvs = Canvas::createCanvas(w, h);
-            proxy->bind(new Ref<Canvas>(cvs, JIN_GRAPHICS_CANVAS));
+            proxy->bind(new Shared<Canvas>(cvs, JIN_GRAPHICS_CANVAS));
             return 1;
         }
     
@@ -283,7 +283,7 @@ namespace JinEngine
             float ox = luax_optnumber(L, 7, 0);
             float oy = luax_optnumber(L, 8, 0);
 		    Proxy* proxy = (Proxy*)luax_toudata(L, 1);
-		    Ref<Texture>& tex = proxy->getRef<Texture>();
+		    Shared<Texture>& tex = proxy->getShared<Texture>();
 		    tex->render(x, y, sx, sy, r, ox, oy);
 	    }
 
@@ -299,7 +299,7 @@ namespace JinEngine
             float ox = luax_optnumber(L, 7, 0);
             float oy = luax_optnumber(L, 8, 0);
 		    Proxy* proxy = (Proxy*)luax_toudata(L, 1);
-		    Ref<Canvas>& p = proxy->getRef<Canvas>();
+		    Shared<Canvas>& p = proxy->getShared<Canvas>();
 		    p->render(x, y, sx, sy, r, ox, oy);
 	    }
 
@@ -389,13 +389,13 @@ namespace JinEngine
             if (luax_istype(L, 1, JIN_GRAPHICS_TEXTURE))
             {
                 Proxy* proxy = (Proxy*)luax_toudata(L, 1);
-                Ref<Texture>& tex = proxy->getRef<Texture>();
+                Shared<Texture>& tex = proxy->getShared<Texture>();
                 tex->render(q, x, y, sx, sy, r, ox, oy);
             }
             else if (luax_istype(L, 1, JIN_GRAPHICS_CANVAS))
             {
                 Proxy* proxy = (Proxy*)luax_toudata(L, 1);
-                Ref<Canvas>& p = proxy->getRef<Canvas>();
+                Shared<Canvas>& p = proxy->getShared<Canvas>();
                 p->render(q, x, y, sx, sy, r, ox, oy);
             }
             else
@@ -462,7 +462,7 @@ namespace JinEngine
                 return 0; 
             }
             Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_CANVAS);
-		    Ref<Canvas>& ref = proxy->getRef<Canvas>();
+		    Shared<Canvas>& ref = proxy->getShared<Canvas>();
             Canvas::bind(ref.getObject());
             return 0;
         }
@@ -483,7 +483,7 @@ namespace JinEngine
             if (luax_istype(L, 1, JIN_GRAPHICS_SHADER))
             {
                 Proxy* proxy = (Proxy*)luax_toudata(L, 1);
-                Ref<Shader>& jsl = proxy->getRef<Shader>();
+                Shared<Shader>& jsl = proxy->getShared<Shader>();
                 jsl->use();
             }
             else
@@ -496,18 +496,10 @@ namespace JinEngine
         LUA_IMPLEMENT int l_setBlend(lua_State* L)
         {
 
-            return 0; 
+            return 0;
         }
 
-        LUA_IMPLEMENT RenderMode strtomode(const char* str)
-        {
-            std::string s = std::string(str);
-            if (s == "fill") 
-                return RenderMode::FILL;
-            else if (s == "line") 
-                return RenderMode::LINE;
-            else return RenderMode::NONE;
-        }
+#define IntToRenderMode(I) static_cast<RenderMode>(I)
 
         LUA_IMPLEMENT int l_point(lua_State* L)
         {
@@ -531,8 +523,7 @@ namespace JinEngine
 
         LUA_IMPLEMENT int l_rect(lua_State* L)
         {
-            const char* modestr = luax_checkstring(L, 1);
-            RenderMode mode = strtomode(modestr);
+            RenderMode mode = IntToRenderMode(luax_checkinteger(L, 1));
             if (mode != RenderMode::NONE)
             {
                 int x = luax_checknumber(L, 2);
@@ -552,8 +543,7 @@ namespace JinEngine
 
         LUA_IMPLEMENT int l_circle(lua_State* L)
         {
-            const char* modestr = luax_checkstring(L, 1);
-            RenderMode mode = strtomode(modestr);
+            RenderMode mode = IntToRenderMode(luax_checkinteger(L, 1));
             if (mode != RenderMode::NONE)
             {
                 int x = luax_checknumber(L, 2);
@@ -572,8 +562,7 @@ namespace JinEngine
 
         LUA_IMPLEMENT int l_triangle(lua_State* L)
         {
-            const char* modestr = luax_checkstring(L, 1);
-            RenderMode mode = strtomode(modestr);
+            RenderMode mode = IntToRenderMode(luax_checkinteger(L, 1));
             if (mode != RenderMode::NONE)
             {
                 int x = luax_checknumber(L, 2);
@@ -598,9 +587,8 @@ namespace JinEngine
     
         LUA_IMPLEMENT int l_polygon(lua_State* L)
         {
-            const char* modestr = luax_checkstring(L, 1);
-            int n = luax_checknumber(L, 2); 
-            RenderMode mode = strtomode(modestr); 
+            RenderMode mode = IntToRenderMode(luax_checkinteger(L, 1));
+            int n = luax_checknumber(L, 2);
             if (mode != RenderMode::NONE)
             {
                 if (!luax_istable(L, 3))
@@ -648,7 +636,7 @@ namespace JinEngine
                 fs->read(path, b);
                 fd = TTFData::createTTFData(&b, b.size());
             }
-            proxy->bind(new Ref<TTFData>(fd, JIN_GRAPHICS_TTFDATA));
+            proxy->bind(new Shared<TTFData>(fd, JIN_GRAPHICS_TTFDATA));
             return 1;
         }
 
@@ -672,7 +660,7 @@ namespace JinEngine
 		    const char* data = luax_checklstring(L, 1, &length);
 		    Text* text = new Text(encode, data, length);
 		    Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_GRAPHICS_TEXT, sizeof(Proxy));
-		    proxy->bind(new Ref<Text>(text, JIN_GRAPHICS_TEXT));
+		    proxy->bind(new Shared<Text>(text, JIN_GRAPHICS_TEXT));
 		    return 1;
 	    }
 
@@ -724,7 +712,7 @@ namespace JinEngine
                 delete text;
             }
 		    Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_GRAPHICS_TEXTUREFONT, sizeof(Proxy));
-		    proxy->bind(new Ref<TextureFont>(textureFont, JIN_GRAPHICS_TEXTUREFONT));
+		    proxy->bind(new Shared<TextureFont>(textureFont, JIN_GRAPHICS_TEXTUREFONT));
 		    return 1;
 	    }
 
@@ -810,7 +798,7 @@ namespace JinEngine
     
         LUA_EXPORT int luaopen_graphics(lua_State* L)
         {
-            // register types
+            // Register types.
             luaopen_Bitmap(L);
             luaopen_Texture(L);
             luaopen_Canvas(L);
@@ -821,7 +809,7 @@ namespace JinEngine
             luaopen_Page(L);
             luaopen_JSL(L);
 
-            // load whole lib 
+            // Load whole lib.
             luax_newlib(L, f);
         
             return 1;