diff options
| author | A Thousand Ships <96648715+AThousandShips@users.noreply.github.com> | 2024-03-28 12:36:03 +0100 |
|---|---|---|
| committer | A Thousand Ships <96648715+AThousandShips@users.noreply.github.com> | 2024-04-04 14:47:32 +0200 |
| commit | 09edece17d837f13f23aab13a546fe3e97a6c223 (patch) | |
| tree | 0bf8eefbede03417b1dd56997d4cd139f1b141b4 /scene/2d/tile_map_layer.h | |
| parent | 7a42afbba050822a66ea5b4c620f6db1b98c49af (diff) | |
| download | redot-engine-09edece17d837f13f23aab13a546fe3e97a6c223.tar.gz | |
[TileMap] Fix forcing cleanup on exiting tree/canvas
Diffstat (limited to 'scene/2d/tile_map_layer.h')
| -rw-r--r-- | scene/2d/tile_map_layer.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scene/2d/tile_map_layer.h b/scene/2d/tile_map_layer.h index da48eb38d9..5861433c8a 100644 --- a/scene/2d/tile_map_layer.h +++ b/scene/2d/tile_map_layer.h @@ -300,7 +300,6 @@ private: bool flags[DIRTY_FLAGS_MAX] = { false }; SelfList<CellData>::List cell_list; } dirty; - bool in_destructor = false; // Rect cache. mutable Rect2 rect_cache; @@ -310,7 +309,7 @@ private: // Runtime tile data. bool _runtime_update_tile_data_was_cleaned_up = false; - void _build_runtime_update_tile_data(); + void _build_runtime_update_tile_data(bool p_force_cleanup); void _build_runtime_update_tile_data_for_cell(CellData &r_cell_data, bool p_use_tilemap_for_runtime, bool p_auto_add_to_dirty_list = false); bool _runtime_update_needs_all_cells_cleaned_up = false; void _clear_runtime_update_tile_data(); @@ -321,13 +320,13 @@ private: HashMap<Vector2i, Ref<DebugQuadrant>> debug_quadrant_map; Vector2i _coords_to_debug_quadrant_coords(const Vector2i &p_coords) const; bool _debug_was_cleaned_up = false; - void _debug_update(); + void _debug_update(bool p_force_cleanup); void _debug_quadrants_update_cell(CellData &r_cell_data, SelfList<DebugQuadrant>::List &r_dirty_debug_quadrant_list); #endif // DEBUG_ENABLED HashMap<Vector2i, Ref<RenderingQuadrant>> rendering_quadrant_map; bool _rendering_was_cleaned_up = false; - void _rendering_update(); + void _rendering_update(bool p_force_cleanup); void _rendering_notification(int p_what); void _rendering_quadrants_update_cell(CellData &r_cell_data, SelfList<RenderingQuadrant>::List &r_dirty_rendering_quadrant_list); void _rendering_occluders_clear_cell(CellData &r_cell_data); @@ -338,7 +337,7 @@ private: HashMap<RID, Vector2i> bodies_coords; // Mapping for RID to coords. bool _physics_was_cleaned_up = false; - void _physics_update(); + void _physics_update(bool p_force_cleanup); void _physics_notification(int p_what); void _physics_clear_cell(CellData &r_cell_data); void _physics_update_cell(CellData &r_cell_data); @@ -347,7 +346,7 @@ private: #endif // DEBUG_ENABLED bool _navigation_was_cleaned_up = false; - void _navigation_update(); + void _navigation_update(bool p_force_cleanup); void _navigation_notification(int p_what); void _navigation_clear_cell(CellData &r_cell_data); void _navigation_update_cell(CellData &r_cell_data); @@ -356,7 +355,7 @@ private: #endif // DEBUG_ENABLED bool _scenes_was_cleaned_up = false; - void _scenes_update(); + void _scenes_update(bool p_force_cleanup); void _scenes_clear_cell(CellData &r_cell_data); void _scenes_update_cell(CellData &r_cell_data); #ifdef DEBUG_ENABLED @@ -376,7 +375,7 @@ private: // Internal updates. void _queue_internal_update(); void _deferred_internal_update(); - void _internal_update(); + void _internal_update(bool p_force_cleanup); protected: void _notification(int p_what); |