aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/Game
diff options
context:
space:
mode:
Diffstat (limited to 'src/libjin/Game')
-rw-r--r--src/libjin/Game/je_application.cpp (renamed from src/libjin/Game/je_game.cpp)12
-rw-r--r--src/libjin/Game/je_application.h (renamed from src/libjin/Game/je_game.h)8
2 files changed, 10 insertions, 10 deletions
diff --git a/src/libjin/Game/je_game.cpp b/src/libjin/Game/je_application.cpp
index 7562831..a5a8812 100644
--- a/src/libjin/Game/je_game.cpp
+++ b/src/libjin/Game/je_application.cpp
@@ -8,7 +8,7 @@
#include "../graphics/je_window.h"
#include "../math/je_math.h"
-#include "je_game.h"
+#include "je_application.h"
namespace JinEngine
{
@@ -20,10 +20,10 @@ namespace JinEngine
using namespace JinEngine::Time;
using namespace JinEngine::Math;
- Game::Game() :_running(true) {};
+ Application::Application() :_running(true) {};
/* default game loop */
- void Game::run()
+ void Application::run()
{
if (_onLoad != nullptr)
_onLoad();
@@ -57,11 +57,11 @@ namespace JinEngine
quitloop:;
}
- bool Game::initSystem(const SettingBase* setting)
+ bool Application::initSystem(const SettingBase* setting)
{
if (setting == nullptr)
return false;
- Game::Setting* s = (Game::Setting*) setting;
+ Application::Setting* s = (Application::Setting*) setting;
_onEvent = s->eventHandler;
_onUpdate = s->updater;
_onDraw = s->drawer;
@@ -69,7 +69,7 @@ namespace JinEngine
return true;
}
- void Game::quitSystem()
+ void Application::quitSystem()
{
}
diff --git a/src/libjin/Game/je_game.h b/src/libjin/Game/je_application.h
index 2ccc428..f740c22 100644
--- a/src/libjin/Game/je_game.h
+++ b/src/libjin/Game/je_application.h
@@ -18,7 +18,7 @@ namespace JinEngine
///
/// Game class.
///
- class Game : public Subsystem<Game>
+ class Application : public Subsystem<Application>
{
public:
@@ -63,10 +63,10 @@ namespace JinEngine
private:
- Game();
- ~Game() {};
+ Application();
+ ~Application() {};
- singleton(Game);
+ singleton(Application);
onEvent _onEvent;
onUpdate _onUpdate;