aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lua/modules/audio/audio.cpp (renamed from src/lua/modules/audio/luaopen_audio.cpp)0
-rw-r--r--src/lua/modules/audio/source.cpp (renamed from src/lua/modules/audio/luaopen_Source.cpp)0
-rw-r--r--src/lua/modules/bit/bit.cpp (renamed from src/lua/modules/bit/luaopen_bit.cpp)0
-rw-r--r--src/lua/modules/core/core.cpp (renamed from src/lua/modules/core/luaopen_core.cpp)0
-rw-r--r--src/lua/modules/embed/boot.lua.h21
-rw-r--r--src/lua/modules/event/event.cpp (renamed from src/lua/modules/event/luaopen_event.cpp)0
-rw-r--r--src/lua/modules/filesystem/filesystem.cpp (renamed from src/lua/modules/filesystem/luaopen_filesystem.cpp)0
-rw-r--r--src/lua/modules/graphics/canvas.cpp (renamed from src/lua/modules/graphics/luaopen_Canvas.cpp)0
-rw-r--r--src/lua/modules/graphics/font.cpp (renamed from src/lua/modules/graphics/luaopen_Font.cpp)0
-rw-r--r--src/lua/modules/graphics/graphics.cpp (renamed from src/lua/modules/graphics/luaopen_graphics.cpp)0
-rw-r--r--src/lua/modules/graphics/image.cpp (renamed from src/lua/modules/graphics/luaopen_Image.cpp)0
-rw-r--r--src/lua/modules/graphics/jsl.cpp (renamed from src/lua/modules/graphics/luaopen_JSL.cpp)0
-rw-r--r--src/lua/modules/jin.cpp (renamed from src/lua/modules/luaopen_jin.cpp)2
-rw-r--r--src/lua/modules/jin.h (renamed from src/lua/modules/luaopen_jin.h)0
-rw-r--r--src/lua/modules/joypad/joypad.cpp (renamed from src/lua/modules/joypad/luaopen_joypad.cpp)0
-rw-r--r--src/lua/modules/keyboard/keyboard.cpp (renamed from src/lua/modules/keyboard/luaopen_keyboard.cpp)0
-rw-r--r--src/lua/modules/math/math.cpp (renamed from src/lua/modules/math/luaopen_math.cpp)0
-rw-r--r--src/lua/modules/mouse/mouse.cpp (renamed from src/lua/modules/mouse/luaopen_mouse.cpp)0
-rw-r--r--src/lua/modules/net/Buffer.cpp (renamed from src/lua/modules/net/luaopen_Buffer.cpp)0
-rw-r--r--src/lua/modules/net/net.cpp (renamed from src/lua/modules/net/luaopen_net.cpp)0
-rw-r--r--src/lua/modules/net/socket.cpp (renamed from src/lua/modules/net/luaopen_Socket.cpp)0
-rw-r--r--src/lua/modules/thread/Thread.cpp243
-rw-r--r--src/lua/modules/thread/luaopen_thread.cpp249
-rw-r--r--src/lua/modules/time/time.cpp (renamed from src/lua/modules/time/luaopen_time.cpp)0
-rw-r--r--src/main.cpp2
25 files changed, 250 insertions, 267 deletions
diff --git a/src/lua/modules/audio/luaopen_audio.cpp b/src/lua/modules/audio/audio.cpp
index 8e11b88..8e11b88 100644
--- a/src/lua/modules/audio/luaopen_audio.cpp
+++ b/src/lua/modules/audio/audio.cpp
diff --git a/src/lua/modules/audio/luaopen_Source.cpp b/src/lua/modules/audio/source.cpp
index 1953121..1953121 100644
--- a/src/lua/modules/audio/luaopen_Source.cpp
+++ b/src/lua/modules/audio/source.cpp
diff --git a/src/lua/modules/bit/luaopen_bit.cpp b/src/lua/modules/bit/bit.cpp
index 5b18125..5b18125 100644
--- a/src/lua/modules/bit/luaopen_bit.cpp
+++ b/src/lua/modules/bit/bit.cpp
diff --git a/src/lua/modules/core/luaopen_core.cpp b/src/lua/modules/core/core.cpp
index 0243554..0243554 100644
--- a/src/lua/modules/core/luaopen_core.cpp
+++ b/src/lua/modules/core/core.cpp
diff --git a/src/lua/modules/embed/boot.lua.h b/src/lua/modules/embed/boot.lua.h
index 5ce20a7..d84ca21 100644
--- a/src/lua/modules/embed/boot.lua.h
+++ b/src/lua/modules/embed/boot.lua.h
@@ -8,24 +8,22 @@ jin.filesystem.mount(jin._argv[2])
-- Config game
-------------------------------------------------------------------------
-jin.conf = {}
+jin.config = {}
if jin.filesystem.exist("config.lua") then
- jin.conf = require "config"
+ jin.config = require "config"
end
-jin.conf.width = jin.conf.width or 576
-jin.conf.height = jin.conf.height or 448
-jin.conf.FPS = jin.conf.FPS or 60
-jin.conf.vsync = jin.conf.vsync or false
-jin.conf.title = jin.conf.title or ("jin v" .. jin.version())
-jin.conf.resizable = jin.conf.resizable or false
-jin.conf.fullscreen = jin.conf.fullscreen or false
-jin.conf.lockFPS = jin.conf.lockFPS or false
+jin.config.width = jin.config.width or 576
+jin.config.height = jin.config.height or 448
+jin.config.vsync = jin.config.vsync or false
+jin.config.title = jin.config.title or ("jin v" .. jin.version())
+jin.config.resizable = jin.config.resizable or false
+jin.config.fullscreen = jin.config.fullscreen or false
-------------------------------------------------------------------------
-- Initialize sub systems
-------------------------------------------------------------------------
-jin.graphics.init(jin.conf)
+jin.graphics.init(jin.config)
jin.audio.init()
-------------------------------------------------------------------------
@@ -53,7 +51,6 @@ function jin.core.run()
local dt = 0
local previous = jin.time.second()
local current = previous
- -- TODO: д¼¼ӦøƵʵ
while jin.core.running() do
for _, e in pairs(jin.event.poll()) do
if e.type == "keydown" then
diff --git a/src/lua/modules/event/luaopen_event.cpp b/src/lua/modules/event/event.cpp
index af9f8fc..af9f8fc 100644
--- a/src/lua/modules/event/luaopen_event.cpp
+++ b/src/lua/modules/event/event.cpp
diff --git a/src/lua/modules/filesystem/luaopen_filesystem.cpp b/src/lua/modules/filesystem/filesystem.cpp
index 55f4c06..55f4c06 100644
--- a/src/lua/modules/filesystem/luaopen_filesystem.cpp
+++ b/src/lua/modules/filesystem/filesystem.cpp
diff --git a/src/lua/modules/graphics/luaopen_Canvas.cpp b/src/lua/modules/graphics/canvas.cpp
index f42dfba..f42dfba 100644
--- a/src/lua/modules/graphics/luaopen_Canvas.cpp
+++ b/src/lua/modules/graphics/canvas.cpp
diff --git a/src/lua/modules/graphics/luaopen_Font.cpp b/src/lua/modules/graphics/font.cpp
index 926f2cc..926f2cc 100644
--- a/src/lua/modules/graphics/luaopen_Font.cpp
+++ b/src/lua/modules/graphics/font.cpp
diff --git a/src/lua/modules/graphics/luaopen_graphics.cpp b/src/lua/modules/graphics/graphics.cpp
index 9c1d404..9c1d404 100644
--- a/src/lua/modules/graphics/luaopen_graphics.cpp
+++ b/src/lua/modules/graphics/graphics.cpp
diff --git a/src/lua/modules/graphics/luaopen_Image.cpp b/src/lua/modules/graphics/image.cpp
index 5824660..5824660 100644
--- a/src/lua/modules/graphics/luaopen_Image.cpp
+++ b/src/lua/modules/graphics/image.cpp
diff --git a/src/lua/modules/graphics/luaopen_JSL.cpp b/src/lua/modules/graphics/jsl.cpp
index ccd9ebd..ccd9ebd 100644
--- a/src/lua/modules/graphics/luaopen_JSL.cpp
+++ b/src/lua/modules/graphics/jsl.cpp
diff --git a/src/lua/modules/luaopen_jin.cpp b/src/lua/modules/jin.cpp
index dbbac31..a25ec6c 100644
--- a/src/lua/modules/luaopen_jin.cpp
+++ b/src/lua/modules/jin.cpp
@@ -1,4 +1,4 @@
-#include "luaopen_jin.h"
+#include "jin.h"
#include "lua/modules/luax.h"
#include "embed/embed.h"
diff --git a/src/lua/modules/luaopen_jin.h b/src/lua/modules/jin.h
index 07531b2..07531b2 100644
--- a/src/lua/modules/luaopen_jin.h
+++ b/src/lua/modules/jin.h
diff --git a/src/lua/modules/joypad/luaopen_joypad.cpp b/src/lua/modules/joypad/joypad.cpp
index d305878..d305878 100644
--- a/src/lua/modules/joypad/luaopen_joypad.cpp
+++ b/src/lua/modules/joypad/joypad.cpp
diff --git a/src/lua/modules/keyboard/luaopen_keyboard.cpp b/src/lua/modules/keyboard/keyboard.cpp
index 9d27a4f..9d27a4f 100644
--- a/src/lua/modules/keyboard/luaopen_keyboard.cpp
+++ b/src/lua/modules/keyboard/keyboard.cpp
diff --git a/src/lua/modules/math/luaopen_math.cpp b/src/lua/modules/math/math.cpp
index fa59e04..fa59e04 100644
--- a/src/lua/modules/math/luaopen_math.cpp
+++ b/src/lua/modules/math/math.cpp
diff --git a/src/lua/modules/mouse/luaopen_mouse.cpp b/src/lua/modules/mouse/mouse.cpp
index f907abb..f907abb 100644
--- a/src/lua/modules/mouse/luaopen_mouse.cpp
+++ b/src/lua/modules/mouse/mouse.cpp
diff --git a/src/lua/modules/net/luaopen_Buffer.cpp b/src/lua/modules/net/Buffer.cpp
index 3354518..3354518 100644
--- a/src/lua/modules/net/luaopen_Buffer.cpp
+++ b/src/lua/modules/net/Buffer.cpp
diff --git a/src/lua/modules/net/luaopen_net.cpp b/src/lua/modules/net/net.cpp
index a984920..a984920 100644
--- a/src/lua/modules/net/luaopen_net.cpp
+++ b/src/lua/modules/net/net.cpp
diff --git a/src/lua/modules/net/luaopen_Socket.cpp b/src/lua/modules/net/socket.cpp
index 6d3fdfb..6d3fdfb 100644
--- a/src/lua/modules/net/luaopen_Socket.cpp
+++ b/src/lua/modules/net/socket.cpp
diff --git a/src/lua/modules/thread/Thread.cpp b/src/lua/modules/thread/Thread.cpp
index 8df3255..5c9cb1f 100644
--- a/src/lua/modules/thread/Thread.cpp
+++ b/src/lua/modules/thread/Thread.cpp
@@ -1,14 +1,249 @@
-#include "Thread.h"
+#include "lua/modules/luax.h"
+#include "lua/modules/types.h"
+#include "libjin/jin.h"
+#include "lua/modules/jin.h"
+#include "lua/common/common.h"
+#include "thread.h"
namespace jin
{
namespace lua
{
-namespace thread
-{
+ using thread::Thread;
+
+ int luaopen_thread(lua_State* L);
+
+ static inline Ref<Thread>& checkThread(lua_State* L)
+ {
+ Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_THREAD_THREAD);
+ return proxy->getRef<Thread>();
+ }
+
+ static int threadRunner(void* t)
+ {
+ Ref<Thread>& ref = *(Ref<Thread>*)t;
+ lua_State* L = lua_open();
+ luax_openlibs(L);
+ luaopen_jin(L);
+ luax_getglobal(L, MODULE_NAME);
+ Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_THREAD_THREAD, sizeof(Proxy));
+ ref.retain();
+ proxy->bind(&ref);
+ luax_setfield(L, -2, "_curThread");
+ luax_dostring(L, ref->code.c_str());
+ luax_close(L);
+ return 0;
+ }
+
+ static int l_thread_gc(lua_State* L)
+ {
+ Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_THREAD_THREAD);
+ proxy->release();
+ return 0;
+ }
+
+ static int l_start(lua_State* L)
+ {
+ Ref<Thread>& ref = checkThread(L);
+ bool result = ref->start(&ref);
+ luax_pushboolean(L, result);
+ return 1;
+ }
+
+ static int l_wait(lua_State* L)
+ {
+ Ref<Thread>& ref = checkThread(L);
+ ref->wait();
+ return 0;
+ }
+
+ static int l_send(lua_State* L)
+ {
+ Ref<Thread>& ref = checkThread(L);
+ int slot = luax_checkinteger(L, 2);
+ const int vp = 3;
+ if (luax_isnumberstrict(L, vp))
+ {
+ float real = luax_checknumber(L, vp);
+ ref->send(slot, real);
+ }
+ else if (luax_isbooleanstrict(L, vp))
+ {
+ bool bol = luax_checkbool(L, vp);
+ ref->send(slot, bol);
+ }
+ else if (luax_isstringstrict(L, vp))
+ {
+ const char* str = luax_checkstring(L, vp);
+ ref->send(slot, str);
+ }
+ else if (luax_isuserdata(L, vp))
+ {
+ void* p = luax_touserdata(L, vp);
+ ref->send(slot, p);
+ }
+ else if (luax_islightuserdata(L, vp))
+ {
+ void* p = luax_tolightuserdata(L, vp);
+ ref->send(slot, p);
+ }
+ return 0;
+ }
+
+ static int l_receive(lua_State* L)
+ {
+ Ref<Thread>& ref = checkThread(L);
+ int slot = luax_checkinteger(L, 2);
+ bool result = ref->receive(slot);
+ luax_pushboolean(L, result);
+ return 1;
+ }
+
+ static int l_fetch(lua_State* L)
+ {
+ Ref<Thread>& ref = checkThread(L);
+ int slot = luax_checkinteger(L, 2);
+ Thread::Variant v = ref->fetch(slot);
+ switch (v.type)
+ {
+ case thread::Thread::Variant::INTERGER:
+ luax_pushinteger(L, v.integer);
+ break;
+
+ case thread::Thread::Variant::BOOLEAN:
+ luax_pushboolean(L, v.boolean);
+ break;
+
+ case thread::Thread::Variant::CSTRING:
+ luax_pushstring(L, v.cstring);
+ break;
+
+ case thread::Thread::Variant::REAL:
+ luax_pushnumber(L, v.real);
+ break;
+
+ case thread::Thread::Variant::POINTER:
+ Proxy* p = (Proxy*)v.pointer;
+ Proxy* proxy = (Proxy*)luax_newinstance(L, p->getObjectType(), sizeof(Proxy));
+ p->reference->retain();
+ proxy->bind(p->reference);
+ break;
+
+ }
+ return 1;
+ }
+
+ static int l_demand(lua_State* L)
+ {
+ Ref<Thread>& ref = checkThread(L);
+ int slot = luax_checkinteger(L, 2);
+ Thread::Variant v = ref->demand(slot);
+ switch (v.type)
+ {
+ case thread::Thread::Variant::INTERGER:
+ luax_pushinteger(L, v.integer);
+ break;
+
+ case thread::Thread::Variant::BOOLEAN:
+ luax_pushboolean(L, v.boolean);
+ break;
+
+ case thread::Thread::Variant::CSTRING:
+ luax_pushstring(L, v.cstring);
+ break;
+
+ case thread::Thread::Variant::REAL:
+ luax_pushnumber(L, v.real);
+ break;
+
+ case thread::Thread::Variant::POINTER:
+ Proxy* p = (Proxy*)v.pointer;
+ Proxy* proxy = (Proxy*)luax_newinstance(L, p->getObjectType(), sizeof(Proxy));
+ p->reference->retain();
+ proxy->bind(p->reference);
+ break;
+
+ }
+ return 1;
+ }
+
+ static int l_remove(lua_State* L)
+ {
+ Ref<Thread>& ref = checkThread(L);
+ int slot = luax_checkinteger(L, 2);
+ ref->remove(slot);
+ return 0;
+ }
+
+ static int l_getName(lua_State* L)
+ {
+ Ref<Thread>& ref = checkThread(L);
+ const char* name = ref->getName();
+ luax_pushstring(L, name);
+ return 1;
+ }
+
+ static int l_isRunning(lua_State* L)
+ {
+ Ref<Thread>& ref = checkThread(L);
+ bool running = ref->isRunning();
+ luax_pushboolean(L, running);
+ return 1;
+ }
+
+ static const luaL_Reg thread_function[] = {
+ { "__gc", l_thread_gc },
+ { "start", l_start },
+ { "wait", l_wait },
+ { "send", l_send },
+ { "receive", l_receive },
+ { "fetch", l_fetch },
+ { "demand", l_demand },
+ { "remove", l_remove },
+ { "getName", l_getName },
+ { "isRunning", l_isRunning },
+ { 0, 0 }
+ };
+
+ static int luaopen_Thread(lua_State* L)
+ {
+ luax_newtype(L, JIN_THREAD_THREAD, thread_function);
+
+ return 0;
+ }
+
+ static int l_newThread(lua_State* L)
+ {
+ const char* name = luax_checkstring(L, 1);
+ const char* code = luax_checkstring(L, 2);
+ Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_THREAD_THREAD, sizeof(Proxy));
+ Thread* thread = new Thread(name, code, threadRunner);
+ proxy->bind(new Ref<Thread>(thread, JIN_THREAD_THREAD));
+ return 1;
+ }
+
+ static int l_getThread(lua_State* L)
+ {
+ luax_getglobal(L, MODULE_NAME);
+ luax_getfield(L, -1, "_curThread");
+ return 1;
+ }
+
+ static const luaL_Reg f[] = {
+ { "newThread", l_newThread },
+ { "getThread", l_getThread },
+ { 0, 0 }
+ };
+
+ int luaopen_thread(lua_State* L)
+ {
+ luaopen_Thread(L);
+
+ luax_newlib(L, f);
+ return 1;
+ }
-} // thread
} // lua
} // jin \ No newline at end of file
diff --git a/src/lua/modules/thread/luaopen_thread.cpp b/src/lua/modules/thread/luaopen_thread.cpp
deleted file mode 100644
index d581f54..0000000
--- a/src/lua/modules/thread/luaopen_thread.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-#include "lua/modules/luax.h"
-#include "lua/modules/types.h"
-#include "libjin/jin.h"
-#include "lua/modules/luaopen_jin.h"
-#include "lua/common/common.h"
-#include "Thread.h"
-
-namespace jin
-{
-namespace lua
-{
-
- using thread::Thread;
-
- int luaopen_thread(lua_State* L);
-
- static inline Ref<Thread>& checkThread(lua_State* L)
- {
- Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_THREAD_THREAD);
- return proxy->getRef<Thread>();
- }
-
- static int threadRunner(void* t)
- {
- Ref<Thread>& ref = *(Ref<Thread>*)t;
- lua_State* L = lua_open();
- luax_openlibs(L);
- luaopen_jin(L);
- luax_getglobal(L, MODULE_NAME);
- Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_THREAD_THREAD, sizeof(Proxy));
- ref.retain();
- proxy->bind(&ref);
- luax_setfield(L, -2, "_curThread");
- luax_dostring(L, ref->code.c_str());
- luax_close(L);
- return 0;
- }
-
- static int l_thread_gc(lua_State* L)
- {
- Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_THREAD_THREAD);
- proxy->release();
- return 0;
- }
-
- static int l_start(lua_State* L)
- {
- Ref<Thread>& ref = checkThread(L);
- bool result = ref->start(&ref);
- luax_pushboolean(L, result);
- return 1;
- }
-
- static int l_wait(lua_State* L)
- {
- Ref<Thread>& ref = checkThread(L);
- ref->wait();
- return 0;
- }
-
- static int l_send(lua_State* L)
- {
- Ref<Thread>& ref = checkThread(L);
- int slot = luax_checkinteger(L, 2);
- const int vp = 3;
- if (luax_isnumberstrict(L, vp))
- {
- float real = luax_checknumber(L, vp);
- ref->send(slot, real);
- }
- else if (luax_isbooleanstrict(L, vp))
- {
- bool bol = luax_checkbool(L, vp);
- ref->send(slot, bol);
- }
- else if (luax_isstringstrict(L, vp))
- {
- const char* str = luax_checkstring(L, vp);
- ref->send(slot, str);
- }
- else if (luax_isuserdata(L, vp))
- {
- void* p = luax_touserdata(L, vp);
- ref->send(slot, p);
- }
- else if (luax_islightuserdata(L, vp))
- {
- void* p = luax_tolightuserdata(L, vp);
- ref->send(slot, p);
- }
- return 0;
- }
-
- static int l_receive(lua_State* L)
- {
- Ref<Thread>& ref = checkThread(L);
- int slot = luax_checkinteger(L, 2);
- bool result = ref->receive(slot);
- luax_pushboolean(L, result);
- return 1;
- }
-
- static int l_fetch(lua_State* L)
- {
- Ref<Thread>& ref = checkThread(L);
- int slot = luax_checkinteger(L, 2);
- Thread::Variant v = ref->fetch(slot);
- switch (v.type)
- {
- case thread::Thread::Variant::INTERGER:
- luax_pushinteger(L, v.integer);
- break;
-
- case thread::Thread::Variant::BOOLEAN:
- luax_pushboolean(L, v.boolean);
- break;
-
- case thread::Thread::Variant::CSTRING:
- luax_pushstring(L, v.cstring);
- break;
-
- case thread::Thread::Variant::REAL:
- luax_pushnumber(L, v.real);
- break;
-
- case thread::Thread::Variant::POINTER:
- Proxy* p = (Proxy*)v.pointer;
- Proxy* proxy = (Proxy*)luax_newinstance(L, p->getObjectType(), sizeof(Proxy));
- p->reference->retain();
- proxy->bind(p->reference);
- break;
-
- }
- return 1;
- }
-
- static int l_demand(lua_State* L)
- {
- Ref<Thread>& ref = checkThread(L);
- int slot = luax_checkinteger(L, 2);
- Thread::Variant v = ref->demand(slot);
- switch (v.type)
- {
- case thread::Thread::Variant::INTERGER:
- luax_pushinteger(L, v.integer);
- break;
-
- case thread::Thread::Variant::BOOLEAN:
- luax_pushboolean(L, v.boolean);
- break;
-
- case thread::Thread::Variant::CSTRING:
- luax_pushstring(L, v.cstring);
- break;
-
- case thread::Thread::Variant::REAL:
- luax_pushnumber(L, v.real);
- break;
-
- case thread::Thread::Variant::POINTER:
- Proxy* p = (Proxy*)v.pointer;
- Proxy* proxy = (Proxy*)luax_newinstance(L, p->getObjectType(), sizeof(Proxy));
- p->reference->retain();
- proxy->bind(p->reference);
- break;
-
- }
- return 1;
- }
-
- static int l_remove(lua_State* L)
- {
- Ref<Thread>& ref = checkThread(L);
- int slot = luax_checkinteger(L, 2);
- ref->remove(slot);
- return 0;
- }
-
- static int l_getName(lua_State* L)
- {
- Ref<Thread>& ref = checkThread(L);
- const char* name = ref->getName();
- luax_pushstring(L, name);
- return 1;
- }
-
- static int l_isRunning(lua_State* L)
- {
- Ref<Thread>& ref = checkThread(L);
- bool running = ref->isRunning();
- luax_pushboolean(L, running);
- return 1;
- }
-
- static const luaL_Reg thread_function[] = {
- { "__gc", l_thread_gc },
- { "start", l_start },
- { "wait", l_wait },
- { "send", l_send },
- { "receive", l_receive },
- { "fetch", l_fetch },
- { "demand", l_demand },
- { "remove", l_remove },
- { "getName", l_getName },
- { "isRunning", l_isRunning },
- { 0, 0 }
- };
-
- static int luaopen_Thread(lua_State* L)
- {
- luax_newtype(L, JIN_THREAD_THREAD, thread_function);
-
- return 0;
- }
-
- static int l_newThread(lua_State* L)
- {
- const char* name = luax_checkstring(L, 1);
- const char* code = luax_checkstring(L, 2);
- Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_THREAD_THREAD, sizeof(Proxy));
- Thread* thread = new Thread(name, code, threadRunner);
- proxy->bind(new Ref<Thread>(thread, JIN_THREAD_THREAD));
- return 1;
- }
-
- static int l_getThread(lua_State* L)
- {
- luax_getglobal(L, MODULE_NAME);
- luax_getfield(L, -1, "_curThread");
- return 1;
- }
-
- static const luaL_Reg f[] = {
- { "newThread", l_newThread },
- { "getThread", l_getThread },
- { 0, 0 }
- };
-
- int luaopen_thread(lua_State* L)
- {
- luaopen_Thread(L);
-
- luax_newlib(L, f);
-
- return 1;
- }
-
-} // lua
-} // jin \ No newline at end of file
diff --git a/src/lua/modules/time/luaopen_time.cpp b/src/lua/modules/time/time.cpp
index 39743b4..39743b4 100644
--- a/src/lua/modules/time/luaopen_time.cpp
+++ b/src/lua/modules/time/time.cpp
diff --git a/src/main.cpp b/src/main.cpp
index 4137b1e..8bd308b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,7 +4,7 @@
#endif
#include "lua/modules/luax.h"
-#include "lua/modules/luaopen_jin.h"
+#include "lua/modules/jin.h"
#include "libjin/jin.h"
#include <Windows.h>
generated by cgit v1.1-26-g67d0 at 2025-05-20 23:21:29 +0000