diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-13 19:45:54 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-13 19:45:54 +0000 |
| commit | 8566e63b26f9e7ee809c03394743a0576c499378 (patch) | |
| tree | cdcef5b698a224003ba54507dc24cbb27a57cbbe /game | |
| parent | Add glContainer::at override to update a single item (diff) | |
| download | ilt-8566e63b26f9e7ee809c03394743a0576c499378.tar.bz2 ilt-8566e63b26f9e7ee809c03394743a0576c499378.tar.xz ilt-8566e63b26f9e7ee809c03394743a0576c499378.zip | |
We only need 3x3 matrix for model rotation spec
Diffstat (limited to 'game')
| -rw-r--r-- | game/scenary/foliage.h | 2 | ||||
| -rw-r--r-- | game/scenary/illuminator.h | 2 | ||||
| -rw-r--r-- | game/vehicles/railVehicleClass.cpp | 2 | ||||
| -rw-r--r-- | game/vehicles/railVehicleClass.h | 2 |
4 files changed, 4 insertions, 4 deletions
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<Foliage> { glVertexArray instanceVAO; public: - using LocationVertex = std::pair<glm::mat4, GlobalPosition3D>; + using LocationVertex = std::pair<glm::mat3, GlobalPosition3D>; mutable InstanceVertices<LocationVertex> 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<glm::mat4, GlobalPosition3D>; + using LocationVertex = std::pair<glm::mat3, GlobalPosition3D>; mutable InstanceVertices<LocationVertex> instances; mutable InstanceVertices<SpotLightVertex> instancesSpotLight; mutable InstanceVertices<PointLightVertex> 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<LocationVertex, &LocationVertex::back, &LocationVertex::backPos>(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; }; |