diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2022-10-30 17:08:59 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2022-10-30 17:08:59 +0000 |
| commit | d63f393b7bcabd7f6569b87a2dedbc8333c47554 (patch) | |
| tree | a34b8f2cb32381f912f85d9cd6fb2c0dfd8a3e6f /game | |
| parent | EditNetworkOf constructor may have single param, should be explicit (diff) | |
| download | ilt-d63f393b7bcabd7f6569b87a2dedbc8333c47554.tar.bz2 ilt-d63f393b7bcabd7f6569b87a2dedbc8333c47554.tar.xz ilt-d63f393b7bcabd7f6569b87a2dedbc8333c47554.zip | |
Setting texture unit on bind
Always sets the target unit before binding, allows specifying the unit
Diffstat (limited to 'game')
| -rw-r--r-- | game/network/network.impl.h | 2 | ||||
| -rw-r--r-- | game/terrain.cpp | 4 | ||||
| -rw-r--r-- | game/vehicles/railVehicleClass.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/game/network/network.impl.h b/game/network/network.impl.h index 5b1649d..597e3aa 100644 --- a/game/network/network.impl.h +++ b/game/network/network.impl.h @@ -8,7 +8,7 @@ NetworkOf<T>::render(const Shader & shader) const { if constexpr (std::is_base_of_v<Renderable, T>) { shader.setModel(Location {}, Shader::Program::StaticPos); - texture->Bind(); + texture->bind(); links.apply(&Renderable::render, shader); } } diff --git a/game/terrain.cpp b/game/terrain.cpp index 10a6215..3a35c42 100644 --- a/game/terrain.cpp +++ b/game/terrain.cpp @@ -86,11 +86,11 @@ void Terrain::render(const Shader & shader) const { shader.setModel(Location {}, Shader::Program::LandMass); - grass->Bind(); + grass->bind(); meshes.apply(&Mesh::Draw); shader.setModel(Location {}, Shader::Program::Water); shader.setUniform("waves", {waveCycle, 0, 0}); - water->Bind(); + water->bind(); meshes.apply(&Mesh::Draw); } diff --git a/game/vehicles/railVehicleClass.cpp b/game/vehicles/railVehicleClass.cpp index 689e1e6..7eb4495 100644 --- a/game/vehicles/railVehicleClass.cpp +++ b/game/vehicles/railVehicleClass.cpp @@ -41,7 +41,7 @@ RailVehicleClass::RailVehicleClass(std::unique_ptr<ObjParser> o, std::shared_ptr void RailVehicleClass::render(const Shader & shader, const Location & location, const std::array<Location, 2> & bl) const { - texture->Bind(); + texture->bind(); for (auto b = 0U; b < bogies.size(); ++b) { shader.setModel(bl[b]); bogies[b]->Draw(); |