From 72e45f0062d727cedd576d1e1251f6722454a119 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Mon, 12 Nov 2018 08:04:11 +0800
Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lua/modules/graphics/je_lua_graphics.cpp | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

(limited to 'src/lua/modules/graphics/je_lua_graphics.cpp')

diff --git a/src/lua/modules/graphics/je_lua_graphics.cpp b/src/lua/modules/graphics/je_lua_graphics.cpp
index 24cdf59..3ff5710 100644
--- a/src/lua/modules/graphics/je_lua_graphics.cpp
+++ b/src/lua/modules/graphics/je_lua_graphics.cpp
@@ -482,7 +482,7 @@ namespace JinEngine
             }
             if (luax_istype(L, 1, JIN_GRAPHICS_SHADER))
             {
-                Proxy* proxy = (Proxy*)luax_toudata(L, 1);
+                Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_SHADER);
                 Shared<Shader>& jsl = proxy->getShared<Shader>();
                 jsl->use();
             }
@@ -499,16 +499,6 @@ namespace JinEngine
             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;
-        }
-
         LUA_IMPLEMENT int l_point(lua_State* L)
         {
             int x = luax_checknumber(L, 1);
@@ -531,8 +521,7 @@ namespace JinEngine
 
         LUA_IMPLEMENT int l_rect(lua_State* L)
         {
-            const char* modestr = luax_checkstring(L, 1);
-            RenderMode mode = strtomode(modestr);
+            RenderMode mode = static_cast<RenderMode>(luax_checkinteger(L, 1));
             if (mode != RenderMode::NONE)
             {
                 int x = luax_checknumber(L, 2);
@@ -552,8 +541,7 @@ namespace JinEngine
 
         LUA_IMPLEMENT int l_circle(lua_State* L)
         {
-            const char* modestr = luax_checkstring(L, 1);
-            RenderMode mode = strtomode(modestr);
+            RenderMode mode = static_cast<RenderMode>(luax_checkinteger(L, 1));
             if (mode != RenderMode::NONE)
             {
                 int x = luax_checknumber(L, 2);
@@ -572,8 +560,7 @@ namespace JinEngine
 
         LUA_IMPLEMENT int l_triangle(lua_State* L)
         {
-            const char* modestr = luax_checkstring(L, 1);
-            RenderMode mode = strtomode(modestr);
+            RenderMode mode = static_cast<RenderMode>(luax_checkinteger(L, 1));
             if (mode != RenderMode::NONE)
             {
                 int x = luax_checknumber(L, 2);
@@ -598,9 +585,8 @@ namespace JinEngine
     
         LUA_IMPLEMENT int l_polygon(lua_State* L)
         {
-            const char* modestr = luax_checkstring(L, 1);
+            RenderMode mode = static_cast<RenderMode>(luax_checkinteger(L, 1));
             int n = luax_checknumber(L, 2); 
-            RenderMode mode = strtomode(modestr); 
             if (mode != RenderMode::NONE)
             {
                 if (!luax_istable(L, 3))
-- 
cgit v1.1-26-g67d0