diff options
Diffstat (limited to 'src/libjin')
| -rw-r--r-- | src/libjin/Graphics/je_graphics.h | 14 | ||||
| -rw-r--r-- | src/libjin/jin.h | 2 | ||||
| -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 |
4 files changed, 19 insertions, 5 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) |