diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2026-04-03 12:04:14 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2026-04-03 12:04:14 +0100 |
| commit | 4d04572e48950493ce85255d181be43967f362fd (patch) | |
| tree | f74d055f151472cda3fa3fc0f760eb6219dd9fad /gfx/followCameraController.cpp | |
| parent | Use std::chrono for worldTime (diff) | |
| parent | Fix direction of difference vector calculating railVehicle new position (diff) | |
| download | ilt-4d04572e48950493ce85255d181be43967f362fd.tar.bz2 ilt-4d04572e48950493ce85255d181be43967f362fd.tar.xz ilt-4d04572e48950493ce85255d181be43967f362fd.zip | |
Merge branch 'shared-locations'
Diffstat (limited to 'gfx/followCameraController.cpp')
| -rw-r--r-- | gfx/followCameraController.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gfx/followCameraController.cpp b/gfx/followCameraController.cpp index d7bbc0b..c3a5d08 100644 --- a/gfx/followCameraController.cpp +++ b/gfx/followCameraController.cpp @@ -4,7 +4,6 @@ #include <glm/glm.hpp> #include <location.h> #include <maths.h> -#include <memory> #include <tuple> #include <utility> @@ -15,7 +14,7 @@ FollowCameraController::updateCamera(Camera * camera) const { const auto [pos, rot] = [this]() { const auto t {target.lock()}; - return std::tie(t->getLocation().pos, t->getLocation().rot); + return std::make_pair(t->getLocation().pos, t->getLocation().rot); }(); switch (mode) { |
