summaryrefslogtreecommitdiff
path: root/game/terrain.cpp
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2024-01-25 23:49:27 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2024-01-25 23:49:27 +0000
commit7b462801d500b43bd7ebebe69c2e8a9d5e3f1261 (patch)
tree3c0c941cd7a98defb8d8e138f0c0ddb5d5903c68 /game/terrain.cpp
parentAdd traits helpers for glTexParameter functions (diff)
downloadilt-7b462801d500b43bd7ebebe69c2e8a9d5e3f1261.tar.bz2
ilt-7b462801d500b43bd7ebebe69c2e8a9d5e3f1261.tar.xz
ilt-7b462801d500b43bd7ebebe69c2e8a9d5e3f1261.zip
Remove the static texture cache
Static variables persist too long, destruction is unmanaged and occurs after the gl context is gone.
Diffstat (limited to 'game/terrain.cpp')
-rw-r--r--game/terrain.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/game/terrain.cpp b/game/terrain.cpp
index 3778f3d..a4b6510 100644
--- a/game/terrain.cpp
+++ b/game/terrain.cpp
@@ -18,8 +18,8 @@
#include <vector>
Terrain::Terrain(std::shared_ptr<GeoData> tm) :
- geoData {std::move(tm)}, grass {Texture::cachedTexture.get("grass.png")},
- water {Texture::cachedTexture.get("water.png")}
+ geoData {std::move(tm)}, grass {std::make_shared<Texture>("grass.png")},
+ water {std::make_shared<Texture>("water.png")}
{
generateMeshes();
}