no_default_set > add_default_set

hymm · Jan 24, 2023 · c6a7539 · c6a7539
1 parent fdd5a59
commit c6a7539
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/crates/bevy_ecs/src/scheduling/config.rs b/crates/bevy_ecs/src/scheduling/config.rs
@@ -203,7 +203,7 @@ impl IntoSystemSetConfig for SystemSetConfig {
     }
 
     fn no_default_set(mut self) -> SystemSetConfig {
-        self.graph_info.no_default_set = true;
+        self.graph_info.add_default_set = false;
         self
     }
 
@@ -368,7 +368,7 @@ impl IntoSystemConfig<()> for SystemConfig {
     }
 
     fn no_default_set(mut self) -> SystemConfig {
-        self.graph_info.no_default_set = true;
+        self.graph_info.add_default_set = false;
         self
     }
 

diff --git a/crates/bevy_ecs/src/scheduling/graph_utils.rs b/crates/bevy_ecs/src/scheduling/graph_utils.rs
@@ -67,12 +67,23 @@ pub(crate) enum Ambiguity {
     IgnoreAll,
 }
 
-#[derive(Clone, Default)]
+#[derive(Clone)]
 pub(crate) struct GraphInfo {
     pub(crate) sets: Vec<BoxedSystemSet>,
     pub(crate) dependencies: Vec<Dependency>,
     pub(crate) ambiguous_with: Ambiguity,
-    pub(crate) no_default_set: bool,
+    pub(crate) add_default_set: bool,
+}
+
+impl Default for GraphInfo {
+    fn default() -> Self {
+        GraphInfo {
+            sets: Vec::new(),
+            dependencies: Vec::new(),
+            ambiguous_with: Ambiguity::default(),
+            add_default_set: true,
+        }
+    }
 }
 
 /// Converts 2D row-major pair of indices into a 1D array index.

diff --git a/crates/bevy_ecs/src/scheduling/schedule.rs b/crates/bevy_ecs/src/scheduling/schedule.rs
@@ -374,7 +374,7 @@ impl ScheduleGraph {
         let id = NodeId::System(self.systems.len());
 
         if let [single_set] = graph_info.sets.as_slice() {
-            if single_set.is_system_type() && !graph_info.no_default_set {
+            if single_set.is_system_type() && graph_info.add_default_set {
                 if let Some(default) = self.default_set.as_ref() {
                     graph_info.sets.push(default.dyn_clone());
                 }
@@ -434,7 +434,7 @@ impl ScheduleGraph {
 
         // a system set can be configured multiple times, so this "default check"
         // should only happen the first time `configure_set` is called on it
-        if !already_configured && graph_info.sets.is_empty() && !graph_info.no_default_set {
+        if !already_configured && graph_info.sets.is_empty() && graph_info.add_default_set {
             if let Some(default) = self.default_set.as_ref() {
                 info!("adding system set `{:?}` to default: `{:?}`", set, default);
                 graph_info.sets.push(default.dyn_clone());