aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lua/common/je_lua_error.h4
-rw-r--r--src/lua/modules/audio/je_lua_audio.cpp6
-rw-r--r--src/lua/modules/audio/je_lua_source.cpp4
-rw-r--r--src/lua/modules/core/je_lua_core.cpp4
-rw-r--r--src/lua/modules/graphics/je_lua_canvas.cpp4
-rw-r--r--src/lua/modules/graphics/je_lua_text.cpp4
-rw-r--r--src/lua/modules/graphics/je_lua_texture.cpp4
-rw-r--r--src/lua/modules/graphics/je_lua_texture_font.cpp4
-rw-r--r--src/lua/modules/mouse/je_lua_mouse.cpp4
-rw-r--r--src/lua/modules/net/je_lua_buffer.cpp2
-rw-r--r--src/lua/modules/net/je_lua_socket.cpp6
-rw-r--r--src/lua/modules/thread/je_lua_thread.cpp22
-rw-r--r--src/lua/modules/thread/je_lua_thread.h161
-rw-r--r--src/lua/modules/time/je_lua_time.cpp4
14 files changed, 113 insertions, 120 deletions
diff --git a/src/lua/common/je_lua_error.h b/src/lua/common/je_lua_error.h
index fd21b41..500994f 100644
--- a/src/lua/common/je_lua_error.h
+++ b/src/lua/common/je_lua_error.h
@@ -21,7 +21,7 @@ namespace JinEngine
luax_setfieldstring(L, "error", err);
}
- }
-}
+ } // namespace Lua
+} // namespace JinEngine
#endif \ No newline at end of file
diff --git a/src/lua/modules/audio/je_lua_audio.cpp b/src/lua/modules/audio/je_lua_audio.cpp
index 96b7f92..c021ef1 100644
--- a/src/lua/modules/audio/je_lua_audio.cpp
+++ b/src/lua/modules/audio/je_lua_audio.cpp
@@ -3,14 +3,14 @@
#include "lua/common/je_lua_common.h"
#include "libjin/jin.h"
+using namespace JinEngine::Audio;
+using namespace JinEngine::Filesystem;
+
namespace JinEngine
{
namespace Lua
{
- using namespace JinEngine::Audio;
- using namespace JinEngine::Filesystem;
-
typedef SDLAudio Audio;
typedef SDLSource Source;
diff --git a/src/lua/modules/audio/je_lua_source.cpp b/src/lua/modules/audio/je_lua_source.cpp
index afb6cfe..d75d942 100644
--- a/src/lua/modules/audio/je_lua_source.cpp
+++ b/src/lua/modules/audio/je_lua_source.cpp
@@ -3,13 +3,13 @@
#include "lua/common/je_lua_common.h"
#include "lua/modules/types.h"
+using namespace JinEngine::Audio;
+
namespace JinEngine
{
namespace Lua
{
- using namespace JinEngine::Audio;
-
typedef Ref<Source>& SourceRef;
LUA_IMPLEMENT inline SourceRef checkSource(lua_State* L)
diff --git a/src/lua/modules/core/je_lua_core.cpp b/src/lua/modules/core/je_lua_core.cpp
index 0e4cdbb..30d55a9 100644
--- a/src/lua/modules/core/je_lua_core.cpp
+++ b/src/lua/modules/core/je_lua_core.cpp
@@ -2,13 +2,13 @@
#include "lua/modules/luax.h"
#include "libjin/jin.h"
+using namespace JinEngine::Game;
+
namespace JinEngine
{
namespace Lua
{
- using namespace JinEngine::Game;
-
LUA_IMPLEMENT int l_running(lua_State* L)
{
static Application* app = Application::get();
diff --git a/src/lua/modules/graphics/je_lua_canvas.cpp b/src/lua/modules/graphics/je_lua_canvas.cpp
index 9461c03..f6834b1 100644
--- a/src/lua/modules/graphics/je_lua_canvas.cpp
+++ b/src/lua/modules/graphics/je_lua_canvas.cpp
@@ -3,13 +3,13 @@
#include "lua/common/je_lua_common.h"
#include "libjin/jin.h"
+using namespace JinEngine::Graphics;
+
namespace JinEngine
{
namespace Lua
{
- using namespace JinEngine::Graphics;
-
typedef Ref<Canvas>& CanvasRef;
LUA_IMPLEMENT inline CanvasRef checkCanvas(lua_State* L)
diff --git a/src/lua/modules/graphics/je_lua_text.cpp b/src/lua/modules/graphics/je_lua_text.cpp
index 34b0d77..60ab28c 100644
--- a/src/lua/modules/graphics/je_lua_text.cpp
+++ b/src/lua/modules/graphics/je_lua_text.cpp
@@ -3,13 +3,13 @@
#include "lua/common/je_lua_common.h"
#include "libjin/jin.h"
+using namespace JinEngine::Graphics;
+
namespace JinEngine
{
namespace Lua
{
- using namespace JinEngine::Graphics;
-
LUA_IMPLEMENT int l_gc(lua_State* L)
{
Proxy* p = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_TEXT);
diff --git a/src/lua/modules/graphics/je_lua_texture.cpp b/src/lua/modules/graphics/je_lua_texture.cpp
index 04d8f34..b9c58db 100644
--- a/src/lua/modules/graphics/je_lua_texture.cpp
+++ b/src/lua/modules/graphics/je_lua_texture.cpp
@@ -3,13 +3,13 @@
#include "lua/common/je_lua_common.h"
#include "libjin/jin.h"
+using namespace JinEngine::Graphics;
+
namespace JinEngine
{
namespace Lua
{
- using namespace JinEngine::Graphics;
-
typedef Ref<Texture>& TextureRef;
LUA_IMPLEMENT inline TextureRef checkTexture(lua_State* L)
diff --git a/src/lua/modules/graphics/je_lua_texture_font.cpp b/src/lua/modules/graphics/je_lua_texture_font.cpp
index c3b9f64..cee1c67 100644
--- a/src/lua/modules/graphics/je_lua_texture_font.cpp
+++ b/src/lua/modules/graphics/je_lua_texture_font.cpp
@@ -3,13 +3,13 @@
#include "lua/common/je_lua_common.h"
#include "libjin/jin.h"
+using namespace JinEngine::Graphics;
+
namespace JinEngine
{
namespace Lua
{
- using namespace JinEngine::Graphics;
-
LUA_IMPLEMENT int l_gc(lua_State* L)
{
Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_TEXTUREFONT);
diff --git a/src/lua/modules/mouse/je_lua_mouse.cpp b/src/lua/modules/mouse/je_lua_mouse.cpp
index 5802c72..88638d2 100644
--- a/src/lua/modules/mouse/je_lua_mouse.cpp
+++ b/src/lua/modules/mouse/je_lua_mouse.cpp
@@ -2,13 +2,13 @@
#include "lua/modules/luax.h"
#include "libjin/jin.h"
+using namespace JinEngine::Input;
+
namespace JinEngine
{
namespace Lua
{
- using namespace JinEngine::Input;
-
LUA_IMPLEMENT int l_pos(lua_State* L)
{
static Mouse* mouse = Mouse::get();
diff --git a/src/lua/modules/net/je_lua_buffer.cpp b/src/lua/modules/net/je_lua_buffer.cpp
index fd73364..9e769e8 100644
--- a/src/lua/modules/net/je_lua_buffer.cpp
+++ b/src/lua/modules/net/je_lua_buffer.cpp
@@ -11,8 +11,6 @@ namespace JinEngine
namespace Net
{
- using namespace JinEngine;
-
typedef Ref<Buffer>& BufferRef;
static inline BufferRef checkNetBuffer(lua_State* L)
diff --git a/src/lua/modules/net/je_lua_socket.cpp b/src/lua/modules/net/je_lua_socket.cpp
index 512bde3..d68cb51 100644
--- a/src/lua/modules/net/je_lua_socket.cpp
+++ b/src/lua/modules/net/je_lua_socket.cpp
@@ -4,14 +4,14 @@
#include "libjin/jin.h"
#include "je_lua_buffer.h"
+using namespace JinEngine::Net;
+using namespace JinEngine::Lua::Net;
+
namespace JinEngine
{
namespace Lua
{
- using namespace JinEngine::Net;
- using namespace Lua::Net;
-
typedef Ref<Socket>& SocketRef;
const int BUFFER_SIZE = 1024;
diff --git a/src/lua/modules/thread/je_lua_thread.cpp b/src/lua/modules/thread/je_lua_thread.cpp
index 9c2cb35..5babc13 100644
--- a/src/lua/modules/thread/je_lua_thread.cpp
+++ b/src/lua/modules/thread/je_lua_thread.cpp
@@ -10,8 +10,6 @@ namespace JinEngine
namespace Lua
{
- using thread::Thread;
-
typedef Ref<Thread>& ThreadRef;
int luaopen_thread(lua_State* L);
@@ -109,23 +107,23 @@ namespace JinEngine
Thread::Variant v = ref->fetch(slot);
switch (v.type)
{
- case thread::Thread::Variant::INTERGER:
+ case Thread::Variant::INTERGER:
luax_pushinteger(L, v.integer);
break;
- case thread::Thread::Variant::BOOLEAN:
+ case Thread::Variant::BOOLEAN:
luax_pushboolean(L, v.boolean);
break;
- case thread::Thread::Variant::CSTRING:
+ case Thread::Variant::CSTRING:
luax_pushstring(L, v.cstring);
break;
- case thread::Thread::Variant::REAL:
+ case Thread::Variant::REAL:
luax_pushnumber(L, v.real);
break;
- case thread::Thread::Variant::POINTER:
+ case Thread::Variant::POINTER:
Proxy* p = (Proxy*)v.pointer;
Proxy* proxy = (Proxy*)luax_newinstance(L, p->getObjectType(), sizeof(Proxy));
p->reference->retain();
@@ -143,23 +141,23 @@ namespace JinEngine
Thread::Variant v = ref->demand(slot);
switch (v.type)
{
- case thread::Thread::Variant::INTERGER:
+ case Thread::Variant::INTERGER:
luax_pushinteger(L, v.integer);
break;
- case thread::Thread::Variant::BOOLEAN:
+ case Thread::Variant::BOOLEAN:
luax_pushboolean(L, v.boolean);
break;
- case thread::Thread::Variant::CSTRING:
+ case Thread::Variant::CSTRING:
luax_pushstring(L, v.cstring);
break;
- case thread::Thread::Variant::REAL:
+ case Thread::Variant::REAL:
luax_pushnumber(L, v.real);
break;
- case thread::Thread::Variant::POINTER:
+ case Thread::Variant::POINTER:
Proxy* p = (Proxy*)v.pointer;
const char* objType = p->getObjectType();
Proxy* proxy = (Proxy*)luax_newinstance(L, objType, sizeof(Proxy));
diff --git a/src/lua/modules/thread/je_lua_thread.h b/src/lua/modules/thread/je_lua_thread.h
index de9a8a8..ffe99d0 100644
--- a/src/lua/modules/thread/je_lua_thread.h
+++ b/src/lua/modules/thread/je_lua_thread.h
@@ -5,90 +5,87 @@ namespace JinEngine
{
namespace Lua
{
- namespace thread
+
+ class Thread
{
+ public:
+ typedef JinEngine::MultiThread::Thread::Variant Variant;
+ typedef JinEngine::MultiThread::Thread::ThreadRunner ThreadRunner;
+
+ Thread(std::string _name, std::string _code, ThreadRunner runner)
+ : name(_name)
+ , code(_code)
+ {
+ thread = new JinEngine::MultiThread::Thread(_name, runner);
+ }
+
+ ~Thread()
+ {
+ delete thread;
+ }
+
+ bool start(void* p)
+ {
+ return thread->start(p);
+ }
+
+ void wait()
+ {
+ thread->wait();
+ }
+
+ void send(int slot, const Variant& value)
+ {
+ thread->send(slot, value);
+ }
+
+ bool receive(int slot)
+ {
+ return thread->receive(slot);
+ }
+
+ Variant fetch(int slot)
+ {
+ return thread->fetch(slot);
+ }
- class Thread
+ Variant demand(int slot)
{
- public:
- typedef JinEngine::MultiThread::Thread::Variant Variant;
- typedef JinEngine::MultiThread::Thread::ThreadRunner ThreadRunner;
-
- Thread(std::string _name, std::string _code, ThreadRunner runner)
- : name(_name)
- , code(_code)
- {
- thread = new JinEngine::MultiThread::Thread(_name, runner);
- }
-
- ~Thread()
- {
- delete thread;
- }
-
- bool start(void* p)
- {
- return thread->start(p);
- }
-
- void wait()
- {
- thread->wait();
- }
-
- void send(int slot, const Variant& value)
- {
- thread->send(slot, value);
- }
-
- bool receive(int slot)
- {
- return thread->receive(slot);
- }
-
- Variant fetch(int slot)
- {
- return thread->fetch(slot);
- }
-
- Variant demand(int slot)
- {
- return thread->demand(slot);
- }
-
- void remove(int slot)
- {
- thread->remove(slot);
- }
-
- const char* getName()
- {
- return name.c_str();
- }
-
- bool isRunning()
- {
- return thread->isRunning();
- }
-
- void lock()
- {
- thread->lock();
- }
-
- void unlock()
- {
- thread->unlock();
- }
-
- const std::string name;
- const std::string code;
-
- private:
- JinEngine::MultiThread::Thread* thread;
-
- };
-
- } // thread
+ return thread->demand(slot);
+ }
+
+ void remove(int slot)
+ {
+ thread->remove(slot);
+ }
+
+ const char* getName()
+ {
+ return name.c_str();
+ }
+
+ bool isRunning()
+ {
+ return thread->isRunning();
+ }
+
+ void lock()
+ {
+ thread->lock();
+ }
+
+ void unlock()
+ {
+ thread->unlock();
+ }
+
+ const std::string name;
+ const std::string code;
+
+ private:
+ JinEngine::MultiThread::Thread* thread;
+
+ };
+
} // namespace Lua
} // namespace JinEngine \ No newline at end of file
diff --git a/src/lua/modules/time/je_lua_time.cpp b/src/lua/modules/time/je_lua_time.cpp
index aeda9c6..c9f3563 100644
--- a/src/lua/modules/time/je_lua_time.cpp
+++ b/src/lua/modules/time/je_lua_time.cpp
@@ -3,13 +3,13 @@
#include "lua/modules/luax.h"
#include "libjin/jin.h"
+using namespace JinEngine::Time;
+
namespace JinEngine
{
namespace Lua
{
- using namespace JinEngine::Time;
-
LUA_IMPLEMENT int l_sec(lua_State* L)
{
luax_pushnumber(L, getSecond());
generated by cgit v1.1-26-g67d0 at 2025-05-20 19:23:02 +0000