Implement atlas merging and tile proxies

This commit is contained in:
Gilles Roudière 2021-07-06 14:43:03 +02:00
parent b2187797df
commit 5d34a81e52
19 changed files with 1773 additions and 175 deletions

View file

@ -82,9 +82,6 @@ private:
void _on_random_tile_checkbox_toggled(bool p_pressed);
void _on_scattering_spinbox_changed(double p_value);
Button *toggle_grid_button;
void _on_grid_toggled(bool p_pressed);
void _update_toolbar();
///// Tilemap editing. /////
@ -300,6 +297,7 @@ class TileMapEditor : public VBoxContainer {
GDCLASS(TileMapEditor, VBoxContainer);
private:
UndoRedo *undo_redo = EditorNode::get_undo_redo();
bool tileset_changed_needs_update = false;
ObjectID tile_map_id;
@ -309,6 +307,12 @@ private:
// Toolbar.
HBoxContainer *tilemap_toolbar;
Button *toggle_grid_button;
void _on_grid_toggled(bool p_pressed);
MenuButton *advanced_menu_button;
void _advanced_menu_button_id_pressed(int p_id);
// Bottom panel
Label *missing_tileset_label;
Tabs *tabs;