update to bevy 0.5

.github/workflows/check.yml

@@ -31,10 +31,10 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         features: [
-            'bevy/x11,bevy/png,bevy/bevy_wgpu',
-            'bevy/x11,bevy/png,bevy/bevy_wgpu,manage_clipboard',
-            'bevy/x11,bevy/png,bevy/bevy_wgpu,open_url',
-            'bevy/x11,bevy/png,bevy/bevy_wgpu,manage_clipboard,open_url',
+            '',
+            'manage_clipboard',
+            'open_url',
+            'manage_clipboard,open_url',
         ]
     steps:
       - uses: actions/checkout@v2

Cargo.toml

@@ -7,6 +7,7 @@ license = "MIT"
 edition = "2018"
 repository = "https://github.com/mvlabat/bevy_egui"
 exclude = ["assets/**/*", ".github/**/*"]
+resolver = "2"
 
 [package.metadata.docs.rs]
 no-default-features = true # clipboard crate fails the build currently https://github.com/rust-lang/docs.rs/issues/695
@@ -19,9 +20,8 @@ manage_clipboard = ["clipboard", "thread_local"]
 open_url = ["webbrowser"]
 
 [dependencies]
-bevy = { version = "0.4", default-features = false, features = ["render"] }
-bevy_winit = "0.4.0"
-egui = "0.10.0"
+bevy = { version = "0.5", default-features = false, features = ["render", "bevy_winit"] }
+egui = "0.11.0"
 webbrowser = { version = "0.5.5", optional = true }
 winit = { version = "0.24.0", features = ["x11"], default-features = false }
 
@@ -32,7 +32,5 @@ thread_local = { version = "1.1.0", optional = true }
 [dev-dependencies]
 version-sync = "0.9.2"
 
-[[example]]
-name = "ui"
-path = "examples/ui.rs"
-required-features = ["bevy/x11", "bevy/png", "bevy/bevy_wgpu"]
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
+bevy = { version = "0.5", default-features = false, features = ["bevy_wgpu", "x11", "png"] }

README.md

@@ -22,15 +22,15 @@ that require additional crates, can be disabled.
 
 An example WASM project is live at [mvlabat.github.io/bevy_egui_web_showcase](https://mvlabat.github.io/bevy_egui_web_showcase/index.html) [[source](https://github.com/mvlabat/bevy_egui_web_showcase)].
 
-**Note** that in order to use `bevy_egui`in WASM you need [bevy_webgl2](https://github.com/mrk-its/bevy_webgl2) of at least `0.4.1` version.
+**Note** that in order to use `bevy_egui`in WASM you need [bevy_webgl2](https://github.com/mrk-its/bevy_webgl2) of at least `0.5.0` version.
 
 ## Usage
 
 Here's a minimal usage example:
 ```toml
 # Cargo.toml
 [dependencies]
-bevy = "0.4"
+bevy = "0.5"
 bevy_egui = "0.3"
 ```
 
@@ -57,10 +57,17 @@ fn ui_example(mut egui_context: ResMut<EguiContext>) {
 For a more advanced example, see [examples/ui.rs](examples/ui.rs).
 
 ```bash
-cargo run --example ui --features="bevy/x11 bevy/png bevy/bevy_wgpu"
+cargo run --example ui
 ```
 
 ## See also
 
 - [`jakobhellermann/bevy-inspector-egui`](https://github.com/jakobhellermann/bevy-inspector-egui)
 - [`mvlabat/bevy_megaui`](https://github.com/mvlabat/bevy_megaui)
+
+## Bevy support table
+
+|bevy|bevy_egui|
+|---|---|
+|0.5|0.4|
+|0.4|0.1-0.3|

examples/ui.rs

@@ -5,8 +5,9 @@ const BEVY_TEXTURE_ID: u64 = 0;
 
 fn main() {
     App::build()
-        .add_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)))
-        .add_resource(Msaa { samples: 4 })
+        .insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)))
+        .insert_resource(Msaa { samples: 4 })
+        .init_resource::<UiState>()
         .add_plugins(DefaultPlugins)
         .add_plugin(EguiPlugin)
         .add_startup_system(load_assets.system())
@@ -23,11 +24,8 @@ struct UiState {
     inverted: bool,
 }
 
-fn load_assets(_world: &mut World, resources: &mut Resources) {
-    let mut egui_context = resources.get_mut::<EguiContext>().unwrap();
-    let asset_server = resources.get::<AssetServer>().unwrap();
-
-    let texture_handle = asset_server.load("icon.png");
+fn load_assets(mut egui_context: ResMut<EguiContext>, assets: Res<AssetServer>) {
+    let texture_handle = assets.load("icon.png");
     egui_context.set_egui_texture(BEVY_TEXTURE_ID, texture_handle);
 }
 
@@ -37,12 +35,12 @@ fn update_ui_scale_factor(mut egui_settings: ResMut<EguiSettings>, windows: Res<
     }
 }
 
-fn ui_example(_world: &mut World, resources: &mut Resources) {
-    resources.get_or_insert_with(UiState::default);
-
-    let mut egui_ctx = resources.get_mut::<EguiContext>().unwrap();
+fn ui_example(
+    mut egui_ctx: ResMut<EguiContext>,
+    mut ui_state: ResMut<UiState>,
+    assets: Res<AssetServer>,
+) {
     let ctx = &mut egui_ctx.ctx;
-    let mut ui_state = resources.get_mut::<UiState>().unwrap();
 
     let mut load = false;
     let mut remove = false;
@@ -56,7 +54,7 @@ fn ui_example(_world: &mut World, resources: &mut Resources) {
             ui.text_edit_singleline(&mut ui_state.label);
         });
 
-        ui.add(egui::Slider::f32(&mut ui_state.value, 0.0..=10.0).text("value"));
+        ui.add(egui::Slider::new(&mut ui_state.value, 0.0..=10.0).text("value"));
         if ui.button("Increment").clicked() {
             ui_state.value += 1.0;
         }
@@ -121,11 +119,10 @@ fn ui_example(_world: &mut World, resources: &mut Resources) {
         ui_state.inverted = !ui_state.inverted;
     }
     if load || invert {
-        let asset_server = resources.get::<AssetServer>().unwrap();
         let texture_handle = if ui_state.inverted {
-            asset_server.load("icon_inverted.png")
+            assets.load("icon_inverted.png")
         } else {
-            asset_server.load("icon.png")
+            assets.load("icon.png")
         };
         egui_ctx.set_egui_texture(BEVY_TEXTURE_ID, texture_handle);
     }