From e85fcaf2c40da42c5949f8dbeae8db1053251732 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 13 Sep 2018 07:55:14 +0800 Subject: *update --- build/01HelloWorld/01HelloWorld.vcxproj | 12 +++--- build/02Audio/02Audio.vcxproj | 12 +++--- build/03Thread/03Thread.vcxproj | 12 +++--- build/04Network/04Network.vcxproj | 12 +++--- build/libjin/libjin.vcxproj | 25 +++++------ build/libjin/libjin.vcxproj.filters | 44 +++++++------------- libjin/Audio/Audio.cpp | 2 +- libjin/Audio/Audio.h | 2 +- libjin/Audio/SDL/SDLAudio.cpp | 2 +- libjin/Audio/SDL/SDLAudio.h | 2 +- libjin/Audio/SDL/SDLSource.cpp | 2 +- libjin/Audio/SDL/SDLSource.h | 2 +- libjin/Audio/Source.cpp | 2 +- libjin/Audio/Source.h | 2 +- libjin/Common/types.h | 23 ++++++++++ libjin/Common/utf8.cpp | 2 +- libjin/Common/utf8.h | 2 +- libjin/Core/Core.h | 6 --- libjin/Core/Game.cpp | 74 --------------------------------- libjin/Core/Game.h | 58 -------------------------- libjin/Game/Game.cpp | 74 +++++++++++++++++++++++++++++++++ libjin/Game/Game.h | 58 ++++++++++++++++++++++++++ libjin/Graphics/Bitmap.h | 2 +- libjin/Graphics/Canvas.cpp | 2 +- libjin/Graphics/Canvas.h | 2 +- libjin/Graphics/Color.h | 2 +- libjin/Graphics/Drawable.cpp | 2 +- libjin/Graphics/Drawable.h | 2 +- libjin/Graphics/Font.cpp | 2 +- libjin/Graphics/Font.h | 2 +- libjin/Graphics/Graphics.h | 2 +- libjin/Graphics/Shader.cpp | 2 +- libjin/Graphics/Shader.h | 2 +- libjin/Graphics/Shapes.cpp | 2 +- libjin/Graphics/Shapes.h | 2 +- libjin/Graphics/Texture.cpp | 2 +- libjin/Graphics/Texture.h | 2 +- libjin/Graphics/Window.cpp | 2 +- libjin/Graphics/Window.h | 2 +- libjin/Graphics/jin_opengl.h | 0 libjin/Input/Event.h | 2 +- libjin/Input/Mouse.cpp | 2 +- libjin/Input/Mouse.h | 2 +- libjin/Net/Net.h | 2 +- libjin/Net/Socket.h | 2 +- libjin/Thread/Thread.cpp | 2 +- libjin/Thread/Thread.h | 2 +- libjin/Time/Timer.cpp | 2 +- libjin/Time/Timer.h | 2 +- libjin/jin.h | 4 +- libjin/jin_configuration.h | 64 ++++++++++++++++++++++++++++ libjin/modules.h | 64 ---------------------------- 52 files changed, 308 insertions(+), 306 deletions(-) create mode 100644 libjin/Common/types.h delete mode 100644 libjin/Core/Core.h delete mode 100644 libjin/Core/Game.cpp delete mode 100644 libjin/Core/Game.h create mode 100644 libjin/Game/Game.cpp create mode 100644 libjin/Game/Game.h create mode 100644 libjin/Graphics/jin_opengl.h create mode 100644 libjin/jin_configuration.h delete mode 100644 libjin/modules.h diff --git a/build/01HelloWorld/01HelloWorld.vcxproj b/build/01HelloWorld/01HelloWorld.vcxproj index cab9535..fb2a36a 100644 --- a/build/01HelloWorld/01HelloWorld.vcxproj +++ b/build/01HelloWorld/01HelloWorld.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,32 +21,32 @@ {F1B984AA-F46D-46C9-9A5A-7606A30E0599} My01HelloWorld - 8.1 + 10.0.14393.0 Application true - v140 + v141 MultiByte Application false - v140 + v141 true MultiByte Application true - v140 + v141 MultiByte Application false - v140 + v141 true MultiByte diff --git a/build/02Audio/02Audio.vcxproj b/build/02Audio/02Audio.vcxproj index 5aa3542..1c7ae98 100644 --- a/build/02Audio/02Audio.vcxproj +++ b/build/02Audio/02Audio.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,32 +21,32 @@ {A2D75980-B0AC-498C-B507-4727B4A38E83} My02Audio - 8.1 + 10.0.14393.0 Application true - v140 + v141 MultiByte Application false - v140 + v141 true MultiByte Application true - v140 + v141 MultiByte Application false - v140 + v141 true MultiByte diff --git a/build/03Thread/03Thread.vcxproj b/build/03Thread/03Thread.vcxproj index 6cad582..06187a8 100644 --- a/build/03Thread/03Thread.vcxproj +++ b/build/03Thread/03Thread.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,32 +21,32 @@ {0E49D105-2032-4825-9FA1-54B1B94E3655} My03Thread - 8.1 + 10.0.14393.0 Application true - v140 + v141 MultiByte Application false - v140 + v141 true MultiByte Application true - v140 + v141 MultiByte Application false - v140 + v141 true MultiByte diff --git a/build/04Network/04Network.vcxproj b/build/04Network/04Network.vcxproj index b992a7a..e428352 100644 --- a/build/04Network/04Network.vcxproj +++ b/build/04Network/04Network.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,32 +21,32 @@ {85071432-24B6-46D4-98D8-DAA63183093C} My04Network - 8.1 + 10.0.14393.0 Application true - v140 + v141 MultiByte Application false - v140 + v141 true MultiByte Application true - v140 + v141 MultiByte Application false - v140 + v141 true MultiByte diff --git a/build/libjin/libjin.vcxproj b/build/libjin/libjin.vcxproj index a00e954..b91de18 100644 --- a/build/libjin/libjin.vcxproj +++ b/build/libjin/libjin.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -25,15 +25,13 @@ - - - + @@ -70,8 +68,6 @@ - - @@ -80,13 +76,13 @@ + - - + @@ -94,6 +90,7 @@ + @@ -109,7 +106,7 @@ - + @@ -138,32 +135,32 @@ {407E9199-D39C-4460-B218-0C29AB42483B} Win32Proj libjin - 8.1 + 10.0.14393.0 StaticLibrary true - v140 + v141 Unicode StaticLibrary false - v140 + v141 true Unicode Application true - v140 + v141 Unicode Application false - v140 + v141 true Unicode diff --git a/build/libjin/libjin.vcxproj.filters b/build/libjin/libjin.vcxproj.filters index c24d727..1fa6de6 100644 --- a/build/libjin/libjin.vcxproj.filters +++ b/build/libjin/libjin.vcxproj.filters @@ -25,9 +25,6 @@ {2277fe39-88f2-4009-94ba-80c093d01a84} - - {0de74e8c-939d-4275-a4d6-a1c075b8eeb2} - {fe7b76de-1e3e-427f-9885-19f6d54d79e1} @@ -64,9 +61,6 @@ {1f73d1ca-ab45-47b2-bd2e-5b4f8cd8ee40} - - {c2b1ec18-2952-4461-92d3-79226870e1a2} - {53e06a65-a5ba-41d8-a1f6-6fb5680207ba} @@ -103,6 +97,9 @@ {84e2ae2f-5cec-4904-9611-330a0362a288} + + {0de74e8c-939d-4275-a4d6-a1c075b8eeb2} + @@ -132,15 +129,6 @@ Audio\SDL - - Audio\OpenAL - - - Audio\OpenAL - - - Core - Filesystem @@ -225,6 +213,9 @@ Graphics + + Game + @@ -263,21 +254,9 @@ Audio\SDL - - Audio\OpenAL - - - Audio\OpenAL - Common - - Core - - - Core - Debug @@ -372,7 +351,6 @@ Physics - Time @@ -430,6 +408,16 @@ Graphics + + Graphics + + + + Game + + + Common + diff --git a/libjin/Audio/Audio.cpp b/libjin/Audio/Audio.cpp index c9a3e40..798269a 100644 --- a/libjin/Audio/Audio.cpp +++ b/libjin/Audio/Audio.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_AUDIO #include "SDL2/SDL.h" diff --git a/libjin/Audio/Audio.h b/libjin/Audio/Audio.h index 9faf0bc..b9812dd 100644 --- a/libjin/Audio/Audio.h +++ b/libjin/Audio/Audio.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_AUDIO_H #define __LIBJIN_AUDIO_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_AUDIO #include "SDL2/SDL.h" diff --git a/libjin/Audio/SDL/SDLAudio.cpp b/libjin/Audio/SDL/SDLAudio.cpp index d457dca..9a256b1 100644 --- a/libjin/Audio/SDL/SDLAudio.cpp +++ b/libjin/Audio/SDL/SDLAudio.cpp @@ -1,4 +1,4 @@ -#include "../../modules.h" +#include "../../jin_configuration.h" #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO #include diff --git a/libjin/Audio/SDL/SDLAudio.h b/libjin/Audio/SDL/SDLAudio.h index 97ed664..db232b7 100644 --- a/libjin/Audio/SDL/SDLAudio.h +++ b/libjin/Audio/SDL/SDLAudio.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_AUDIO_SDL_H #define __LIBJIN_AUDIO_SDL_H -#include "../../modules.h" +#include "../../jin_configuration.h" #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO #include "SDLSource.h" diff --git a/libjin/Audio/SDL/SDLSource.cpp b/libjin/Audio/SDL/SDLSource.cpp index 00193a4..251ef27 100644 --- a/libjin/Audio/SDL/SDLSource.cpp +++ b/libjin/Audio/SDL/SDLSource.cpp @@ -1,4 +1,4 @@ -#include "../../modules.h" +#include "../../jin_configuration.h" #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO #include diff --git a/libjin/Audio/SDL/SDLSource.h b/libjin/Audio/SDL/SDLSource.h index 7e407ee..40f4693 100644 --- a/libjin/Audio/SDL/SDLSource.h +++ b/libjin/Audio/SDL/SDLSource.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_SOURCE_SDL_H #define __LIBJIN_SOURCE_SDL_H -#include "../../modules.h" +#include "../../jin_configuration.h" #if LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO #include diff --git a/libjin/Audio/Source.cpp b/libjin/Audio/Source.cpp index 7ac4e60..1dcd482 100644 --- a/libjin/Audio/Source.cpp +++ b/libjin/Audio/Source.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_AUDIO #include diff --git a/libjin/Audio/Source.h b/libjin/Audio/Source.h index b227db2..e1ca6d0 100644 --- a/libjin/Audio/Source.h +++ b/libjin/Audio/Source.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_AUDIO_SOURCE_H #define __LIBJIN_AUDIO_SOURCE_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_AUDIO #include "SDL2/SDL.h" diff --git a/libjin/Common/types.h b/libjin/Common/types.h new file mode 100644 index 0000000..7e335c0 --- /dev/null +++ b/libjin/Common/types.h @@ -0,0 +1,23 @@ +#ifndef __LIBJIN_TYPES_H +#define __LIBJIN_TYPES_H +#include + +namespace jin +{ +namespace common +{ + + typedef int8_t int8; + typedef uint8_t uint8; + typedef uint8 byte; + typedef int16_t int16; + typedef uint16_t uint16; + typedef int32_t int32; + typedef uint32_t uint32; + typedef int64_t int64; + typedef uint64_t uint64; + +} +} + +#endif \ No newline at end of file diff --git a/libjin/Common/utf8.cpp b/libjin/Common/utf8.cpp index 8c05da8..f00d03c 100644 --- a/libjin/Common/utf8.cpp +++ b/libjin/Common/utf8.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_OS == LIBJIN_WINDOWS #include "utf8.h" diff --git a/libjin/Common/utf8.h b/libjin/Common/utf8.h index 5985684..fd6ce1f 100644 --- a/libjin/Common/utf8.h +++ b/libjin/Common/utf8.h @@ -1,7 +1,7 @@ #ifndef __LIBJIN_COMMON_UTF8_H #define __LIBJIN_COMMON_UTF8_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_OS == LIBJIN_WINDOWS #include diff --git a/libjin/Core/Core.h b/libjin/Core/Core.h deleted file mode 100644 index 4b4df8f..0000000 --- a/libjin/Core/Core.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LIBJIN_CORE_H -#define __LIBJIN_CORE_H - -#include "game.h" - -#endif \ No newline at end of file diff --git a/libjin/Core/Game.cpp b/libjin/Core/Game.cpp deleted file mode 100644 index 3f905f2..0000000 --- a/libjin/Core/Game.cpp +++ /dev/null @@ -1,74 +0,0 @@ -#include "game.h" -#include "../Time/Timer.h" -#include "../input/Event.h" -#include "../Graphics/Window.h" -#include "../Math/Math.h" -#include - -namespace jin -{ -namespace core -{ - - using namespace jin::graphics; - using namespace jin::input; - using namespace jin::time; - using namespace jin::math; - - Game::Game() :_running(true) {}; - - void Game::run() - { - if (_onLoad != nullptr) - _onLoad(); - Window* wnd = Window::get(); - const int FPS = wnd ? wnd->getFPS() : 60; - const int MS_PER_UPDATE = 1000.0f / FPS; - _running = true; - Event e; - int previous = getMilliSecond(); - int dt = MS_PER_UPDATE; - while (_running) - { - while (jin::input::pollEvent(&e)) - { - if (_onEvent != nullptr) - _onEvent(&e); - if (!_running) goto quitloop; - } - if (_onUpdate != nullptr) _onUpdate(dt); - if (_onDraw != nullptr) _onDraw(); - wnd->swapBuffers(); - const int current = getMilliSecond(); - dt = current - previous; - const int wait = MS_PER_UPDATE - (current - previous); - previous += MS_PER_UPDATE; - if (wait > 0) - { - sleep(wait); - dt = MS_PER_UPDATE; - } - else - previous = current; - } - quitloop:; - } - - bool Game::initSystem(const SettingBase* setting) - { - if (setting == nullptr) - return false; - Game::Setting* s = (Game::Setting*) setting; - _onEvent = s->eventHandler; - _onUpdate = s->updater; - _onDraw = s->drawer; - _onLoad = s->loader; - return true; - } - - void Game::quitSystem() - { - } - -} // core -} // jin \ No newline at end of file diff --git a/libjin/Core/Game.h b/libjin/Core/Game.h deleted file mode 100644 index 725c62c..0000000 --- a/libjin/Core/Game.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef __LIBJIN_CORE_GAME_H -#define __LIBJIN_CORE_GAME_H - -#include "SDL2/SDL.h" - -#include "../Common/Subsystem.hpp" -#include "../utils/macros.h" -#include "../Input/Event.h" - -namespace jin -{ -namespace core -{ - - class Game : public Subsystem - { - public: - - typedef void(*onLoad)(); - typedef void(*onEvent)(jin::input::Event* e); - typedef void(*onUpdate)(int dt); - typedef void(*onDraw)(); - - struct Setting : SettingBase - { - onEvent eventHandler; - onUpdate updater; - onDraw drawer; - onLoad loader; - }; - - void run(); - inline void stop() { _running = false; }; - inline bool running() { return _running; }; - - private: - - Game(); - ~Game() {}; - - SINGLETON(Game); - - onEvent _onEvent; - onUpdate _onUpdate; - onDraw _onDraw; - onLoad _onLoad; - - bool _running; - - bool initSystem(const SettingBase* setting); - void quitSystem(); - - }; - -} // core -} // jin - -#endif // __LIBJIN_CORE_GAME_H diff --git a/libjin/Game/Game.cpp b/libjin/Game/Game.cpp new file mode 100644 index 0000000..3f905f2 --- /dev/null +++ b/libjin/Game/Game.cpp @@ -0,0 +1,74 @@ +#include "game.h" +#include "../Time/Timer.h" +#include "../input/Event.h" +#include "../Graphics/Window.h" +#include "../Math/Math.h" +#include + +namespace jin +{ +namespace core +{ + + using namespace jin::graphics; + using namespace jin::input; + using namespace jin::time; + using namespace jin::math; + + Game::Game() :_running(true) {}; + + void Game::run() + { + if (_onLoad != nullptr) + _onLoad(); + Window* wnd = Window::get(); + const int FPS = wnd ? wnd->getFPS() : 60; + const int MS_PER_UPDATE = 1000.0f / FPS; + _running = true; + Event e; + int previous = getMilliSecond(); + int dt = MS_PER_UPDATE; + while (_running) + { + while (jin::input::pollEvent(&e)) + { + if (_onEvent != nullptr) + _onEvent(&e); + if (!_running) goto quitloop; + } + if (_onUpdate != nullptr) _onUpdate(dt); + if (_onDraw != nullptr) _onDraw(); + wnd->swapBuffers(); + const int current = getMilliSecond(); + dt = current - previous; + const int wait = MS_PER_UPDATE - (current - previous); + previous += MS_PER_UPDATE; + if (wait > 0) + { + sleep(wait); + dt = MS_PER_UPDATE; + } + else + previous = current; + } + quitloop:; + } + + bool Game::initSystem(const SettingBase* setting) + { + if (setting == nullptr) + return false; + Game::Setting* s = (Game::Setting*) setting; + _onEvent = s->eventHandler; + _onUpdate = s->updater; + _onDraw = s->drawer; + _onLoad = s->loader; + return true; + } + + void Game::quitSystem() + { + } + +} // core +} // jin \ No newline at end of file diff --git a/libjin/Game/Game.h b/libjin/Game/Game.h new file mode 100644 index 0000000..725c62c --- /dev/null +++ b/libjin/Game/Game.h @@ -0,0 +1,58 @@ +#ifndef __LIBJIN_CORE_GAME_H +#define __LIBJIN_CORE_GAME_H + +#include "SDL2/SDL.h" + +#include "../Common/Subsystem.hpp" +#include "../utils/macros.h" +#include "../Input/Event.h" + +namespace jin +{ +namespace core +{ + + class Game : public Subsystem + { + public: + + typedef void(*onLoad)(); + typedef void(*onEvent)(jin::input::Event* e); + typedef void(*onUpdate)(int dt); + typedef void(*onDraw)(); + + struct Setting : SettingBase + { + onEvent eventHandler; + onUpdate updater; + onDraw drawer; + onLoad loader; + }; + + void run(); + inline void stop() { _running = false; }; + inline bool running() { return _running; }; + + private: + + Game(); + ~Game() {}; + + SINGLETON(Game); + + onEvent _onEvent; + onUpdate _onUpdate; + onDraw _onDraw; + onLoad _onLoad; + + bool _running; + + bool initSystem(const SettingBase* setting); + void quitSystem(); + + }; + +} // core +} // jin + +#endif // __LIBJIN_CORE_GAME_H diff --git a/libjin/Graphics/Bitmap.h b/libjin/Graphics/Bitmap.h index ab84388..5754145 100644 --- a/libjin/Graphics/Bitmap.h +++ b/libjin/Graphics/Bitmap.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_BITMAP_H #define __LIBJIN_BITMAP_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "../Math/Vector2.hpp" diff --git a/libjin/Graphics/Canvas.cpp b/libjin/Graphics/Canvas.cpp index efcd12d..d5f7729 100644 --- a/libjin/Graphics/Canvas.cpp +++ b/libjin/Graphics/Canvas.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "../utils/macros.h" diff --git a/libjin/Graphics/Canvas.h b/libjin/Graphics/Canvas.h index a6a52ea..041005a 100644 --- a/libjin/Graphics/Canvas.h +++ b/libjin/Graphics/Canvas.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_CANVAS_H #define __LIBJIN_CANVAS_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "drawable.h" diff --git a/libjin/Graphics/Color.h b/libjin/Graphics/Color.h index a5bc5d0..97a87d6 100644 --- a/libjin/Graphics/Color.h +++ b/libjin/Graphics/Color.h @@ -3,7 +3,7 @@ */ #ifndef __LIBJIN_COLOR_H #define __LIBJIN_COLOR_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "../utils/endian.h" diff --git a/libjin/Graphics/Drawable.cpp b/libjin/Graphics/Drawable.cpp index 675c54d..ad87841 100644 --- a/libjin/Graphics/Drawable.cpp +++ b/libjin/Graphics/Drawable.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "drawable.h" diff --git a/libjin/Graphics/Drawable.h b/libjin/Graphics/Drawable.h index ff82365..3aee208 100644 --- a/libjin/Graphics/Drawable.h +++ b/libjin/Graphics/Drawable.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_DRAWABLE #define __LIBJIN_DRAWABLE -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "../math/Vector2.hpp" diff --git a/libjin/Graphics/Font.cpp b/libjin/Graphics/Font.cpp index 17653f0..ec4f7fb 100644 --- a/libjin/Graphics/Font.cpp +++ b/libjin/Graphics/Font.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "font.h" diff --git a/libjin/Graphics/Font.h b/libjin/Graphics/Font.h index 10fd242..fa54337 100644 --- a/libjin/Graphics/Font.h +++ b/libjin/Graphics/Font.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_FONT_H #define __LIBJIN_FONT_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include diff --git a/libjin/Graphics/Graphics.h b/libjin/Graphics/Graphics.h index dfd6048..961f9b1 100644 --- a/libjin/Graphics/Graphics.h +++ b/libjin/Graphics/Graphics.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_GRAPHICS_H #define __LIBJIN_GRAPHICS_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "canvas.h" diff --git a/libjin/Graphics/Shader.cpp b/libjin/Graphics/Shader.cpp index e882d35..0f9dab6 100644 --- a/libjin/Graphics/Shader.cpp +++ b/libjin/Graphics/Shader.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "../utils/macros.h" diff --git a/libjin/Graphics/Shader.h b/libjin/Graphics/Shader.h index 83a2831..cf73f3c 100644 --- a/libjin/Graphics/Shader.h +++ b/libjin/Graphics/Shader.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_JSL_H #define __LIBJIN_JSL_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include diff --git a/libjin/Graphics/Shapes.cpp b/libjin/Graphics/Shapes.cpp index 2cb33a2..f80aa18 100644 --- a/libjin/Graphics/Shapes.cpp +++ b/libjin/Graphics/Shapes.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "Shapes.h" diff --git a/libjin/Graphics/Shapes.h b/libjin/Graphics/Shapes.h index dc9f272..b248cca 100644 --- a/libjin/Graphics/Shapes.h +++ b/libjin/Graphics/Shapes.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_GEOMETRY_H #define __LIBJIN_GEOMETRY_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "color.h" diff --git a/libjin/Graphics/Texture.cpp b/libjin/Graphics/Texture.cpp index 9ffe946..45aedfb 100644 --- a/libjin/Graphics/Texture.cpp +++ b/libjin/Graphics/Texture.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include diff --git a/libjin/Graphics/Texture.h b/libjin/Graphics/Texture.h index f2e45f0..d088928 100644 --- a/libjin/Graphics/Texture.h +++ b/libjin/Graphics/Texture.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_IMAGE_H #define __LIBJIN_IMAGE_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "../3rdparty/GLee/GLee.h" diff --git a/libjin/Graphics/Window.cpp b/libjin/Graphics/Window.cpp index 1fb60cc..bafc9ea 100644 --- a/libjin/Graphics/Window.cpp +++ b/libjin/Graphics/Window.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include diff --git a/libjin/Graphics/Window.h b/libjin/Graphics/Window.h index 6b247a6..301b0b5 100644 --- a/libjin/Graphics/Window.h +++ b/libjin/Graphics/Window.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_RENDER_WINDOW #define __LIBJIN_RENDER_WINDOW -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_RENDER #include "SDL2/SDL.h" diff --git a/libjin/Graphics/jin_opengl.h b/libjin/Graphics/jin_opengl.h new file mode 100644 index 0000000..e69de29 diff --git a/libjin/Input/Event.h b/libjin/Input/Event.h index cef6b88..7ab07da 100644 --- a/libjin/Input/Event.h +++ b/libjin/Input/Event.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_EVENT_H #define __LIBJIN_EVENT_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_INPUT namespace jin diff --git a/libjin/Input/Mouse.cpp b/libjin/Input/Mouse.cpp index 892d140..31c29f9 100644 --- a/libjin/Input/Mouse.cpp +++ b/libjin/Input/Mouse.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #ifdef LIBJIN_MODULES_INPUT #include "SDL.h" diff --git a/libjin/Input/Mouse.h b/libjin/Input/Mouse.h index 25dd4c3..09db5d2 100644 --- a/libjin/Input/Mouse.h +++ b/libjin/Input/Mouse.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_MOUSE_H #define __LIBJIN_MOUSE_H -#include "../modules.h" +#include "../jin_configuration.h" #ifdef LIBJIN_MODULES_INPUT #include "../Common/Singleton.hpp" diff --git a/libjin/Net/Net.h b/libjin/Net/Net.h index 4727667..27353dc 100644 --- a/libjin/Net/Net.h +++ b/libjin/Net/Net.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_NET_H #define __LIBJIN_NET_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_NET #include "../Common/Subsystem.hpp" diff --git a/libjin/Net/Socket.h b/libjin/Net/Socket.h index 1a2256c..32ef86f 100644 --- a/libjin/Net/Socket.h +++ b/libjin/Net/Socket.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_NET_SOCKET_H #define __LIBJIN_NET_SOCKET_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_NET #include "../3rdparty/tekcos/tekcos.h" diff --git a/libjin/Thread/Thread.cpp b/libjin/Thread/Thread.cpp index c2b7b91..971fc03 100644 --- a/libjin/Thread/Thread.cpp +++ b/libjin/Thread/Thread.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_THREAD #include "Thread.h" diff --git a/libjin/Thread/Thread.h b/libjin/Thread/Thread.h index 3c41949..3a7b4ba 100644 --- a/libjin/Thread/Thread.h +++ b/libjin/Thread/Thread.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_THREAD_H #define __LIBJIN_THREAD_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_THREAD #include diff --git a/libjin/Time/Timer.cpp b/libjin/Time/Timer.cpp index e5d0799..94d790d 100644 --- a/libjin/Time/Timer.cpp +++ b/libjin/Time/Timer.cpp @@ -1,4 +1,4 @@ -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_TIME #include "Timer.h" diff --git a/libjin/Time/Timer.h b/libjin/Time/Timer.h index aff2f70..7a58e14 100644 --- a/libjin/Time/Timer.h +++ b/libjin/Time/Timer.h @@ -1,6 +1,6 @@ #ifndef __LIBJIN_TIMER_H #define __LIBJIN_TIMER_H -#include "../modules.h" +#include "../jin_configuration.h" #if LIBJIN_MODULES_TIME #include "SDL2/SDL.h" diff --git a/libjin/jin.h b/libjin/jin.h index a4bb37f..255616c 100644 --- a/libjin/jin.h +++ b/libjin/jin.h @@ -1,13 +1,13 @@ #ifndef __LIBJIN_H #define __LIBJIN_H -#include "modules.h" +#include "jin_configuration.h" #include "Utils/utils.h" #ifdef LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO #include "Audio/SDL/SDLAudio.h" #endif // LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO -#include "Core/Core.h" +#include "Game/Game.h" #include "Filesystem/Filesystem.h" #include "Filesystem/Buffer.h" #include "Input/Input.h" diff --git a/libjin/jin_configuration.h b/libjin/jin_configuration.h new file mode 100644 index 0000000..83eb90b --- /dev/null +++ b/libjin/jin_configuration.h @@ -0,0 +1,64 @@ +#ifndef __LIBJIN_COMMON_MODULES_H +#define __LIBJIN_COMMON_MODULES_H +/* +* ¿ØÖÆÄ£¿éºÍ×ÓÄ£¿éµÄ±àÒ룬²»ÐèҪģ¿é¹Ø±Õ²»±àÒë +*/ + +#define LIBJIN_MODULES_AUDIO 1 +#define LIBJIN_AUDIO_SDLAUDIO 1 +#define LIBJIN_AUDIO_OPENAL 1 + +#define LIBJIN_MODULES_RENDER 1 + +#define LIBJIN_MODULES_DEBUG 1 + +#define LIBJIN_MODULES_FILESYSTEM 1 + +#define LIBJIN_MODULES_INPUT 1 +#define LIBJIN_INPUT_SDL 1 + +#define LIBJIN_MODULES_MATH 1 + +#define LIBJIN_MODULES_NET 1 +#define LIBJIN_NET_TEKCOS 1 + +#define LIBJIN_MODULES_PHYSICS 0 +#define LIBJIN_PHYSICS_BOX2D 1 +#define LIBJIN_PHYSICS_NEWTON 1 + +#define LIBJIN_MODULES_TILEMAP 1 + +#define LIBJIN_MODULES_UI 1 + +#define LIBJIN_MODULES_TOOLS 0 +#define LIBJIN_TOOLS_COMPONENT 1 +#define LIBJIN_TOOLS_EVENTMSGCENTER 1 +#define LIBJIN_TOOLS_XML 1 +#define LIBJIN_TOOLS_CSV 1 +#define LIBJIN_TOOLS_JSON 1 + +#define LIBJIN_MODULES_THREAD 1 +#define LIBJIN_THREAD_SDL 1 +#define LIBJIN_THREAD_CPP 0 +#define LIBJIN_THREAD_PTHREAD 0 + +#define LIBJIN_MODULES_TIME 1 +#define LIBJIN_TIME_SDL 1 + +/* +* Open libjin debug +*/ + +#define LIBJIN_DEBUG 0 + +/* +* Operating system +*/ + +#define LIBJIN_WINDOWS 1 +#define LIBJIN_MACOS 2 +#define LIBJIN_LINUX 3 + +#define LIBJIN_OS LIBJIN_WINDOWS + +#endif \ No newline at end of file diff --git a/libjin/modules.h b/libjin/modules.h deleted file mode 100644 index 83eb90b..0000000 --- a/libjin/modules.h +++ /dev/null @@ -1,64 +0,0 @@ -#ifndef __LIBJIN_COMMON_MODULES_H -#define __LIBJIN_COMMON_MODULES_H -/* -* ¿ØÖÆÄ£¿éºÍ×ÓÄ£¿éµÄ±àÒ룬²»ÐèҪģ¿é¹Ø±Õ²»±àÒë -*/ - -#define LIBJIN_MODULES_AUDIO 1 -#define LIBJIN_AUDIO_SDLAUDIO 1 -#define LIBJIN_AUDIO_OPENAL 1 - -#define LIBJIN_MODULES_RENDER 1 - -#define LIBJIN_MODULES_DEBUG 1 - -#define LIBJIN_MODULES_FILESYSTEM 1 - -#define LIBJIN_MODULES_INPUT 1 -#define LIBJIN_INPUT_SDL 1 - -#define LIBJIN_MODULES_MATH 1 - -#define LIBJIN_MODULES_NET 1 -#define LIBJIN_NET_TEKCOS 1 - -#define LIBJIN_MODULES_PHYSICS 0 -#define LIBJIN_PHYSICS_BOX2D 1 -#define LIBJIN_PHYSICS_NEWTON 1 - -#define LIBJIN_MODULES_TILEMAP 1 - -#define LIBJIN_MODULES_UI 1 - -#define LIBJIN_MODULES_TOOLS 0 -#define LIBJIN_TOOLS_COMPONENT 1 -#define LIBJIN_TOOLS_EVENTMSGCENTER 1 -#define LIBJIN_TOOLS_XML 1 -#define LIBJIN_TOOLS_CSV 1 -#define LIBJIN_TOOLS_JSON 1 - -#define LIBJIN_MODULES_THREAD 1 -#define LIBJIN_THREAD_SDL 1 -#define LIBJIN_THREAD_CPP 0 -#define LIBJIN_THREAD_PTHREAD 0 - -#define LIBJIN_MODULES_TIME 1 -#define LIBJIN_TIME_SDL 1 - -/* -* Open libjin debug -*/ - -#define LIBJIN_DEBUG 0 - -/* -* Operating system -*/ - -#define LIBJIN_WINDOWS 1 -#define LIBJIN_MACOS 2 -#define LIBJIN_LINUX 3 - -#define LIBJIN_OS LIBJIN_WINDOWS - -#endif \ No newline at end of file -- cgit v1.1-26-g67d0