-
-
Notifications
You must be signed in to change notification settings - Fork 21.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix FileSystem dock won't show any file folders (reverted) #92650
Fix FileSystem dock won't show any file folders (reverted) #92650
Conversation
552d1bf
to
7a4c9bc
Compare
I need your advise... if you look at the issue #85082, one of the problem was that an empty scene was present during the loading. I can let this that way, at lease now, the user as a feedback from the editor. An easy fix for that would be to run the first scan on the matin thread, blocking the user from interacting with the editor. Anyway, if there are files to reimport, the editor does it on the main thread. I could display the progression for the scan in a popup instead of the FileSystem, but the empty scene would still be visible. I guess the perfect solution would be to not show the editor while loading, only progress popups, but I think was would need a lot more work? |
I tested it with my project. I got FileSystemScan, then some new Scan Actions popup, then scene group scan popup and then an awkward 3 or 4 seconds freeze. Though on subsequent launches only the scan was performed, so I think other actions came from version difference.
That's not really a problem, as the changes are not lost. If we really wanted to prevent that, the simplest solution is displaying a fully transparent Control over the whole editor that will block input. |
7a4c9bc
to
94a862f
Compare
Thanks for the review. I definitively still need time to adjust to Godot standard. I'll try to be more careful next time. |
@KoBeWi thanks for testing this PR.
I'm intrigued with the 3 or 4 seconds freeze, it's sounds like what @Zireael07 or @smix8 was explaining on the first load in #47053. Do you have the freeze after a reboot or the next day? I guess I can't have access to your project? Maybe you can explain to me briefly the amount and type of resources you have in your project so I can try to reproduce. Are you on Windows, Linux or Mac? |
It might be related to plugins, autoloads and global scripts. Especially plugins, as I have many of them. Though it was a one-time thing, I'll see if it repeats tomorrow and report back. |
I tested again and it still happened, but only once. Though it's not the same as reported by Zireael and smix, because it's much shorter. I think the original issue with unresponsive editor is covered by the new scan progresses, the remaining time can also come from restoring scenes. I can send you the project if you want to test it, but it's quite big. DM me on the chat. |
94a862f
to
6e27a78
Compare
6e27a78
to
e4a9303
Compare
e4a9303
to
72856d6
Compare
Just rebased following conflicts. |
Thanks! |
Apologies, I jumped the gun on this PR which touches very core parts of the engine, prone to regressions and subtle bugs. I trusted existing reviews and forgot to assess how risky the changes are myself. I think this should be kept for 4.4 as there will be likely be a number of follow-up issues that will be best handled in the 4.4 dev cycle than now as we try to stabilize 4.3. So I'll revert the merge for 4.3, and would suggest reopening a PR with the same changes, that will target 4.4 and require more testing before merge. |
No problem @akien-mga , I'll reopen later! |
Fixes #92335, Fixes #47053 and Fixes #85082
This PR improves:
I tested these modifications with a project having all the files from https://github.com/PMDCollab/SpriteCollab/tree/master/sprite (more than 125000 files and 385Mb).
Before:
FileSystem was empty without any feedback for a couple of minutes and after that the editor was just frozen:
After modifications:
Performance optimization on project scanning before asset importation
For a 30000 files project, it took around 2m50s on startup to scan the project.
After a couple of optimizations, it now takes 1m30s for the same project.
Before:
After:
Causes:
** Edit: Add progression popup for loading editor layout and reopening scenes.