*合并master到minimal分支

2 files changed, 11 insertions, 11 deletions

diff --git a/src/lua/modules/mouse/mouse.cpp b/src/lua/modules/mouse/je_lua_mouse.cpp
index 9d45178..9e6824a 100644
--- a/src/lua/modules/mouse/mouse.cpp
+++ b/src/lua/modules/mouse/je_lua_mouse.cpp
@@ -1,14 +1,15 @@
+#include "lua/common/je_lua_common.h"
 #include "lua/modules/luax.h"
 #include "libjin/jin.h"
 
+using namespace JinEngine::Input;
+
 namespace JinEngine
 {
     namespace Lua
     {
 
-        using namespace JinEngine::Input;
-
-        static int l_pos(lua_State* L)
+        LUA_IMPLEMENT int l_pos(lua_State* L)
         {
             static Mouse* mouse = Mouse::get();
             int x, y; 
@@ -18,22 +19,21 @@ namespace JinEngine
             return 2; 
         }
 
-        static int l_setVisible(lua_State* L)
+        LUA_IMPLEMENT int l_setVisible(lua_State* L)
         {
             bool visible = luax_checkbool(L, 1);
             Mouse* mouse = Mouse::get(); 
             mouse->setVisible(visible);
             return 0;
         }
-
-        static const luaL_Reg f[] = {
-            { "position",   l_pos        },
-            { "setVisible", l_setVisible },
-            { 0,            0            }
-        };
     
-        int luaopen_mouse(lua_State* L)
+        LUA_EXPORT int luaopen_mouse(lua_State* L)
         {
+            luaL_Reg f[] = {
+                { "getPosition", l_pos        },
+                { "setVisible",  l_setVisible },
+                { 0,             0            }
+            };
             luax_newlib(L, f);
             return 1;
         }
diff --git a/src/lua/modules/mouse/je_lua_mouse.h b/src/lua/modules/mouse/je_lua_mouse.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/lua/modules/mouse/je_lua_mouse.h