aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libjin/Graphics/je_graphics.h14
-rw-r--r--src/libjin/jin.h2
-rw-r--r--src/libjin/threads/je_thread.cpp (renamed from src/libjin/multithread/je_thread.cpp)4
-rw-r--r--src/libjin/threads/je_thread.h (renamed from src/libjin/multithread/je_thread.h)4
-rw-r--r--src/lua/modules/thread/je_lua_thread.h8
5 files changed, 23 insertions, 9 deletions
diff --git a/src/libjin/Graphics/je_graphics.h b/src/libjin/Graphics/je_graphics.h
index 46d2a23..d9e0c0a 100644
--- a/src/libjin/Graphics/je_graphics.h
+++ b/src/libjin/Graphics/je_graphics.h
@@ -19,5 +19,19 @@
#include "particles/je_particle_system.h"
+
+//struct Stats
+//{
+// int drawCalls;
+// int drawCallsBatched;
+// int canvasSwitches;
+// int shaderSwitches;
+// int canvases;
+// int images;
+// int fonts;
+// int64 textureMemory;
+//};
+
+
#endif // defined(jin_graphics)
#endif // __JE_GRAPHICS_H__ \ No newline at end of file
diff --git a/src/libjin/jin.h b/src/libjin/jin.h
index 064f928..8164511 100644
--- a/src/libjin/jin.h
+++ b/src/libjin/jin.h
@@ -14,7 +14,7 @@
#include "net/je_net_manager.h"
#include "graphics/je_graphics.h"
#include "time/je_timer.h"
-#include "multithread/je_thread.h"
+#include "threads/je_thread.h"
#include "common/je_common.h"
#include "ai/je_ai.h"
diff --git a/src/libjin/multithread/je_thread.cpp b/src/libjin/threads/je_thread.cpp
index 0c528bf..0c34508 100644
--- a/src/libjin/multithread/je_thread.cpp
+++ b/src/libjin/threads/je_thread.cpp
@@ -5,7 +5,7 @@
namespace JinEngine
{
- namespace MultiThread
+ namespace Threads
{
class Mutex
@@ -295,7 +295,7 @@ namespace JinEngine
unlock();
}
- } // namespace MultiThread
+ } // namespace Threads
} // namespace JinEngine
#endif // defined(jin_thread) \ No newline at end of file
diff --git a/src/libjin/multithread/je_thread.h b/src/libjin/threads/je_thread.h
index ec3684a..77f147d 100644
--- a/src/libjin/multithread/je_thread.h
+++ b/src/libjin/threads/je_thread.h
@@ -15,7 +15,7 @@
namespace JinEngine
{
- namespace MultiThread
+ namespace Threads
{
/**
* ӢӢMutual exclusionд Mutexһڶ̱߳Уֹ߳ͬʱͬһԴ
@@ -159,7 +159,7 @@ namespace JinEngine
};
- } // namespace MultiThread
+ } // namespace Threads
} // namespace JinEngine
#endif // defined(jin_thread)
diff --git a/src/lua/modules/thread/je_lua_thread.h b/src/lua/modules/thread/je_lua_thread.h
index ffe99d0..112af94 100644
--- a/src/lua/modules/thread/je_lua_thread.h
+++ b/src/lua/modules/thread/je_lua_thread.h
@@ -9,14 +9,14 @@ namespace JinEngine
class Thread
{
public:
- typedef JinEngine::MultiThread::Thread::Variant Variant;
- typedef JinEngine::MultiThread::Thread::ThreadRunner ThreadRunner;
+ typedef JinEngine::Threads::Thread::Variant Variant;
+ typedef JinEngine::Threads::Thread::ThreadRunner ThreadRunner;
Thread(std::string _name, std::string _code, ThreadRunner runner)
: name(_name)
, code(_code)
{
- thread = new JinEngine::MultiThread::Thread(_name, runner);
+ thread = new JinEngine::Threads::Thread(_name, runner);
}
~Thread()
@@ -83,7 +83,7 @@ namespace JinEngine
const std::string code;
private:
- JinEngine::MultiThread::Thread* thread;
+ JinEngine::Threads::Thread* thread;
};