Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add compute app function for running compute shaders #976

Merged
merged 22 commits into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,212 changes: 382 additions & 830 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion bevy_nannou/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;

Expand Down
2 changes: 1 addition & 1 deletion bevy_nannou_draw/src/draw/drawing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
}
Expand Down
Loading
Loading