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

Merge pull request #105565 from smix8/gridmap_list

Browse Source 
Replace GridMap legacy use of `List` with `LocalVector`
This commit is contained in:
Thaddeus Crews
2025-04-22 10:44:32 -05:00
parent c928676582 aab8dd6488
commit 0ed1c192e8
3 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -815,8 +815,8 @@ EditorPlugin::AfterGUIInput GridMapEditor::forward_spatial_input_event(Camera3D
for (const SetItem &si : set_items) {
undo_redo->add_do_method(node, "set_cell_item", si.position, si.new_value, si.new_orientation);
}
for (List<SetItem>::Element *E = set_items.back(); E; E = E->prev()) {
const SetItem &si = E->get();
for (uint32_t i = set_items.size(); i > 0; i--) {
const SetItem &si = set_items[i - 1];
undo_redo->add_undo_method(node, "set_cell_item", si.position, si.old_value, si.old_orientation);
}
@ -1387,6 +1387,8 @@ GridMapEditor::GridMapEditor() {
toolbar->add_child(mode_buttons);
mode_buttons_group.instantiate();
viewport_shortcut_buttons.reserve(12);
transform_mode_button = memnew(Button);
transform_mode_button->set_theme_type_variation(SceneStringName(FlatButton));
transform_mode_button->set_toggle_mode(true);

6
modules/gridmap/editor/grid_map_editor_plugin.h
View File

@ -74,7 +74,7 @@ class GridMapEditor : public VBoxContainer {
double accumulated_floor_delta = 0.0;
HBoxContainer *toolbar = nullptr;
List<BaseButton *> viewport_shortcut_buttons;
TightLocalVector<BaseButton *> viewport_shortcut_buttons;
Ref<ButtonGroup> mode_buttons_group;
// mode
Button *transform_mode_button = nullptr;
@ -110,7 +110,7 @@ class GridMapEditor : public VBoxContainer {
int old_orientation = 0;
};
List<SetItem> set_items;
LocalVector<SetItem> set_items;
GridMap *node = nullptr;
Ref<MeshLibrary> mesh_library = nullptr;
@ -139,7 +139,7 @@ class GridMapEditor : public VBoxContainer {
RID instance;
};
List<ClipboardItem> clipboard_items;
LocalVector<ClipboardItem> clipboard_items;
Color default_color;
Color erase_color;