diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-03-03 00:08:47 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-03-03 00:08:47 +0000 |
| commit | 94311f9c4e82b7475802b1934cc0c5b243e0cd2f (patch) | |
| tree | 5ef23f6c1151917eb723b67c262da0168e42343c /game/network/rail.h | |
| parent | Our own matrix rotations (diff) | |
| download | ilt-94311f9c4e82b7475802b1934cc0c5b243e0cd2f.tar.bz2 ilt-94311f9c4e82b7475802b1934cc0c5b243e0cd2f.tar.xz ilt-94311f9c4e82b7475802b1934cc0c5b243e0cd2f.zip | |
Replace Transform with Location
Simpler, unbinds the transformation matrices for location, now done just in the shader.
Diffstat (limited to 'game/network/rail.h')
| -rw-r--r-- | game/network/rail.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/game/network/rail.h b/game/network/rail.h index 5837ac1..d25964d 100644 --- a/game/network/rail.h +++ b/game/network/rail.h @@ -3,12 +3,12 @@ #include "collection.hpp" #include "game/worldobject.h" -#include "gfx/gl/transform.h" #include "gfx/models/mesh.h" #include "gfx/models/vertex.hpp" #include "gfx/renderable.h" #include "link.h" #include <glm/glm.hpp> +#include <location.hpp> #include <maths.h> #include <memory> #include <set> @@ -37,7 +37,7 @@ protected: class RailLinkStraight : public RailLink { public: RailLinkStraight(const NodePtr &, const NodePtr &); - [[nodiscard]] Transform positionAt(float dist, unsigned char start) const override; + [[nodiscard]] Location positionAt(float dist, unsigned char start) const override; private: RailLinkStraight(NodePtr, NodePtr, const glm::vec3 & diff); @@ -46,7 +46,7 @@ private: class RailLinkCurve : public RailLink { public: RailLinkCurve(const NodePtr &, const NodePtr &, glm::vec2); - [[nodiscard]] Transform positionAt(float dist, unsigned char start) const override; + [[nodiscard]] Location positionAt(float dist, unsigned char start) const override; private: RailLinkCurve(const NodePtr &, const NodePtr &, glm::vec3, const Arc); |