diff --git a/Cargo.toml b/Cargo.toml index 28710d9..f00ae46 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ default = ["serde"] serde = ["dep:serde", "dep:ron", "dep:bincode"] [dependencies] -bevy = "0.17" +bevy = "0.18" thiserror = "2" # optional serialization @@ -26,5 +26,5 @@ bincode = {version = "2", optional = true, features = ["serde"]} [dev-dependencies] rand = "0.9" -bevy_flycam = "0.17" -bevy-inspector-egui = "0.35" +bevy_flycam = "0.18" +bevy-inspector-egui = "0.36" diff --git a/examples/edit_day_night_cycle.rs b/examples/edit_day_night_cycle.rs index da27302..35ee16e 100644 --- a/examples/edit_day_night_cycle.rs +++ b/examples/edit_day_night_cycle.rs @@ -126,7 +126,7 @@ fn edit_ui(mut world: &mut World) { dirlight.color = Color::srgb_from_array(lin); } ui.label("ambient color"); - ui_for_resource::(world, ui); + ui_for_resource::(world, ui); }); }); } diff --git a/src/ambient_driver.rs b/src/ambient_driver.rs index c17d6f8..10ce976 100644 --- a/src/ambient_driver.rs +++ b/src/ambient_driver.rs @@ -164,7 +164,7 @@ fn drive_ambience( sky_time: Res, ambient_settings: Res, ambient_colors: Res, - mut ambient_light: ResMut, + mut ambient_light: ResMut, ) { let percent = sky_time_settings.time_percent(sky_time.time); diff --git a/src/aurora.rs b/src/aurora.rs index 46bb7c3..72bb49a 100644 --- a/src/aurora.rs +++ b/src/aurora.rs @@ -1,11 +1,10 @@ use bevy::{ - camera::visibility::RenderLayers, + camera::{RenderTarget, visibility::RenderLayers}, prelude::*, render::render_resource::Extent3d, transform::plugins::TransformSystems, window::{PrimaryWindow, WindowResized}, }; - use crate::{ aurora_material::AuroraMaterial, noise::{NoiseHandles, setup_noise_texture}, @@ -161,10 +160,10 @@ fn spawn_aurora_skybox( AuroraCameraTag, Camera { order: aurora_settings.camera_order, - target: aurora_texture_handle.render_target.clone().into(), clear_color: ClearColorConfig::Custom(Color::NONE), ..default() }, + RenderTarget::Image(aurora_texture_handle.render_target.clone().into()), Transform::from_translation(Vec3::new(0.0, 0.0, 0.0)).looking_at(Vec3::ZERO, Vec3::Y), aurora_settings.camera_render_layers.clone(), )); diff --git a/src/noise.rs b/src/noise.rs index a92f9f3..cd22a33 100644 --- a/src/noise.rs +++ b/src/noise.rs @@ -400,6 +400,7 @@ pub enum NoiseTextureLoaderError { } #[cfg(feature = "serde")] +#[derive(TypePath)] pub struct NoiseTextureAssetLoader; #[cfg(feature = "serde")] diff --git a/src/plugin.rs b/src/plugin.rs index 302e916..a637d95 100644 --- a/src/plugin.rs +++ b/src/plugin.rs @@ -1,11 +1,10 @@ use bevy::{ asset::RenderAssetUsages, - camera::visibility::RenderLayers, + camera::{RenderTarget, visibility::RenderLayers}, image::ImageSampler, prelude::*, render::render_resource::{Extent3d, TextureDimension, TextureFormat, TextureUsages}, }; - use crate::{ ambient_driver::AmbientDriverPlugin, aurora::AuroraPlugin, @@ -281,10 +280,10 @@ fn spawn_default_skybox_gradient( GradientCameraTag, Camera { order: sky_settings.camera_gradient_order, - target: gradient_texture_handle.render_target.clone().into(), clear_color: ClearColorConfig::Custom(Color::NONE), ..default() }, + RenderTarget::Image(gradient_texture_handle.render_target.clone().into()), Transform::from_translation(Vec3::new(0.0, 0.0, 0.0)).looking_at(Vec3::ZERO, Vec3::Y), sky_settings.skybox_gradient_render_layer.clone(), )); diff --git a/src/sky_texture.rs b/src/sky_texture.rs index 884cf15..a4c9d9d 100644 --- a/src/sky_texture.rs +++ b/src/sky_texture.rs @@ -1,6 +1,6 @@ use bevy::{ asset::RenderAssetUsages, - camera::visibility::RenderLayers, + camera::{RenderTarget, visibility::RenderLayers}, image::ImageSampler, prelude::*, render::render_resource::{Extent3d, TextureDimension, TextureFormat, TextureUsages}, @@ -155,10 +155,10 @@ fn spawn_full_sky_camera( FullSkyCameraTag, Camera { order: settings.full_sky_camera_order, - target: full_sky_handle.render_target.clone().into(), clear_color: ClearColorConfig::Custom(Color::NONE), ..default() }, + RenderTarget::Image(full_sky_handle.render_target.clone().into()), Transform::default(), settings.sky_render_layer.clone(), // The camera also needs the render layer ));