From da0bbb835d103954724c0f9bc2800b0e7cdb61fe Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Thu, 13 Oct 2022 20:40:49 +0100 Subject: Standard typedefs for Mesh --- game/network/rail.cpp | 2 +- game/network/rail.h | 4 ++-- game/vehicles/railVehicleClass.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'game') 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(start, end, centre.first); } -MeshPtr +Mesh::Ptr RailLink::defaultMesh(const std::span vertices) { std::vector 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 vertices); + [[nodiscard]] static Mesh::Ptr defaultMesh(const std::span 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 &) const; - std::array bogies; - MeshPtr bodyMesh; + std::array bogies; + Mesh::Ptr bodyMesh; std::shared_ptr texture; float wheelBase; float length; -- cgit v1.2.3