summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2021-03-08 19:51:08 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2021-03-08 19:51:08 +0000
commit9c2f87faf5aee8ffad825c05fce01766c65180dd (patch)
treee5037cc9173aee76cc5013e34d038c6c07a3120f
parentAdd maxSpeed to rail vehicle class (diff)
downloadilt-9c2f87faf5aee8ffad825c05fce01766c65180dd.tar.bz2
ilt-9c2f87faf5aee8ffad825c05fce01766c65180dd.tar.xz
ilt-9c2f87faf5aee8ffad825c05fce01766c65180dd.zip
Move TickDuration type into global scope
-rw-r--r--application/main.cpp2
-rw-r--r--game/worldobject.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/application/main.cpp b/application/main.cpp
index 6b22a68..c9caf74 100644
--- a/application/main.cpp
+++ b/application/main.cpp
@@ -107,7 +107,7 @@ public:
while (isRunning) {
processInputs();
const auto t_end = std::chrono::high_resolution_clock::now();
- const auto t_passed = std::chrono::duration_cast<WorldObject::TickDuration>(t_end - t_start);
+ const auto t_passed = std::chrono::duration_cast<TickDuration>(t_end - t_start);
world.apply(&WorldObject::tick, t_passed);
world.apply<CameraController>(&CameraController::updateCamera, &camera);
diff --git a/game/worldobject.h b/game/worldobject.h
index db69532..0340ac4 100644
--- a/game/worldobject.h
+++ b/game/worldobject.h
@@ -4,10 +4,10 @@
#include <chrono>
#include <special_members.hpp>
+using TickDuration = std::chrono::duration<float, std::chrono::seconds::period>;
+
class WorldObject {
public:
- using TickDuration = std::chrono::duration<float, std::chrono::seconds::period>;
-
WorldObject() = default;
virtual ~WorldObject() = default;
NO_COPY(WorldObject);