More fixes.

tychedelia · Feb 8, 2025 · c026501 · c026501
1 parent 3e55a79
commit c026501
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/bevy_nannou/src/lib.rs b/bevy_nannou/src/lib.rs
@@ -3,6 +3,7 @@ use bevy::prelude::*;
 pub mod prelude {
     pub use bevy::color::palettes::css::*;
     pub use bevy::color::*;
+    pub use bevy::image::*;
     pub use bevy::core_pipeline::bloom::*;
     pub use bevy::input::mouse::MouseWheel;
     pub use bevy::prelude::{

diff --git a/examples/compute/game_of_life.rs b/examples/compute/game_of_life.rs
@@ -1,6 +1,5 @@
 mod particle_mouse;
 
-use nannou::prelude::bevy_render::texture::{ImageSampler, ImageSamplerDescriptor};
 use nannou::prelude::*;
 
 const DISPLAY_FACTOR: u32 = 4;

diff --git a/examples/wgpu/wgpu_image_sequence/wgpu_image_sequence.rs b/examples/wgpu/wgpu_image_sequence/wgpu_image_sequence.rs
@@ -168,7 +168,7 @@ fn render(_app: &RenderApp, model: &Model, frame: Frame) {
     let mut render_pass = wgpu::RenderPassBuilder::new()
         .color_attachment(frame.resolve_target_view().unwrap(), |color| color)
         .begin(&mut encoder);
-    render_pass.set_bind_group(0, &model.bind_group, &[]);
+    render_pass.set_bind_group(0, &*model.bind_group, &[]);
     render_pass.set_pipeline(&model.render_pipeline);
     render_pass.set_vertex_buffer(0, model.vertex_buffer.slice(..));
     let vertex_range = 0..VERTICES.len() as u32;

diff --git a/nannou/src/prelude.rs b/nannou/src/prelude.rs
@@ -4,6 +4,7 @@ pub use bevy::asset as bevy_asset;
 pub use bevy::ecs as bevy_ecs;
 pub use bevy::reflect as bevy_reflect;
 pub use bevy::render as bevy_render;
+pub use bevy::image as bevy_image;
 pub use bevy::tasks::prelude::{block_on, AsyncComputeTaskPool, IoTaskPool};
 pub use bevy::tasks::{futures_lite::future, Task};