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.

Sign up for GitHub

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

Jump to bottom

Observed entity query data fetching: Trigger<FooEvent, (), (&mut Foo, &Bar)> #15698

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Observed entity query data fetching: Trigger<FooEvent, (), (&mut Foo, &Bar)> #15698

wants to merge 5 commits into from
+527 −132

Conversation

ItsDoot
Copy link
Contributor

@ItsDoot ItsDoot commented Oct 7, 2024

Objective

  • Describe the objective or issue this PR addresses.
  • If you're fixing a specific issue, say "Fixes #X".

Solution

  • Describe the solution used to achieve the objective above.

Testing

  • Did you test these changes? If so, how?
  • Are there any parts that need more testing?
  • How can other people (reviewers) test your changes? Is there anything specific they need to know?
  • If relevant, what platforms did you test these changes on, and are there any important ones you can't test?

Showcase

This section is optional. If this PR does not include a visual change or does not add a new feature, you can delete this section.

  • Help others understand the result of this PR by showcasing your awesome work!
  • If this PR adds a new feature or public API, consider adding a brief pseudo-code snippet of it in action
  • If this PR includes a visual change, consider adding a screenshot, GIF, or video
    • If you want, you could even include a before/after comparison!
  • If the Migration Guide adequately covers the changes, you can delete this section

While a showcase should aim to be brief and digestible, you can use a toggleable section to save space on longer showcases:

Click to view showcase 
println!("My super cool code.");

Migration Guide

This section is optional. If there are no breaking changes, you can delete this section.

  • If this PR is a breaking change (relative to the last release of Bevy), describe how a user might need to migrate their code to support these changes
  • Simply adding new functionality is not a breaking change.
  • Fixing behavior that was definitely a bug, rather than a questionable design choice is not a breaking change.

ItsDoot
ItsDoot commented Oct 7, 2024
View reviewed changes
crates/bevy_ecs/src/system/combinator.rs
// SAFETY: Delegate to other `System` implementations.
unsafe { self.a.validate_param_unsafe(world) && self.b.validate_param_unsafe(world) }
unsafe {
// TODO
Copy link
Contributor Author

Choose a reason for hiding this comment

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

TODO. Unsure how to handle validating the second system.

ItsDoot
ItsDoot commented Oct 7, 2024
View reviewed changes
crates/bevy_ecs/src/system/combinator.rs
fn validate_param(&mut self, world: &World) -> bool {
self.a.validate_param(world) && self.b.validate_param(world)
fn validate_param(&mut self, input: &SystemIn<'_, Self>, world: &World) -> bool {
// TODO
Copy link
Contributor Author

Choose a reason for hiding this comment

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

TODO. Unsure how to handle validating the second system.

SkiFire13
SkiFire13 reviewed Oct 7, 2024
View reviewed changes
crates/bevy_ecs/src/system/combinator.rs
@@ -88,7 +88,7 @@ use super::{IntoSystem, ReadOnlySystem, System};
label = "invalid system combination",
note = "the inputs and outputs of `{A}` and `{B}` are not compatible with this combiner"
)]
pub trait Combine<A: System, B: System> {
pub trait Combine<A: System<In = Self::In>, B: System<In = Self::In>> {
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't this a breaking change? It will force the two systems to have the same input type, so e.g. piping would no longer be implementable this way (not that bevy's implementation used Combine).

@alice-i-cecile alice-i-cecile added C-Feature A new feature, making something new possible A-ECS Entities, components, systems, and events C-Needs-Release-Note Work that should be called out in the blog due to impact S-Waiting-on-Author The author needs to make changes or address concerns before this can be merged labels Oct 7, 2024
@NthTensor
Copy link
Contributor

Appears to implement #15653.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SkiFire13 SkiFire13 SkiFire13 left review comments

Assignees
No one assigned
Labels
A-ECS Entities, components, systems, and events C-Feature A new feature, making something new possible C-Needs-Release-Note Work that should be called out in the blog due to impact S-Waiting-on-Author The author needs to make changes or address concerns before this can be merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ItsDoot @NthTensor @SkiFire13 @alice-i-cecile