diff options
| author | Juan Linietsky | 2017-08-27 16:00:59 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-08-27 16:02:00 -0300 |
| commit | 37da8155a4500a9386027b4d791a86186bc7ab4a (patch) | |
| tree | 685c9f1f1ef8c2bd2c3b02e55266895c61bd9128 /modules/gridmap/grid_map_editor_plugin.h | |
| parent | bd282ff43f23fe845f29a3e25c8efc01bd65ffb0 (diff) | |
| download | godot-37da8155a4500a9386027b4d791a86186bc7ab4a.tar.gz godot-37da8155a4500a9386027b4d791a86186bc7ab4a.tar.zst godot-37da8155a4500a9386027b4d791a86186bc7ab4a.zip | |
-Largely rewrote gridmap to simplify it
-Got editor working again
-Added a current-floor marker on selection
Diffstat (limited to 'modules/gridmap/grid_map_editor_plugin.h')
| -rw-r--r-- | modules/gridmap/grid_map_editor_plugin.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/gridmap/grid_map_editor_plugin.h b/modules/gridmap/grid_map_editor_plugin.h index b2c28c4f7..ecbfbf2d6 100644 --- a/modules/gridmap/grid_map_editor_plugin.h +++ b/modules/gridmap/grid_map_editor_plugin.h @@ -109,12 +109,15 @@ class GridMapEditor : public VBoxContainer { RID cursor_instance; RID selection_mesh; RID selection_instance; + RID selection_level_mesh[3]; + RID selection_level_instance[3]; RID duplicate_mesh; RID duplicate_instance; Ref<SpatialMaterial> indicator_mat; Ref<SpatialMaterial> inner_mat; Ref<SpatialMaterial> outer_mat; + Ref<SpatialMaterial> selection_floor_mat; bool updating; @@ -223,7 +226,7 @@ class GridMapEditorPlugin : public EditorPlugin { EditorNode *editor; public: - virtual bool forward_spatial_input_event(Camera *p_camera, const Ref<InputEvent> &p_event) { return gridmap_editor->forward_spatial_input_event(p_camera, p_event); } + virtual bool forward_spatial_gui_input(Camera *p_camera, const Ref<InputEvent> &p_event) { return gridmap_editor->forward_spatial_input_event(p_camera, p_event); } virtual String get_name() const { return "GridMap"; } bool has_main_screen() const { return false; } virtual void edit(Object *p_object); |
