diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2022-10-13 20:40:49 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2022-10-13 20:40:49 +0100 |
| commit | da0bbb835d103954724c0f9bc2800b0e7cdb61fe (patch) | |
| tree | 97358dc01536d51f0f226270025105cc62679cf9 /game | |
| parent | Add ConstTypeDefs as a const only variant of StdTypeDefs (diff) | |
| download | ilt-da0bbb835d103954724c0f9bc2800b0e7cdb61fe.tar.bz2 ilt-da0bbb835d103954724c0f9bc2800b0e7cdb61fe.tar.xz ilt-da0bbb835d103954724c0f9bc2800b0e7cdb61fe.zip | |
Standard typedefs for Mesh
Diffstat (limited to 'game')
| -rw-r--r-- | game/network/rail.cpp | 2 | ||||
| -rw-r--r-- | game/network/rail.h | 4 | ||||
| -rw-r--r-- | game/vehicles/railVehicleClass.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/game/network/rail.cpp b/game/network/rail.cpp index 5fec7c1..635ee6e 100644 --- a/game/network/rail.cpp +++ b/game/network/rail.cpp @@ -92,7 +92,7 @@ RailLinks::addLinksBetween(glm::vec3 start, glm::vec3 end) return addLink<RailLinkCurve>(start, end, centre.first); } -MeshPtr +Mesh::Ptr RailLink::defaultMesh(const std::span<Vertex> vertices) { std::vector<unsigned int> indices; diff --git a/game/network/rail.h b/game/network/rail.h index 78d4a86..b1a036e 100644 --- a/game/network/rail.h +++ b/game/network/rail.h @@ -30,9 +30,9 @@ public: protected: [[nodiscard]] glm::vec3 vehiclePositionOffset() const override; - [[nodiscard]] static MeshPtr defaultMesh(const std::span<Vertex> vertices); + [[nodiscard]] static Mesh::Ptr defaultMesh(const std::span<Vertex> vertices); - MeshPtr mesh; + Mesh::Ptr mesh; }; RailLink::~RailLink() = default; diff --git a/game/vehicles/railVehicleClass.h b/game/vehicles/railVehicleClass.h index 8f82fd2..604af6a 100644 --- a/game/vehicles/railVehicleClass.h +++ b/game/vehicles/railVehicleClass.h @@ -16,8 +16,8 @@ public: void render(const Shader &, const Location &, const std::array<Location, 2> &) const; - std::array<MeshPtr, 2> bogies; - MeshPtr bodyMesh; + std::array<Mesh::Ptr, 2> bogies; + Mesh::Ptr bodyMesh; std::shared_ptr<Texture> texture; float wheelBase; float length; |