diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/draw.cpp | 4 | ||||
| -rw-r--r-- | editor/ground-editor.cpp | 4 | ||||
| -rw-r--r-- | editor/update.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/editor/draw.cpp b/editor/draw.cpp index c4f6a8a2..84ceef00 100644 --- a/editor/draw.cpp +++ b/editor/draw.cpp @@ -68,7 +68,7 @@ void app::draw_cursor() if (ed->is_anything_selected()) { shader.set_tint({1, 1, 1, 0.75f}); - auto [_f, _w, anim_mesh] = M->meshes(); + auto [_g, _w, anim_mesh] = M->meshes(); const auto offset = Vector3i(Vector2i(sel.offset), 0); const auto pos = Vector3i(tile)*iTILE_SIZE + offset; auto [ch, t] = w[tile]; @@ -86,7 +86,7 @@ void app::draw_cursor() const auto& atlas = vo->get_selected()->factory->atlas(); draw(_wireframe_quad, TILE_SIZE2); shader.set_tint({1, 1, 1, 0.75f}); - auto [_f, _w, anim_mesh] = M->meshes(); + auto [_g, _w, anim_mesh] = M->meshes(); const auto pos = Vector3i(tile)*iTILE_SIZE; anim_mesh.draw(shader, *atlas, rotation::N, 0, Vector3(pos), 1); } diff --git a/editor/ground-editor.cpp b/editor/ground-editor.cpp index 0f67853e..2a74952c 100644 --- a/editor/ground-editor.cpp +++ b/editor/ground-editor.cpp @@ -17,7 +17,7 @@ ground_editor::ground_editor() void ground_editor::load_atlases() { - for (const auto& atlas : loader.ground_atlases("floor.json"_s)) + for (const auto& atlas : loader.ground_atlases("ground.json"_s)) { auto& [_, vec] = _permutation; vec.reserve(atlas->num_tiles()); @@ -41,7 +41,7 @@ std::shared_ptr<ground_atlas> ground_editor::atlas(StringView str) fm_throw("no such atlas: {}"_cf, str); } -StringView ground_editor::name() const noexcept { return "floor"_s; } +StringView ground_editor::name() const noexcept { return "ground"_s; } void ground_editor::clear_selection() { diff --git a/editor/update.cpp b/editor/update.cpp index 1140ad47..6ecffc80 100644 --- a/editor/update.cpp +++ b/editor/update.cpp @@ -17,7 +17,7 @@ namespace floormat { void app::maybe_initialize_chunk_(const chunk_coords_& pos, chunk& c) { - auto floor1 = loader.ground_atlas("floor-tiles", { 44, 4 }, pass_mode::pass); + auto floor1 = loader.ground_atlas("ground-tiles", { 44, 4 }, pass_mode::pass); auto floor2 = loader.ground_atlas("metal1", { 2, 2 }, pass_mode::pass); auto wall1 = loader.ground_atlas("wood2", { 2, 1 }, pass_mode::blocked); auto wall2 = loader.ground_atlas("wood1", { 2, 1 }, pass_mode::blocked); |