diff options
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/main.cpp b/src/main.cpp index a587b88..ec0bf71 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,12 +6,14 @@ #include <thread> #include <csignal> +#include "player-input.hpp" #include "asset-manager.hpp" #include "ecs.hpp" -#include "game.hpp" -#include "window.hpp" #include "entities.hpp" #include "game-settings.hpp" +#include "game-type-defs.hpp" +#include "game.hpp" +#include "window.hpp" void signal_handler(int signal_num) { printf("Received signal: %d - shutting down\n", signal_num); @@ -32,13 +34,13 @@ int main() { AM_Init(); Game_Init(); ECS_Init(); + PkeInput_Init(); CreateWindow(&windowProps); EntityType_Init(); - auto steadyClock = std::chrono::steady_clock(); - GameTimePoint lastTimePoint = steadyClock.now(); + GameTimePoint lastTimePoint = pkeSettings.steadyClock.now(); double deltaTillNextRender = pkeSettings.deltaPerFrame; - GameTimePoint lastLogTimePoint = steadyClock.now(); + GameTimePoint lastLogTimePoint = pkeSettings.steadyClock.now(); int64_t tickCount = 0; int64_t nsAhead = 0.0; @@ -52,7 +54,7 @@ int main() { nsAhead = 0; } - GameTimePoint currentTimePoint = steadyClock.now(); + GameTimePoint currentTimePoint = pkeSettings.steadyClock.now(); double deltaThisTick = (currentTimePoint - lastTimePoint).count() / NANO_DENOM_DOUBLE; deltaThisTick = std::min(deltaThisTick, pkeSettings.minimumDeltaPerFrame); deltaTillNextRender -= deltaThisTick; |