diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-01 17:56:26 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-01 17:56:26 +0000 |
| commit | d5cdbbf38380239524e351cb69aec94090884ca5 (patch) | |
| tree | 5d7dff2f2775701069806eceb4eaef23b22eba3f /lib/location.h | |
| parent | Reformat with new clang-format (diff) | |
| parent | Remove more use of legacy types (diff) | |
| download | ilt-d5cdbbf38380239524e351cb69aec94090884ca5.tar.bz2 ilt-d5cdbbf38380239524e351cb69aec94090884ca5.tar.xz ilt-d5cdbbf38380239524e351cb69aec94090884ca5.zip | |
Merge remote-tracking branch 'origin/terrain'
Diffstat (limited to 'lib/location.h')
| -rw-r--r-- | lib/location.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/location.h b/lib/location.h index 078f5d3..8570fc2 100644 --- a/lib/location.h +++ b/lib/location.h @@ -1,14 +1,16 @@ #pragma once +#include "config/types.h" #include <glm/mat4x4.hpp> -#include <glm/vec3.hpp> class Location { public: - explicit Location(glm::vec3 pos = {}, glm::vec3 rot = {}) : pos {pos}, rot {rot} { } +#ifndef __cpp_aggregate_paren_init + explicit Location(GlobalPosition3D pos = {}, Rotation3D rot = {}) : pos {pos}, rot {rot} { } +#endif - glm::mat4 getTransform() const; + [[nodiscard]] glm::mat4 getRotationTransform() const; - glm::vec3 pos; - glm::vec3 rot; + GlobalPosition3D pos; + Rotation3D rot; }; |