Merge branch 'master' into ch-shader-defs

Author: yrns

.gitignore

@@ -3,6 +3,7 @@ crates/*/target
 **/*.rs.bk
 Cargo.lock
 .cargo/config
+.cargo/config.toml
 /.idea
 /.vscode
-/benches/target
+/benches/target

CHANGELOG.md

@@ -23,6 +23,8 @@ current changes on git with [previous release tags][git_tag_comparison].
 - [Added new Bevy reflection system][926]
   - Replaces the properties system
 - [Add removal_detection example][945]
+- [Add support for Apple Silicon][928]
+- [Allow windows to be maximized][1001]
 
 ### Changed
 
@@ -39,6 +41,7 @@ current changes on git with [previous release tags][git_tag_comparison].
 - [Use `mailbox` instead of `fifo` for vsync on supported systems][920]
 - [Break out Visible component from Draw][1034]
   - Users setting `Draw::is_visible` or `Draw::is_transparent` should now set `Visible::is_visible` and `Visible::is_transparent`
+- [`winit` upgraded from version 0.23 to version 0.24][1043]
 
 ### Fixed
 
@@ -66,11 +69,14 @@ current changes on git with [previous release tags][git_tag_comparison].
 [917]: https://github.com/bevyengine/bevy/pull/917
 [920]: https://github.com/bevyengine/bevy/pull/920
 [926]: https://github.com/bevyengine/bevy/pull/926
+[928]: https://github.com/bevyengine/bevy/pull/928
 [931]: https://github.com/bevyengine/bevy/pull/931
 [934]: https://github.com/bevyengine/bevy/pull/934
 [945]: https://github.com/bevyengine/bevy/pull/945
 [955]: https://github.com/bevyengine/bevy/pull/955
+[1001]: https://github.com/bevyengine/bevy/pull/1001
 [1034]: https://github.com/bevyengine/bevy/pull/1034
+[1043]: https://github.com/bevyengine/bevy/pull/1043
 
 ## Version 0.3.0 (2020-11-03)
 

Cargo.toml

@@ -177,6 +177,10 @@ path = "examples/asset/asset_loading.rs"
 name = "custom_asset"
 path = "examples/asset/custom_asset.rs"
 
+[[example]]
+name = "custom_asset_io"
+path = "examples/asset/custom_asset_io.rs"
+
 [[example]]
 name = "audio"
 path = "examples/audio/audio.rs"
@@ -193,10 +197,18 @@ path = "examples/diagnostics/print_diagnostics.rs"
 name = "event"
 path = "examples/ecs/event.rs"
 
+[[example]]
+name = "fixed_timestep"
+path = "examples/ecs/fixed_timestep.rs"
+
 [[example]]
 name = "startup_system"
 path = "examples/ecs/startup_system.rs"
 
+[[example]]
+name = "state"
+path = "examples/ecs/state.rs"
+
 [[example]]
 name = "system_chaining"
 path = "examples/ecs/system_chaining.rs"

crates/bevy_app/src/app.rs

@@ -1,5 +1,5 @@
 use crate::app_builder::AppBuilder;
-use bevy_ecs::{ParallelExecutor, Resources, Schedule, World};
+use bevy_ecs::{Resources, Schedule, World};
 #[cfg(feature = "trace")]
 use bevy_utils::tracing::info_span;
 
@@ -30,9 +30,6 @@ pub struct App {
     pub resources: Resources,
     pub runner: Box<dyn Fn(App)>,
     pub schedule: Schedule,
-    pub executor: ParallelExecutor,
-    pub startup_schedule: Schedule,
-    pub startup_executor: ParallelExecutor,
 }
 
 impl Default for App {
@@ -41,16 +38,12 @@ impl Default for App {
             world: Default::default(),
             resources: Default::default(),
             schedule: Default::default(),
-            executor: Default::default(),
-            startup_schedule: Default::default(),
-            startup_executor: ParallelExecutor::without_tracker_clears(),
             runner: Box::new(run_once),
         }
     }
 }
 
 fn run_once(mut app: App) {
-    app.initialize();
     app.update();
 }
 
@@ -61,34 +54,15 @@ impl App {
 
     pub fn update(&mut self) {
         self.schedule
-            .initialize(&mut self.world, &mut self.resources);
-        self.executor
-            .run(&mut self.schedule, &mut self.world, &mut self.resources);
-    }
-
-    pub fn initialize(&mut self) {
-        #[cfg(feature = "trace")]
-        let startup_schedule_span = info_span!("startup_schedule");
-        #[cfg(feature = "trace")]
-        let _startup_schedule_guard = startup_schedule_span.enter();
-        self.startup_schedule
-            .initialize(&mut self.world, &mut self.resources);
-        self.startup_executor.initialize(&mut self.resources);
-        self.startup_executor.run(
-            &mut self.startup_schedule,
-            &mut self.world,
-            &mut self.resources,
-        );
+            .initialize_and_run(&mut self.world, &mut self.resources);
     }
 
     pub fn run(mut self) {
         #[cfg(feature = "trace")]
-        let bevy_app_run_span = info_span!("bevy_app_run");
+        let bevy_app_run_span = info_span!("bevy_app");
         #[cfg(feature = "trace")]
         let _bevy_app_run_guard = bevy_app_run_span.enter();
 
-        self.executor.initialize(&mut self.resources);
-
         let runner = std::mem::replace(&mut self.runner, Box::new(run_once));
         (runner)(self);
     }