[Merged by Bors] - Fix hot reloading for read_asset_bytes #6797
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
SpecificProtagonist
force-pushed
the
read_asset_bytes
branch
2 times, most recently
from
a46a80d to
468f2f7
Compare
alice-i-cecile
added
C-Bug
|
bors try |
alice-i-cecile
approved these changes
Jan 11, 2023
tryBuild failed: |
SpecificProtagonist
force-pushed
the
read_asset_bytes
branch
from
c766d16 to
dce6a63
Compare
|
Had updated the wasm code but forgot about Android; fixed now. |
|
Awesome thank you |
mockersf
reviewed
Feb 6, 2023
crates/bevy_asset/src/io/mod.rs
Outdated
Comment on lines
71
to
73
| /// Otherwise, if `to_watch` gets modified, trigger a reload for `to_reload`. | ||
| /// Note that multiple `to_reload` paths can map to the same `to_watch` and | ||
| /// multiple `to_watch` paths can map to the same `to_reload`. |
There was a problem hiding this comment.
Could you add more details on why someone calling this method would want to provide two different paths?
There was a problem hiding this comment.
Does
The paths differ when an asset found at `to_reload` depends on data found at `to_watch`.
suffice?
mockersf
reviewed
Feb 6, 2023
crates/bevy_asset/src/io/mod.rs
Outdated
Comment on lines
76
to
77
| to_watch: &Path, | ||
| to_reload: PathBuf, |
There was a problem hiding this comment.
It seems they will often be the same path, could to_reload be an option in that case?
There was a problem hiding this comment.
Done 👍
SpecificProtagonist
force-pushed
the
read_asset_bytes
branch
from
dce6a63 to
953440b
Compare
SpecificProtagonist
force-pushed
the
read_asset_bytes
branch
from
953440b to
56ef85e
Compare
alice-i-cecile
approved these changes
Feb 6, 2023
|
Example |
Managed to miss the change in the |
|
bors try |
cart
approved these changes
Mar 2, 2023
|
bors r+ |
bors bot
pushed a commit
that referenced
this pull request
Mar 2, 2023
# Objective Fixes #6780 ## Solution - record the asset path of each watched file - call `AssetIo::watch_for_changes` in `LoadContext::read_asset_bytes` --- ## Changelog ### Fixed - fixed hot reloading for `LoadContext::read_asset_bytes` ### Changed - `AssetIo::watch_path_for_changes` allows watched path and path to reload to differ ## Migration Guide - for custom `AssetIo`s, differentiate paths to watch and asset paths to reload as a consequence Co-authored-by: Vincent Junge <specificprotagonist@posteo.org>
|
Pull request successfully merged into main. Build succeeded:
|
bors
bot
changed the title
Shfty
pushed a commit
to shfty-rust/bevy
that referenced
this pull request
Mar 19, 2023
# Objective Fixes bevyengine#6780 ## Solution - record the asset path of each watched file - call `AssetIo::watch_for_changes` in `LoadContext::read_asset_bytes` --- ## Changelog ### Fixed - fixed hot reloading for `LoadContext::read_asset_bytes` ### Changed - `AssetIo::watch_path_for_changes` allows watched path and path to reload to differ ## Migration Guide - for custom `AssetIo`s, differentiate paths to watch and asset paths to reload as a consequence Co-authored-by: Vincent Junge <specificprotagonist@posteo.org>
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 #6780
Solution
AssetIo::watch_for_changesinLoadContext::read_asset_bytesChangelog
Fixed
LoadContext::read_asset_bytesChanged
AssetIo::watch_path_for_changesallows watched path and path to reload to differMigration Guide
AssetIos, differentiate paths to watch and asset paths to reload as a consequence