seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Largely rewrote gridmap to simplify it

Browse Source 
-Got editor working again
-Added a current-floor marker on selection
This commit is contained in:
Juan Linietsky
2017-08-27 16:00:59 -03:00
parent bd282ff43f
commit 37da8155a4
7 changed files with 429 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/gridmap/grid_map_editor_plugin.h
View File

@ -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);