diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-01-24 16:36:02 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-01-24 16:36:02 +0000 |
| commit | 1c3e7e81049efefe8b54e4d4a719feeda995b474 (patch) | |
| tree | 3a5474dfbc515c16589ae6863fba1116d7b83ec3 /game | |
| parent | Big tidy up of shader wrapper (diff) | |
| download | ilt-1c3e7e81049efefe8b54e4d4a719feeda995b474.tar.bz2 ilt-1c3e7e81049efefe8b54e4d4a719feeda995b474.tar.xz ilt-1c3e7e81049efefe8b54e4d4a719feeda995b474.zip | |
Remove the weird view/model/camera connectedness
Diffstat (limited to 'game')
| -rw-r--r-- | game/physical.cpp | 5 | ||||
| -rw-r--r-- | game/physical.h | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/game/physical.cpp b/game/physical.cpp index 5263268..17d85dd 100644 --- a/game/physical.cpp +++ b/game/physical.cpp @@ -3,6 +3,7 @@ #include "gfx/models/texture.h" #include <cache.h> #include <gfx/gl/shader.h> +#include <gfx/gl/transform.h> Cache<Mesh> Physical::cachedMesh; Cache<Texture> Physical::cachedTexture; @@ -13,9 +14,9 @@ Physical::Physical(glm::vec3 where, const std::string & m, const std::string & t } void -Physical::render(const Shader & shader, const Camera & camera) const +Physical::render(const Shader & shader) const { - shader.Update(location, camera); + shader.setModel(location.GetModel()); texture->Bind(); mesh->Draw(); } diff --git a/game/physical.h b/game/physical.h index ad2207d..5f624b0 100644 --- a/game/physical.h +++ b/game/physical.h @@ -6,7 +6,6 @@ #include <memory> #include <string> -class Camera; class Shader; class Mesh; class Texture; @@ -16,7 +15,7 @@ class Physical { public: Physical(glm::vec3 where, const std::string & m, const std::string & t); - void render(const Shader & shader, const Camera & camera) const; + void render(const Shader & shader) const; [[nodiscard]] const auto & getPosition() const |