diff options
Diffstat (limited to 'shaders')
| -rw-r--r-- | shaders/lightmap.cpp | 8 | ||||
| -rw-r--r-- | shaders/lightmap.hpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/shaders/lightmap.cpp b/shaders/lightmap.cpp index 0585223b..47a7a5e0 100644 --- a/shaders/lightmap.cpp +++ b/shaders/lightmap.cpp @@ -5,7 +5,7 @@ #include "src/chunk.hpp" #include "src/tile-bbox.hpp" #include "src/tile-atlas.hpp" -#include "src/entity.hpp" +#include "src/object.hpp" #include <utility> #include <Corrade/Containers/PairStl.h> #include <Corrade/Containers/Iterable.h> @@ -371,7 +371,7 @@ void lightmap_shader::add_chunk(Vector2 neighbor_offset, chunk& c) neighbor_offset += Vector2(half_neighbors); add_geometry(neighbor_offset, c); - add_entities(neighbor_offset, c); + add_objects(neighbor_offset, c); } void lightmap_shader::add_geometry(Vector2 neighbor_offset, chunk& c) @@ -407,9 +407,9 @@ void lightmap_shader::add_geometry(Vector2 neighbor_offset, chunk& c) } } -void lightmap_shader::add_entities(Vector2 neighbor_offset, chunk& c) +void lightmap_shader::add_objects(Vector2 neighbor_offset, chunk& c) { - for (const auto& e_ : c.entities()) + for (const auto& e_ : c.objects()) { const auto& e = *e_; if (e.is_virtual()) diff --git a/shaders/lightmap.hpp b/shaders/lightmap.hpp index 2dea87e9..2a0869bc 100644 --- a/shaders/lightmap.hpp +++ b/shaders/lightmap.hpp @@ -74,7 +74,7 @@ private: GL::Mesh make_occlusion_mesh(); static std::array<UnsignedShort, 6> quad_indexes(size_t N); - void add_entities(Vector2 neighbor_offset, chunk& c); + void add_objects(Vector2 neighbor_offset, chunk& c); void add_geometry(Vector2 neighbor_offset, chunk& c); void add_rect(Vector2 neighbor_offset, Vector2 min, Vector2 max); void add_rect(Vector2 neighbor_offset, Pair<Vector2, Vector2> minmax); |