Skip to content
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

Update development branch to Bevy 0.11-dev #132

Merged
merged 28 commits into from
May 28, 2023
Merged

Update development branch to Bevy 0.11-dev #132

merged 28 commits into from
May 28, 2023

Conversation

eerii
Copy link
Contributor

@eerii eerii commented Apr 15, 2023

This bumps the bevy_main branch with added support for the current development version of bevy, as well as the new commits from the main branch.

The most notable change is the deprecation of add_system in favor of a more general add_systems that takes the schedule as a first parameter bevyengine/bevy#8079. All the examples, tests and source files were revised with this new standard.

Base sets are no longer needed so LoadingStateSet was removed. However, with bevyengine/bevy#8079 the ability to order sets between schedules was lost. Since the work that was done with the base set had ro be run after StateTransition, I added them to the Update stage, and it seems to work fine. However, if more fine control is needed, a new schedule can be created for them and using MainScheduleOrder it can be placed between StateTransition and Update. However, ordering sets between existing schedules seems to be encouraged.

Another change is that State now can't be accessed directly through its tuple field. A new .get() method can be used to get a reference. This works fine in most places, but reset_loading_state and run_loading_state were previously mutating the state through this field, which now is not allowed. The proposed workaround is to remove the internal state resource and add it again with the value we want. I am unsure if this is the best way to do it but couldn't find another that worked.

Other than that, all examples and tests were ran and everything seems to be working fine.

Note: While the bevy_common_assets dependency has already merged the update to bevy_main, the IyesGames/iyes_progress#23 PR is still in progress, so for now the Cargo.toml links to my fork's branch. This has to be changed once the PR is merged.

NiklasEi and others added 22 commits February 28, 2023 23:17
…windows

Compare paths instead of strings in full_collection example
Use `.track_progress()` in iyes_progress example
…pendencies

Remove features for optional dependencies and bump bevy_common_assets
Mention asset unloading in the readme
…_state

Mention adding the default plugins before configuring a loading state
…_criteria

Workaround for correct scheduling with non default exit criteria
@eerii
Copy link
Contributor Author

eerii commented Apr 16, 2023

Sorry, I forgot to test with features enabled and one OnUpdate slipped by, should be fixed now.

striezel and others added 3 commits April 21, 2023 01:56
The following updates are performed:
* update actions/checkout to v3
* update actions/cache to v3
Update actions on GitHub Actions workflows
Basically all of the `actions-rs/*` actions are unmaintained. See
<actions-rs/toolchain#216> for more
information. Due to their age they generate several warnings in
CI runs.

To get rid of those warnings the occurrences of
`actions-rs/toolchain` are replaced by `dtolnay/rust-toolchain`.
Copy link
Owner

@NiklasEi NiklasEi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks for doing this. Could we keep the former base set around as a normal set? Users might want to order systems against the loading state.

NiklasEi and others added 2 commits April 23, 2023 00:04
…acement

Replace unmaintained actions-rs/toolchain action in CI workflows
@eerii
Copy link
Contributor Author

eerii commented Apr 24, 2023

Absolutely, it is added back on. Let me know if there is anything else you want me to check! I also updated it to match the last main commits.

@NiklasEi NiklasEi merged commit f8b37ff into NiklasEi:bevy_main May 28, 2023
@NiklasEi
Copy link
Owner

Thank you :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants