summaryrefslogtreecommitdiffhomepage
path: root/editor
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-10-24 11:03:25 +0200
committerStanislaw Halik <sthalik@misaki.pl>2022-10-24 11:03:25 +0200
commitc8547d38a29bb4756e3351bdfa45ea72635286d8 (patch)
tree5cdf9ad44db6f7673734febdccf89b43409a9b9c /editor
parentf47790b1ec38f27c486ad2002dac8b310933f0a4 (diff)
a
Diffstat (limited to 'editor')
-rw-r--r--editor/app.cpp1
-rw-r--r--editor/app.hpp1
-rw-r--r--editor/update.cpp2
3 files changed, 1 insertions, 3 deletions
diff --git a/editor/app.cpp b/editor/app.cpp
index 44ca1530..6f8cbed8 100644
--- a/editor/app.cpp
+++ b/editor/app.cpp
@@ -9,7 +9,6 @@ namespace floormat {
app::app() :
M{ floormat_main::create(*this, {})},
- _dummy{M->register_debug_callback()},
_floor1{loader.tile_atlas("floor-tiles", {44, 4})},
_floor2{loader.tile_atlas("metal1", {2, 2})},
_wall1{loader.tile_atlas("wood2", {1, 1})},
diff --git a/editor/app.hpp b/editor/app.hpp
index f7adfc9a..e4f26cf0 100644
--- a/editor/app.hpp
+++ b/editor/app.hpp
@@ -90,7 +90,6 @@ private:
void draw_wireframe_box(global_coords pt);
Containers::Pointer<floormat_main> M;
- [[maybe_unused]] void* _dummy;
std::shared_ptr<tile_atlas> _floor1, _floor2, _wall1, _wall2;
ImGuiIntegration::Context _imgui{NoCreate};
wireframe_mesh<wireframe::quad> _wireframe_quad;
diff --git a/editor/update.cpp b/editor/update.cpp
index a38f4e6e..8247b736 100644
--- a/editor/update.cpp
+++ b/editor/update.cpp
@@ -47,7 +47,7 @@ void app::do_mouse_release(int button)
void app::do_mouse_move(global_coords pos)
{
- //_editor.on_mouse_move(_world, pos);
+ _editor.on_mouse_move(M->world(), pos);
}
void app::update(float dt)