diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-27 21:47:41 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-27 21:47:41 +0000 |
| commit | e0ac130808d9bed5443115ee91e9cccda713ae3c (patch) | |
| tree | dad2b2cbe2bc8bf5560f4859880549472f808671 /game | |
| parent | Remove the static texture cache (diff) | |
| parent | Render text in N draw calls (diff) | |
| download | ilt-e0ac130808d9bed5443115ee91e9cccda713ae3c.tar.bz2 ilt-e0ac130808d9bed5443115ee91e9cccda713ae3c.tar.xz ilt-e0ac130808d9bed5443115ee91e9cccda713ae3c.zip | |
Merge branch 'text2'
Diffstat (limited to 'game')
| -rw-r--r-- | game/network/network.cpp | 1 | ||||
| -rw-r--r-- | game/terrain.cpp | 2 | ||||
| -rw-r--r-- | game/vehicles/railVehicleClass.cpp | 14 |
3 files changed, 0 insertions, 17 deletions
diff --git a/game/network/network.cpp b/game/network/network.cpp index 500742c..b6c52b8 100644 --- a/game/network/network.cpp +++ b/game/network/network.cpp @@ -1,7 +1,6 @@ #include "network.h" #include "routeWalker.h" #include <array> -#include <cache.h> #include <game/network/link.h> #include <gfx/models/texture.h> #include <glm/gtx/intersect.hpp> diff --git a/game/terrain.cpp b/game/terrain.cpp index a4b6510..d2c8593 100644 --- a/game/terrain.cpp +++ b/game/terrain.cpp @@ -2,9 +2,7 @@ #include "game/geoData.h" #include "gfx/models/texture.h" #include <algorithm> -#include <cache.h> #include <cstddef> -#include <filesystem> #include <gfx/gl/sceneShader.h> #include <gfx/gl/shadowMapper.h> #include <gfx/image.h> diff --git a/game/vehicles/railVehicleClass.cpp b/game/vehicles/railVehicleClass.cpp index 5fd7580..34c1359 100644 --- a/game/vehicles/railVehicleClass.cpp +++ b/game/vehicles/railVehicleClass.cpp @@ -2,26 +2,12 @@ #include "gfx/gl/sceneShader.h" #include "gfx/gl/shadowMapper.h" #include "gfx/gl/vertexArrayObject.h" -#include "gfx/models/mesh.h" -#include "gfx/models/texture.h" -#include "stream_support.h" -#include <algorithm> #include <array> -#include <cache.h> -#include <cmath> -#include <cstddef> -#include <filesystem> #include <glm/glm.hpp> -#include <iterator> #include <lib/resource.h> #include <location.h> -#include <map> #include <maths.h> #include <memory> -#include <set> -#include <string> -#include <utility> -#include <vector> bool RailVehicleClass::persist(Persistence::PersistenceStore & store) |