Don't force-cleanup already cleaned up TileMap cells
#89809
+25
−22
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kleonc
commented
Mar 23, 2024
Comment on lines
-1680
to
-1694
| // List the cells to delete definitely. | ||
| Vector<Vector2i> to_delete; | ||
| // Remove cells that are empty after the cleanup. | ||
| for (SelfList<CellData> *cell_data_list_element = dirty.cell_list.first(); cell_data_list_element; cell_data_list_element = cell_data_list_element->next()) { | ||
| CellData &cell_data = *cell_data_list_element->self(); | ||
| // Select the cell from tile_map if it is invalid. | ||
| if (cell_data.cell.source_id == TileSet::INVALID_SOURCE) { | ||
| to_delete.push_back(cell_data.coords); | ||
| tile_map.erase(cell_data.coords); | ||
| } | ||
| } | ||
|
|
||
| // Remove cells that are empty after the cleanup. | ||
| for (const Vector2i &coords : to_delete) { | ||
| tile_map.erase(coords); | ||
| } | ||
|
|
There was a problem hiding this comment.
That's kinda unrelated change, is there any reason why it was done like that? 🤔 (could revert that part if so)
|
I can't test because unless I didn't spot it the actions don't create a windows mono artifact. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
AFAICT fixes #89774.
cc @MagmaGuy if you could please test for confirmation.
This seems like a band aid fix though, I'd say there's plenty to improve regarding cleaning/freeing stuff. There should probably be more control about it. E.g. currently when toggling visibility of a TileMapLayer it cleanups all rendering stuff on hiding, and recreates everything on show. Meaning if you'd e.g. want to keep blinking a TileMapLayer (without making any other changes to it) then it would still do all needless freeing/recreating, very inefficient (blinking is of course quite an exteme example). I'd say it should be somehow possible to prevent freeing (and thus recreating), on demand or something like that.