Update to Bevy 0.11

Cargo.toml

@@ -1,36 +1,39 @@
-[package]
-name = "bevy_app_compute"
-version = "0.10.3"
-authors = ["Kjolnyr <[email protected]>"]
-edition = "2021"
-description = "App compute plugin for Bevy"
-repository = "https://github.com/Kjolnyr/bevy_app_compute"
-homepage = "https://github.com/Kjolnyr/bevy_app_compute"
-documentation = "https://docs.rs/bevy_app_compute"
-license = "MIT OR Apache-2.0"
-readme = "README.md"
-categories = ["game-development"]
-
-
-[dependencies]
-bevy = "0.10.1"
-parking_lot = "0.12.1"
-wgpu = "0.15.1"
-codespan-reporting = "0.11.1"
-futures-lite = "1.13.0"
-bytemuck = "1.13.1"
-
-[dev-dependencies]
-rand = "0.8.5"
-
-[[example]]
-name = "simple"
-
-[[example]]
-name = "multi_pass"
-
-[[example]]
-name = "one_shot"
-
-[[example]]
-name = "boids"
+[package]
+name = "bevy_app_compute"
+version = "0.11.0"
+authors = ["Kjolnyr <[email protected]>"]
+edition = "2021"
+description = "App compute plugin for Bevy"
+repository = "https://github.com/Kjolnyr/bevy_app_compute"
+homepage = "https://github.com/Kjolnyr/bevy_app_compute"
+documentation = "https://docs.rs/bevy_app_compute"
+license = "MIT OR Apache-2.0"
+readme = "README.md"
+categories = ["game-development"]
+
+
+[dependencies]
+bevy = "0.11"
+parking_lot = "0.12.1"
+wgpu = { version = "0.16.0", features = ["naga"] }
+codespan-reporting = "0.11.1"
+futures-lite = "1.13.0"
+bytemuck = "1.4.0"
+naga = { version = "0.12.0", features = ["wgsl-in"] }
+naga_oil = "0.8.0"
+
+[dev-dependencies]
+rand = "0.8.5"
+bevy = { version = "0.11", features = ["wayland"] }
+
+[[example]]
+name = "simple"
+
+[[example]]
+name = "multi_pass"
+
+[[example]]
+name = "one_shot"
+
+[[example]]
+name = "boids"

README.md

@@ -13,7 +13,7 @@ Add the following line to your `Cargo.toml`
 
 ```toml
 [dependencies]
-bevy_app_compute = "0.10.3"
+bevy_app_compute = "0.11.0"
 ```
 
 ## Usage
@@ -86,8 +86,8 @@ use bevy_app_compute::AppComputePlugin;
 
 fn main() {
     App::new()
-        .add_plugin(AppComputePlugin)
-        .add_plugin(AppComputeWorkerPlugin::<SimpleComputeWorker>::default());
+        .add_plugins(AppComputePlugin)
+        .add_plugins(AppComputeWorkerPlugin::<SimpleComputeWorker>::default());
 }
 ```
 
@@ -184,4 +184,5 @@ See [examples](https://github.com/kjolnyr/bevy_app_compute/tree/main/examples)
 |Bevy|bevy_app_compute|
 |---|---|
 |main|main|
-|0.10|0.10.3|
+|0.10|0.10.3|
+|0.11|0.11.0|

examples/boids.rs

@@ -96,13 +96,15 @@ impl ComputeWorker for BoidWorker {
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(LogDiagnosticsPlugin::default())
-        .add_plugin(FrameTimeDiagnosticsPlugin::default())
-        .add_plugin(AppComputePlugin)
-        .add_plugin(AppComputeWorkerPlugin::<BoidWorker>::default())
+        .add_plugins((
+            LogDiagnosticsPlugin::default(),
+            FrameTimeDiagnosticsPlugin,
+            AppComputePlugin,
+            AppComputeWorkerPlugin::<BoidWorker>::default(),
+        ))
         .insert_resource(ClearColor(Color::DARK_GRAY))
-        .add_startup_system(setup)
-        .add_system(move_entities)
+        .add_systems(Startup, setup)
+        .add_systems(Update, move_entities)
         .run()
 }
 

examples/multi_pass.rs

@@ -1,63 +1,65 @@
-//! Example showing how to have multiple passes
-
-use bevy::{prelude::*, reflect::TypeUuid, render::render_resource::ShaderRef};
-use bevy_app_compute::prelude::*;
-
-#[derive(TypeUuid)]
-#[uuid = "5a4f7163-88cd-4a59-94c7-fb51abe389b8"]
-struct FirstPassShader;
-
-impl ComputeShader for FirstPassShader {
-    fn shader() -> ShaderRef {
-        "shaders/first_pass.wgsl".into()
-    }
-}
-
-#[derive(TypeUuid)]
-#[uuid = "7ada0206-7871-404b-b197-5e2477e7073f"]
-struct SecondPassShader;
-
-impl ComputeShader for SecondPassShader {
-    fn shader() -> ShaderRef {
-        "shaders/second_pass.wgsl".into()
-    }
-}
-
-#[derive(Resource)]
-struct SimpleComputeWorker;
-
-impl ComputeWorker for SimpleComputeWorker {
-    fn build(world: &mut World) -> AppComputeWorker<Self> {
-        let worker = AppComputeWorkerBuilder::new(world)
-            .add_uniform("value", &3.)
-            .add_storage("input", &[1., 2., 3., 4.])
-            .add_staging("output", &[0f32; 4])
-            .add_pass::<FirstPassShader>([4, 1, 1], &["value", "input", "output"]) // add each item + `value` from `input` to `output`
-            .add_pass::<SecondPassShader>([4, 1, 1], &["output"]) // multiply each element of `output` by itself
-            .build();
-
-        // [1. + 3., 2. + 3., 3. + 3., 4. + 3.] = [4., 5., 6., 7.]
-        // [4. * 4., 5. * 5., 6. * 6., 7. * 7.] = [16., 25., 36., 49.]
-
-        worker
-    }
-}
-
-fn main() {
-    App::new()
-        .add_plugins(DefaultPlugins)
-        .add_plugin(AppComputePlugin)
-        .add_plugin(AppComputeWorkerPlugin::<SimpleComputeWorker>::default())
-        .add_system(test)
-        .run();
-}
-
-fn test(compute_worker: Res<AppComputeWorker<SimpleComputeWorker>>) {
-    if !compute_worker.ready() {
-        return;
-    };
-
-    let result: Vec<f32> = compute_worker.read_vec("output");
-
-    println!("got {:?}", result) // [16., 25., 36., 49.]
-}
+//! Example showing how to have multiple passes
+
+use bevy::{prelude::*, reflect::TypeUuid, render::render_resource::ShaderRef};
+use bevy_app_compute::prelude::*;
+
+#[derive(TypeUuid)]
+#[uuid = "5a4f7163-88cd-4a59-94c7-fb51abe389b8"]
+struct FirstPassShader;
+
+impl ComputeShader for FirstPassShader {
+    fn shader() -> ShaderRef {
+        "shaders/first_pass.wgsl".into()
+    }
+}
+
+#[derive(TypeUuid)]
+#[uuid = "7ada0206-7871-404b-b197-5e2477e7073f"]
+struct SecondPassShader;
+
+impl ComputeShader for SecondPassShader {
+    fn shader() -> ShaderRef {
+        "shaders/second_pass.wgsl".into()
+    }
+}
+
+#[derive(Resource)]
+struct SimpleComputeWorker;
+
+impl ComputeWorker for SimpleComputeWorker {
+    fn build(world: &mut World) -> AppComputeWorker<Self> {
+        let worker = AppComputeWorkerBuilder::new(world)
+            .add_uniform("value", &3.)
+            .add_storage("input", &[1., 2., 3., 4.])
+            .add_staging("output", &[0f32; 4])
+            .add_pass::<FirstPassShader>([4, 1, 1], &["value", "input", "output"]) // add each item + `value` from `input` to `output`
+            .add_pass::<SecondPassShader>([4, 1, 1], &["output"]) // multiply each element of `output` by itself
+            .build();
+
+        // [1. + 3., 2. + 3., 3. + 3., 4. + 3.] = [4., 5., 6., 7.]
+        // [4. * 4., 5. * 5., 6. * 6., 7. * 7.] = [16., 25., 36., 49.]
+
+        worker
+    }
+}
+
+fn main() {
+    App::new()
+        .add_plugins(DefaultPlugins)
+        .add_plugins((
+            AppComputePlugin,
+            AppComputeWorkerPlugin::<SimpleComputeWorker>::default(),
+        ))
+        .add_systems(Update, test)
+        .run();
+}
+
+fn test(compute_worker: Res<AppComputeWorker<SimpleComputeWorker>>) {
+    if !compute_worker.ready() {
+        return;
+    };
+
+    let result: Vec<f32> = compute_worker.read_vec("output");
+
+    println!("got {:?}", result) // [16., 25., 36., 49.]
+}

examples/one_shot.rs

@@ -1,63 +1,64 @@
-//! Example showing how to execute compute shaders on demand
-
-use bevy::{prelude::*, reflect::TypeUuid, render::render_resource::ShaderRef};
-use bevy_app_compute::prelude::*;
-
-#[derive(TypeUuid)]
-#[uuid = "2545ae14-a9bc-4f03-9ea4-4eb43d1075a7"]
-struct SimpleShader;
-
-impl ComputeShader for SimpleShader {
-    fn shader() -> ShaderRef {
-        "shaders/simple.wgsl".into()
-    }
-}
-
-#[derive(Resource)]
-struct SimpleComputeWorker;
-
-impl ComputeWorker for SimpleComputeWorker {
-    fn build(world: &mut World) -> AppComputeWorker<Self> {
-        let worker = AppComputeWorkerBuilder::new(world)
-            .add_uniform("uni", &5.)
-            .add_staging("values", &[1., 2., 3., 4.])
-            .add_pass::<SimpleShader>([4, 1, 1], &["uni", "values"])
-            .one_shot()
-            .build();
-
-        worker
-    }
-}
-
-fn main() {
-    App::new()
-        .add_plugins(DefaultPlugins)
-        .add_plugin(AppComputePlugin)
-        .add_plugin(AppComputeWorkerPlugin::<SimpleComputeWorker>::default())
-        .add_system(on_click_compute)
-        .add_system(read_data)
-        .run();
-}
-
-fn on_click_compute(
-    buttons: Res<Input<MouseButton>>,
-    mut compute_worker: ResMut<AppComputeWorker<SimpleComputeWorker>>,
-) {
-    if !buttons.just_pressed(MouseButton::Left) {
-        return;
-    }
-
-    compute_worker.execute();
-}
-
-fn read_data(mut compute_worker: ResMut<AppComputeWorker<SimpleComputeWorker>>) {
-    if !compute_worker.ready() {
-        return;
-    };
-
-    let result: Vec<f32> = compute_worker.read_vec("values");
-
-    compute_worker.write_slice("values", &result);
-
-    println!("got {:?}", result)
-}
+//! Example showing how to execute compute shaders on demand
+
+use bevy::{prelude::*, reflect::TypeUuid, render::render_resource::ShaderRef};
+use bevy_app_compute::prelude::*;
+
+#[derive(TypeUuid)]
+#[uuid = "2545ae14-a9bc-4f03-9ea4-4eb43d1075a7"]
+struct SimpleShader;
+
+impl ComputeShader for SimpleShader {
+    fn shader() -> ShaderRef {
+        "shaders/simple.wgsl".into()
+    }
+}
+
+#[derive(Resource)]
+struct SimpleComputeWorker;
+
+impl ComputeWorker for SimpleComputeWorker {
+    fn build(world: &mut World) -> AppComputeWorker<Self> {
+        let worker = AppComputeWorkerBuilder::new(world)
+            .add_uniform("uni", &5.)
+            .add_staging("values", &[1., 2., 3., 4.])
+            .add_pass::<SimpleShader>([4, 1, 1], &["uni", "values"])
+            .one_shot()
+            .build();
+
+        worker
+    }
+}
+
+fn main() {
+    App::new()
+        .add_plugins(DefaultPlugins)
+        .add_plugins((
+            AppComputePlugin,
+            AppComputeWorkerPlugin::<SimpleComputeWorker>::default(),
+        ))
+        .add_systems(Update, (read_data, on_click_compute))
+        .run();
+}
+
+fn on_click_compute(
+    buttons: Res<Input<MouseButton>>,
+    mut compute_worker: ResMut<AppComputeWorker<SimpleComputeWorker>>,
+) {
+    if !buttons.just_pressed(MouseButton::Left) {
+        return;
+    }
+
+    compute_worker.execute();
+}
+
+fn read_data(mut compute_worker: ResMut<AppComputeWorker<SimpleComputeWorker>>) {
+    if !compute_worker.ready() {
+        return;
+    };
+
+    let result: Vec<f32> = compute_worker.read_vec("values");
+
+    compute_worker.write_slice("values", &result);
+
+    println!("got {:?}", result)
+}

examples/simple.rs

@@ -31,9 +31,11 @@ impl ComputeWorker for SimpleComputeWorker {
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(AppComputePlugin)
-        .add_plugin(AppComputeWorkerPlugin::<SimpleComputeWorker>::default())
-        .add_system(test)
+        .add_plugins((
+            AppComputePlugin,
+            AppComputeWorkerPlugin::<SimpleComputeWorker>::default(),
+        ))
+        .add_systems(Update, test)
         .run();
 }