Merge pull request #976 from tychedelia/compute-fn

Add `compute` app function for running compute shaders
nannou-org · Sep 16, 2024 · 83a59b6 · 83a59b6
2 parents 6f2532a + beaf6b7
commit 83a59b6
Show file tree

Hide file tree

Showing 31 changed files with 2,638 additions and 1,160 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,9 +30,9 @@ bevy_egui = { git = "https://github.com/tychedelia/bevy_egui", branch = "main" }
 bevy-inspector-egui = { git = "https://github.com/tychedelia/bevy-inspector-egui", branch = "main" }
 image = "0.25"
 rayon = "1.10"
-bevy_common_assets = "0.11.0"
+bevy_common_assets = { git = "https://github.com/tychedelia/bevy_common_assets", branch = "main" }
 serde = "1"
 serde_json = "1"
 toml = "0.8"
 serde_yaml = "0.9"
-wgpu = "22.0"
+wgpu = "22.0"
diff --git a/bevy_nannou/src/lib.rs b/bevy_nannou/src/lib.rs
@@ -17,7 +17,7 @@ pub mod prelude {
     pub use bevy_nannou_draw::color::*;
     pub use bevy_nannou_draw::draw::*;
     pub use bevy_nannou_draw::render::blend::*;
-    pub use bevy_nannou_draw::render::NannouMaterialPlugin;
+    pub use bevy_nannou_draw::render::NannouShaderModelPlugin;
     pub use bevy_nannou_draw::text::*;
     pub use bevy_nannou_draw::*;
 

diff --git a/bevy_nannou_draw/src/draw/drawing.rs b/bevy_nannou_draw/src/draw/drawing.rs
@@ -35,7 +35,7 @@ where
     // The draw command index of the material being used.
     pub(crate) material_index: usize,
     // Whether the **Drawing** should attempt to finish the drawing on drop.
-    finish_on_drop: bool,
+    pub(crate) finish_on_drop: bool,
     // The node type currently being drawn.
     _ty: PhantomData<T>,
 }