mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update GridMap editor grid location when required

Browse Source 
The GridMap editor's grid previously did not not move when moving
the tile cursor, only on certain menu actions.

This commit adds an update_grid call for valid mouse movement in
the editor, changes update_grid to only offset if there's a valid
cursor, and adds updates for the grid and cursor when a mesh library
is changed since we need the new RID for the update_grid check,
and if we remove the mesh library we want to make sure it gets
recentered. As a nice side-effect, it also updates to the new cursor
mesh if you load a new mesh library.

Fixes #57068
This commit is contained in:
Casey 2023-06-15 02:29:39 -06:00
parent 33957aee69
commit 0defaefdba
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/gridmap/editor/grid_map_editor_plugin.cpp
View File

@ -704,6 +704,9 @@ EditorPlugin::AfterGUIInput GridMapEditor::forward_spatial_input_event(Camera3D
Ref<InputEventMouseMotion> mm = p_event; Ref<InputEventMouseMotion> mm = p_event;
if (mm.is_valid()) { if (mm.is_valid()) {
// Update the grid, to check if the grid needs to be moved to a tile cursor.
update_grid();
if (do_input_action(p_camera, mm->get_position(), false)) { if (do_input_action(p_camera, mm->get_position(), false)) {
return EditorPlugin::AFTER_GUI_INPUT_STOP; return EditorPlugin::AFTER_GUI_INPUT_STOP;
} }
@ -951,7 +954,8 @@ void GridMapEditor::update_grid() {
grid_ofs[edit_axis] = edit_floor[edit_axis] * node->get_cell_size()[edit_axis]; grid_ofs[edit_axis] = edit_floor[edit_axis] * node->get_cell_size()[edit_axis];
edit_grid_xform.origin = grid_ofs; // If there's a valid tile cursor, offset the grid, otherwise move it back to the node.
edit_grid_xform.origin = cursor_instance.is_valid() ? grid_ofs : Vector3();
edit_grid_xform.basis = Basis(); edit_grid_xform.basis = Basis();
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
@ -1076,6 +1080,9 @@ void GridMapEditor::_notification(int p_what) {
Ref<MeshLibrary> cgmt = node->get_mesh_library(); Ref<MeshLibrary> cgmt = node->get_mesh_library();
if (cgmt.operator->() != last_mesh_library) { if (cgmt.operator->() != last_mesh_library) {
update_palette(); update_palette();
// Update the cursor and grid in case the library is changed or removed.
_update_cursor_instance();
update_grid();
} }
} break; } break;