From a1110d7f594177976f9bd7cda73d11bc2e942a4a Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Mon, 25 Jan 2021 01:05:45 +0000 Subject: Move texture cache to Texture class --- game/physical.cpp | 3 +-- game/physical.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'game') 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 Cache Physical::cachedMesh; -Cache 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 cachedMesh; - static Cache cachedTexture; }; #endif -- cgit v1.2.3