From 8b00d67febf133e89f6a0bfabc41feed555dc4a9 Mon Sep 17 00:00:00 2001 From: chai Date: Sat, 12 Jan 2019 21:48:33 +0800 Subject: =?UTF-8?q?*=E5=8E=BB=E6=8E=89=E6=96=87=E4=BB=B6=E5=89=8D=E7=BC=80?= =?UTF-8?q?je=5F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/game/application.cpp | 82 +++++++++++++++++++++++++++++++++++++ src/libjin/game/application.h | 84 ++++++++++++++++++++++++++++++++++++++ src/libjin/game/gameobject.cpp | 11 +++++ src/libjin/game/gameobject.h | 41 +++++++++++++++++++ src/libjin/game/je_application.cpp | 82 ------------------------------------- src/libjin/game/je_application.h | 84 -------------------------------------- src/libjin/game/je_gameobject.cpp | 11 ----- src/libjin/game/je_gameobject.h | 41 ------------------- 8 files changed, 218 insertions(+), 218 deletions(-) create mode 100644 src/libjin/game/application.cpp create mode 100644 src/libjin/game/application.h create mode 100644 src/libjin/game/gameobject.cpp create mode 100644 src/libjin/game/gameobject.h delete mode 100644 src/libjin/game/je_application.cpp delete mode 100644 src/libjin/game/je_application.h delete mode 100644 src/libjin/game/je_gameobject.cpp delete mode 100644 src/libjin/game/je_gameobject.h (limited to 'src/libjin/game') diff --git a/src/libjin/game/application.cpp b/src/libjin/game/application.cpp new file mode 100644 index 0000000..e67231f --- /dev/null +++ b/src/libjin/game/application.cpp @@ -0,0 +1,82 @@ +#include "../core/configuration.h" +#if defined(jin_game) + +#include + +#include "../time/timer.h" +#include "../input/event.h" +#include "../graphics/window.h" +#include "../graphics/gl.h" +#include "../math/math.h" + +#include "application.h" + +using namespace JinEngine::Graphics; +using namespace JinEngine::Input; +using namespace JinEngine::Time; +using namespace JinEngine::Math; + +namespace JinEngine +{ + namespace Game + { + + Application::Application() :_running(true) {}; + + /* default game loop */ + void Application::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 current = getMilliSecond(); + int previous = current; + int dt = 0; + while (_running) + { + while (JinEngine::Input::pollEvent(&e)) + { + if (_onEvent != nullptr) + _onEvent(&e); + if (!_running) + goto quitloop; + } + previous = current; + current = getMilliSecond(); + dt = current - previous; + if (_onUpdate != nullptr) + _onUpdate(dt); + glClear(GL_COLOR_BUFFER_BIT); + if (_onDraw != nullptr) + _onDraw(); + wnd->present(); + sleep(16); + } + quitloop:; + } + + bool Application::startSystem(const SettingBase* setting) + { + if (setting == nullptr) + return false; + Application::Setting* s = (Application::Setting*) setting; + _onEvent = s->eventHandler; + _onUpdate = s->updater; + _onDraw = s->drawer; + _onLoad = s->loader; + return true; + } + + void Application::quitSystem() + { + SDL_Quit(); + } + + } // namespace Core +} // namespace JinEngine + +#endif // jin_game \ No newline at end of file diff --git a/src/libjin/game/application.h b/src/libjin/game/application.h new file mode 100644 index 0000000..4c4f48b --- /dev/null +++ b/src/libjin/game/application.h @@ -0,0 +1,84 @@ +#ifndef __JE_CORE_GAME_H__ +#define __JE_CORE_GAME_H__ + +#include "../core/configuration.h" +#if defined(jin_game) + +#include "../common/subsystem.hpp" +#include "../utils/macros.h" +#include "../input/Event.h" + +#include "SDL2/SDL.h" + +namespace JinEngine +{ + namespace Game + { + + /// + /// Game class. + /// + class Application : public Subsystem + { + public: + typedef void(*onLoad)(); + typedef void(*onEvent)(JinEngine::Input::Event* e); + typedef void(*onUpdate)(int dt); + typedef void(*onDraw)(); + + Application(); + ~Application() {}; + + /// + /// Game setting. + /// + struct Setting : SettingBase + { + onEvent eventHandler; + onUpdate updater; + onDraw drawer; + onLoad loader; + }; + + /// + /// Main game loop. + /// + void run(); + + /// + /// Stop game. + /// + inline void stop() + { + _running = false; + }; + + /// + /// Return if game is running. + /// + /// @return True if game is running, otherwise return false. + /// + inline bool running() + { + return _running; + }; + + private: + onEvent _onEvent; + onUpdate _onUpdate; + onDraw _onDraw; + onLoad _onLoad; + + bool _running; + + bool startSystem(const SettingBase* setting); + void quitSystem(); + + }; + + } // namespace Core +} // namespace JinEngine + +#endif // jin_game + +#endif // __JE_CORE_GAME_H__ \ No newline at end of file diff --git a/src/libjin/game/gameobject.cpp b/src/libjin/game/gameobject.cpp new file mode 100644 index 0000000..b17c93c --- /dev/null +++ b/src/libjin/game/gameobject.cpp @@ -0,0 +1,11 @@ +#include "gameobject.h" + +namespace JinEngine +{ + namespace Game + { + + + + } // namespace Game +} // namespace JinEngine \ No newline at end of file diff --git a/src/libjin/game/gameobject.h b/src/libjin/game/gameobject.h new file mode 100644 index 0000000..7cb0de2 --- /dev/null +++ b/src/libjin/game/gameobject.h @@ -0,0 +1,41 @@ +#ifndef __JE_GAME_OBJECT_H__ +#define __JE_GAME_OBJECT_H__ + +#include "../core/configuration.h" +#if defined(jin_game) + +#include +#include +#include + +#include "../common/object.h" +#include "../math/transform.h" + +namespace JinEngine +{ + namespace Game + { + + /// + /// Game object base class. + /// + class GameObject : public Object + { + public: + + /// + /// + /// + virtual ~GameObject() {}; + + protected: + Math::Transform mTransform; + + }; + + } // namespace Game +} // namespace JinEngine + +#endif // jin_game + +#endif \ No newline at end of file diff --git a/src/libjin/game/je_application.cpp b/src/libjin/game/je_application.cpp deleted file mode 100644 index 24629d4..0000000 --- a/src/libjin/game/je_application.cpp +++ /dev/null @@ -1,82 +0,0 @@ -#include "../core/je_configuration.h" -#if defined(jin_game) - -#include - -#include "../time/je_timer.h" -#include "../input/je_event.h" -#include "../graphics/je_window.h" -#include "../graphics/je_gl.h" -#include "../math/je_math.h" - -#include "je_application.h" - -using namespace JinEngine::Graphics; -using namespace JinEngine::Input; -using namespace JinEngine::Time; -using namespace JinEngine::Math; - -namespace JinEngine -{ - namespace Game - { - - Application::Application() :_running(true) {}; - - /* default game loop */ - void Application::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 current = getMilliSecond(); - int previous = current; - int dt = 0; - while (_running) - { - while (JinEngine::Input::pollEvent(&e)) - { - if (_onEvent != nullptr) - _onEvent(&e); - if (!_running) - goto quitloop; - } - previous = current; - current = getMilliSecond(); - dt = current - previous; - if (_onUpdate != nullptr) - _onUpdate(dt); - glClear(GL_COLOR_BUFFER_BIT); - if (_onDraw != nullptr) - _onDraw(); - wnd->present(); - sleep(16); - } - quitloop:; - } - - bool Application::startSystem(const SettingBase* setting) - { - if (setting == nullptr) - return false; - Application::Setting* s = (Application::Setting*) setting; - _onEvent = s->eventHandler; - _onUpdate = s->updater; - _onDraw = s->drawer; - _onLoad = s->loader; - return true; - } - - void Application::quitSystem() - { - SDL_Quit(); - } - - } // namespace Core -} // namespace JinEngine - -#endif // jin_game \ No newline at end of file diff --git a/src/libjin/game/je_application.h b/src/libjin/game/je_application.h deleted file mode 100644 index 6eb8af2..0000000 --- a/src/libjin/game/je_application.h +++ /dev/null @@ -1,84 +0,0 @@ -#ifndef __JE_CORE_GAME_H__ -#define __JE_CORE_GAME_H__ - -#include "../core/je_configuration.h" -#if defined(jin_game) - -#include "../common/je_subsystem.hpp" -#include "../utils/je_macros.h" -#include "../input/je_Event.h" - -#include "SDL2/SDL.h" - -namespace JinEngine -{ - namespace Game - { - - /// - /// Game class. - /// - class Application : public Subsystem - { - public: - typedef void(*onLoad)(); - typedef void(*onEvent)(JinEngine::Input::Event* e); - typedef void(*onUpdate)(int dt); - typedef void(*onDraw)(); - - Application(); - ~Application() {}; - - /// - /// Game setting. - /// - struct Setting : SettingBase - { - onEvent eventHandler; - onUpdate updater; - onDraw drawer; - onLoad loader; - }; - - /// - /// Main game loop. - /// - void run(); - - /// - /// Stop game. - /// - inline void stop() - { - _running = false; - }; - - /// - /// Return if game is running. - /// - /// @return True if game is running, otherwise return false. - /// - inline bool running() - { - return _running; - }; - - private: - onEvent _onEvent; - onUpdate _onUpdate; - onDraw _onDraw; - onLoad _onLoad; - - bool _running; - - bool startSystem(const SettingBase* setting); - void quitSystem(); - - }; - - } // namespace Core -} // namespace JinEngine - -#endif // jin_game - -#endif // __JE_CORE_GAME_H__ \ No newline at end of file diff --git a/src/libjin/game/je_gameobject.cpp b/src/libjin/game/je_gameobject.cpp deleted file mode 100644 index 731f3a7..0000000 --- a/src/libjin/game/je_gameobject.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "je_gameobject.h" - -namespace JinEngine -{ - namespace Game - { - - - - } // namespace Game -} // namespace JinEngine \ No newline at end of file diff --git a/src/libjin/game/je_gameobject.h b/src/libjin/game/je_gameobject.h deleted file mode 100644 index e434caf..0000000 --- a/src/libjin/game/je_gameobject.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef __JE_GAME_OBJECT_H__ -#define __JE_GAME_OBJECT_H__ - -#include "../core/je_configuration.h" -#if defined(jin_game) - -#include -#include -#include - -#include "../common/je_object.h" -#include "../math/je_transform.h" - -namespace JinEngine -{ - namespace Game - { - - /// - /// Game object base class. - /// - class GameObject : public Object - { - public: - - /// - /// - /// - virtual ~GameObject() {}; - - protected: - Math::Transform mTransform; - - }; - - } // namespace Game -} // namespace JinEngine - -#endif // jin_game - -#endif \ No newline at end of file -- cgit v1.1-26-g67d0