aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin/Jin.exebin867840 -> 843776 bytes
-rw-r--r--build/vc++/libjin/libjin.vcxproj4
-rw-r--r--build/vc++/libjin/libjin.vcxproj.filters18
-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
8 files changed, 34 insertions, 20 deletions
diff --git a/bin/Jin.exe b/bin/Jin.exe
index a502248..a1f21ad 100644
--- a/bin/Jin.exe
+++ b/bin/Jin.exe
Binary files differ
diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj
index e274b8f..7339e02 100644
--- a/build/vc++/libjin/libjin.vcxproj
+++ b/build/vc++/libjin/libjin.vcxproj
@@ -205,9 +205,9 @@
<ClInclude Include="..\..\..\src\libjin\Math\je_vector2.hpp" />
<ClInclude Include="..\..\..\src\libjin\Math\je_vector3.hpp" />
<ClInclude Include="..\..\..\src\libjin\Math\je_vector4.hpp" />
- <ClInclude Include="..\..\..\src\libjin\multithread\je_thread.h" />
<ClInclude Include="..\..\..\src\libjin\Net\je_net_manager.h" />
<ClInclude Include="..\..\..\src\libjin\Net\je_socket.h" />
+ <ClInclude Include="..\..\..\src\libjin\threads\je_thread.h" />
<ClInclude Include="..\..\..\src\libjin\Time\je_timer.h" />
<ClInclude Include="..\..\..\src\libjin\Utils\je_endian.h" />
<ClInclude Include="..\..\..\src\libjin\Utils\je_log.h" />
@@ -264,9 +264,9 @@
<ClCompile Include="..\..\..\src\libjin\Input\je_keyboard.cpp" />
<ClCompile Include="..\..\..\src\libjin\Input\je_mouse.cpp" />
<ClCompile Include="..\..\..\src\libjin\Math\je_matrix.cpp" />
- <ClCompile Include="..\..\..\src\libjin\multithread\je_thread.cpp" />
<ClCompile Include="..\..\..\src\libjin\Net\je_net_manager.cpp" />
<ClCompile Include="..\..\..\src\libjin\Net\je_socket.cpp" />
+ <ClCompile Include="..\..\..\src\libjin\threads\je_thread.cpp" />
<ClCompile Include="..\..\..\src\libjin\Time\je_timer.cpp" />
<ClCompile Include="..\..\..\src\libjin\Utils\je_log.cpp" />
<ClCompile Include="..\..\..\src\libjin\Utils\je_unittest.cpp" />
diff --git a/build/vc++/libjin/libjin.vcxproj.filters b/build/vc++/libjin/libjin.vcxproj.filters
index cda52d7..31230e0 100644
--- a/build/vc++/libjin/libjin.vcxproj.filters
+++ b/build/vc++/libjin/libjin.vcxproj.filters
@@ -40,9 +40,6 @@
<Filter Include="source\core">
<UniqueIdentifier>{410ae074-3f19-4ca1-bbf4-380f2ba67500}</UniqueIdentifier>
</Filter>
- <Filter Include="source\multithread">
- <UniqueIdentifier>{5d5c96c3-1065-4e74-9521-f4d756d4057f}</UniqueIdentifier>
- </Filter>
<Filter Include="source\ai">
<UniqueIdentifier>{caecef4f-a2c6-4d0a-8052-20e400378f3a}</UniqueIdentifier>
</Filter>
@@ -61,6 +58,9 @@
<Filter Include="source\graphics\shaders\built-in">
<UniqueIdentifier>{9bb29b2f-9812-4a0b-ad27-fd57756c0717}</UniqueIdentifier>
</Filter>
+ <Filter Include="source\threads">
+ <UniqueIdentifier>{5d5c96c3-1065-4e74-9521-f4d756d4057f}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\libjin\jin.h">
@@ -201,9 +201,6 @@
<ClInclude Include="..\..\..\src\libjin\Audio\je_audio_manager.h">
<Filter>source\audio</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\src\libjin\multithread\je_thread.h">
- <Filter>source\multithread</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\src\libjin\math\je_random.h">
<Filter>source\math</Filter>
</ClInclude>
@@ -309,6 +306,9 @@
<ClInclude Include="..\..\..\src\libjin\ai\je_ai.h">
<Filter>source\ai</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\src\libjin\threads\je_thread.h">
+ <Filter>source\threads</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\src\libjin\README.md">
@@ -403,9 +403,6 @@
<ClCompile Include="..\..\..\src\libjin\Audio\je_audio_manager.cpp">
<Filter>source\audio</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\src\libjin\multithread\je_thread.cpp">
- <Filter>source\multithread</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\src\libjin\ai\je_behavior_tree.cpp">
<Filter>source\ai</Filter>
</ClCompile>
@@ -472,5 +469,8 @@
<ClCompile Include="..\..\..\src\libjin\graphics\animations\je_animator.cpp">
<Filter>source\graphics\animations</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\libjin\threads\je_thread.cpp">
+ <Filter>source\threads</Filter>
+ </ClCompile>
</ItemGroup>
</Project> \ No newline at end of file
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;
};
generated by cgit v1.1-26-g67d0 at 2025-05-21 18:00:08 +0000