Fix GLTF scene dependencies and make full scene renders predictable #10745
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
cart
added
the
A-Assets
djeedai
approved these changes
Nov 26, 2023
Nilirad
reviewed
Nov 26, 2023
| @@ -711,6 +711,13 @@ impl AssetServer { | |||
| .unwrap_or(RecursiveDependencyLoadState::NotLoaded) | |||
| } | |||
|
|
|||
| /// Returns true if the asset and all of its dependencies (recursive) have been loaded. | |||
There was a problem hiding this comment.
Might be worth linking to this from the standard is_loaded method.
alice-i-cecile
approved these changes
Nov 26, 2023
alice-i-cecile
added
the
S-Ready-For-Final-Review
Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
I'm on board for more tests, but that will require engineering effort that would otherwise delay 0.12.1 so I'm not going to block on that. |
cart
added a commit
that referenced
this pull request
Nov 30, 2023
…10745) # Objective Fixes #10688 There were a number of issues at play: 1. The GLTF loader was not registering Scene dependencies properly. They were being registered at the root instead of on the scene assets. This made `LoadedWithDependencies` fire immediately on load. 2. Recursive labeled assets _inside_ of labeled assets were not being loaded. This only became relevant for scenes after fixing (1) because we now add labeled assets to the nested scene `LoadContext` instead of the root load context. I'm surprised nobody has hit this yet. I'm glad I caught it before somebody hit it. 3. Accessing "loaded with dependencies" state on the Asset Server is boilerplatey + error prone (because you need to manually query two states). ## Solution 1. In GltfLoader, use a nested LoadContext for scenes and load dependencies through that context. 2. In the `AssetServer`, load labeled assets recursively. 3. Added a simple `asset_server.is_loaded_with_dependencies(id)` I also added some docs to `LoadContext` to help prevent this problem in the future. --- ## Changelog - Added `AssetServer::is_loaded_with_dependencies` - Fixed GLTF Scene dependencies - Fixed nested labeled assets not being loaded --------- Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
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.
Objective
Fixes #10688
There were a number of issues at play:
LoadedWithDependenciesfire immediately on load.LoadContextinstead of the root load context. I'm surprised nobody has hit this yet. I'm glad I caught it before somebody hit it.Solution
AssetServer, load labeled assets recursively.asset_server.is_loaded_with_dependencies(id)I also added some docs to
LoadContextto help prevent this problem in the future.Changelog
AssetServer::is_loaded_with_dependencies