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 to Bevy 0.12. #43

Merged
merged 1 commit into from
Dec 27, 2023

Conversation

pcwalton
Copy link
Contributor

Everything seems to work in both the simple example and in my own app.

The one thing I wasn't sure about was whether to rename the queue_ methods to prepare_ now that they've been moved to the PrepareBindGroups render set. They had to be moved there because in Bevy 0.12 Queue executes before Prepare, whereas this crate expected them to execute in the other order.

Copy link

fmsc-bot bot commented Dec 19, 2023

Atlantis commands can't be run on fork pull requests. To enable, set --allow-fork-prs or, to disable this message, set --silence-fork-pr-errors

Copy link

fmsc-bot bot commented Dec 19, 2023

Error parsing command: EOF found when expecting closing quote

Copy link
Collaborator

@IceSentry IceSentry left a comment

Choose a reason for hiding this comment

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

If the queue -> prepare set change is required then I'd prefer if the systems were renamed.

Other than that LGTM. I'd prefer if the bind group entries api was used, but I'll do that once this PR is merged.

@@ -724,7 +723,8 @@ pub fn render_app_builder(app: &mut App) {
)
.add_systems(
Render,
(queue_infinite_grids, queue_grid_view_bind_groups).in_set(RenderSet::Queue),
(queue_infinite_grids, queue_grid_view_bind_groups)
.in_set(RenderSet::PrepareBindGroups),
Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm not sure I understand why this is necessary. I understand that the sets were reordered but the Queue set should still be used to queue things. I haven't touched this code that much though so it's possible it's doing something incompatible with that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The problem was that you put bind group creation and queuing into the same system, while Bevy 0.12 wants them to be in separate systems. I've split up the logic appropriately.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ah, thank you for the investigation, I didn't implement the crate originally so I wasn't aware of that.

Copy link

fmsc-bot bot commented Dec 22, 2023

Atlantis commands can't be run on fork pull requests. To enable, set --allow-fork-prs or, to disable this message, set --silence-fork-pr-errors

Copy link

fmsc-bot bot commented Dec 22, 2023

Error parsing command: EOF found when expecting closing quote

Everything seems to work in both the simple example and in my own app.
Copy link

fmsc-bot bot commented Dec 22, 2023

Atlantis commands can't be run on fork pull requests. To enable, set --allow-fork-prs or, to disable this message, set --silence-fork-pr-errors

Copy link

fmsc-bot bot commented Dec 22, 2023

Error parsing command: EOF found when expecting closing quote

@pcwalton
Copy link
Contributor Author

OK, I discovered that the shadow was broken, so this PR fixes that too. That required some fairly large surgery. I've also updated the PR to use the bind_group_entries API. Finally, I renamed the queue methods to prepare and/or split them out into separate methods as appropriate.

This should be ready to go now.

@pcwalton pcwalton requested a review from IceSentry December 22, 2023 05:02
Copy link
Collaborator

@IceSentry IceSentry left a comment

Choose a reason for hiding this comment

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

Thank you very much for all the work!

@IceSentry IceSentry enabled auto-merge (squash) December 27, 2023 22:52
@IceSentry IceSentry disabled auto-merge December 27, 2023 22:55
@aevyrie aevyrie merged commit 5897bb6 into ForesightMiningSoftwareCorporation:main Dec 27, 2023
9 of 11 checks passed
@aevyrie
Copy link
Contributor

aevyrie commented Dec 27, 2023

Thanks @pcwalton!

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.

3 participants