diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-01-25 01:05:45 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-01-25 01:05:45 +0000 |
| commit | a1110d7f594177976f9bd7cda73d11bc2e942a4a (patch) | |
| tree | 9eaf1517f097c8a2086920022a2153d5ed137f4f /game | |
| parent | Split physical objects from renderable ones (diff) | |
| download | ilt-a1110d7f594177976f9bd7cda73d11bc2e942a4a.tar.bz2 ilt-a1110d7f594177976f9bd7cda73d11bc2e942a4a.tar.xz ilt-a1110d7f594177976f9bd7cda73d11bc2e942a4a.zip | |
Move texture cache to Texture class
Diffstat (limited to 'game')
| -rw-r--r-- | game/physical.cpp | 3 | ||||
| -rw-r--r-- | game/physical.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/game/physical.cpp b/game/physical.cpp index 17d85dd..ec3221f 100644 --- a/game/physical.cpp +++ b/game/physical.cpp @@ -6,10 +6,9 @@ #include <gfx/gl/transform.h> Cache<Mesh> Physical::cachedMesh; -Cache<Texture> Physical::cachedTexture; Physical::Physical(glm::vec3 where, const std::string & m, const std::string & t) : - location {where}, mesh {cachedMesh.get(m)}, texture {cachedTexture.get(t)} + location {where}, mesh {cachedMesh.get(m)}, texture {Texture::cachedTexture.get(t)} { } diff --git a/game/physical.h b/game/physical.h index 44af5e6..4ad8a49 100644 --- a/game/physical.h +++ b/game/physical.h @@ -32,7 +32,6 @@ protected: private: static Cache<Mesh> cachedMesh; - static Cache<Texture> cachedTexture; }; #endif |