*修改代码结构

1 files changed, 12 insertions, 6 deletions

diff --git a/src/lua/modules/graphics/je_lua_shader.cpp b/src/lua/modules/graphics/je_lua_shader.cpp
index 8c1c2e4..61c8eef 100644
--- a/src/lua/modules/graphics/je_lua_shader.cpp
+++ b/src/lua/modules/graphics/je_lua_shader.cpp
@@ -1,8 +1,12 @@
 #include "lua/modules/luax.h"
-#include "lua/modules/types.h"
+
 #include "lua/common/je_lua_common.h"
 #include "libjin/jin.h"
 
+#include "je_lua_shader.h"
+#include "je_lua_canvas.h"
+#include "je_lua_texture.h"
+
 using namespace JinEngine::Graphics;
 using namespace JinEngine::Graphics::Shaders;
 
@@ -11,11 +15,13 @@ namespace JinEngine
     namespace Lua
     {
 
+        const char* Jin_Lua_Shader = "Shader";
+
         typedef Shared<Shader>& ShaderRef;
 
         static inline ShaderRef checkShader(lua_State* L)
         {
-            Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_SHADER);
+            Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Shader);
             return proxy->getShared<Shader>();
         }
 
@@ -35,7 +41,7 @@ namespace JinEngine
         {
             ShaderRef shared = checkShader(L);
             const char* variable = luax_checkstring(L, 2);
-            Proxy* proxy = (Proxy*)luax_checktype(L, 3, JIN_GRAPHICS_TEXTURE);
+            Proxy* proxy = (Proxy*)luax_checktype(L, 3, Jin_Lua_Texture);
             Shared<Texture>& tex = proxy->getShared<Texture>();
             shared->sendTexture(variable, tex.getObject());
             return 0;
@@ -45,7 +51,7 @@ namespace JinEngine
         {
             ShaderRef shared = checkShader(L);
             const char* variable = luax_checkstring(L, 2);
-            Proxy* proxy = (Proxy*)luax_checktype(L, 3, JIN_GRAPHICS_CANVAS);
+            Proxy* proxy = (Proxy*)luax_checktype(L, 3, Jin_Lua_Canvas);
             Shared<Canvas>& canvas = proxy->getShared<Canvas>();
             shared->sendCanvas(variable, canvas.getObject());
             return 0;
@@ -106,7 +112,7 @@ namespace JinEngine
 
         LUA_IMPLEMENT int l_gc(lua_State* L)
         {
-            Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_SHADER);
+            Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Shader);
             proxy->release();
             return 0;
         }
@@ -124,7 +130,7 @@ namespace JinEngine
                 { "sendColor",   l_sendColor   },
                 { 0,             0             }
             };
-            luax_newtype(L, JIN_GRAPHICS_SHADER, f);
+            luax_newtype(L, Jin_Lua_Shader, f);
             return 0;
         }