From 8566e63b26f9e7ee809c03394743a0576c499378 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 13 Jan 2024 19:45:54 +0000 Subject: We only need 3x3 matrix for model rotation spec --- game/scenary/foliage.h | 2 +- game/scenary/illuminator.h | 2 +- game/vehicles/railVehicleClass.cpp | 2 +- game/vehicles/railVehicleClass.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'game') diff --git a/game/scenary/foliage.h b/game/scenary/foliage.h index bbb6200..3beda89 100644 --- a/game/scenary/foliage.h +++ b/game/scenary/foliage.h @@ -15,7 +15,7 @@ class Foliage : public Asset, public Renderable, public StdTypeDefs { glVertexArray instanceVAO; public: - using LocationVertex = std::pair; + using LocationVertex = std::pair; mutable InstanceVertices instances; void render(const SceneShader &) const override; void shadows(const ShadowMapper &) const override; diff --git a/game/scenary/illuminator.h b/game/scenary/illuminator.h index 893e5c7..cd6073c 100644 --- a/game/scenary/illuminator.h +++ b/game/scenary/illuminator.h @@ -41,7 +41,7 @@ public: }; public: - using LocationVertex = std::pair; + using LocationVertex = std::pair; mutable InstanceVertices instances; mutable InstanceVertices instancesSpotLight; mutable InstanceVertices instancesPointLight; diff --git a/game/vehicles/railVehicleClass.cpp b/game/vehicles/railVehicleClass.cpp index 3ca42db..5fd7580 100644 --- a/game/vehicles/railVehicleClass.cpp +++ b/game/vehicles/railVehicleClass.cpp @@ -43,7 +43,7 @@ RailVehicleClass::postLoad() bogies.back() ->configureVAO(instancesBogiesVAO.back()) .addAttribs(instances.bufferName(), 1); - static_assert(sizeof(LocationVertex) == 228UL); + static_assert(sizeof(LocationVertex) == 144UL); } void diff --git a/game/vehicles/railVehicleClass.h b/game/vehicles/railVehicleClass.h index 913feea..9d9d4c2 100644 --- a/game/vehicles/railVehicleClass.h +++ b/game/vehicles/railVehicleClass.h @@ -19,7 +19,7 @@ public: void shadows(const ShadowMapper & shadowMapper) const override; struct LocationVertex { - glm::mat4 body, front, back; + glm::mat3 body, front, back; GlobalPosition3D bodyPos, frontPos, backPos; }; -- cgit v1.2.3