From e15c055f0612955a9329cf6edaa0905d7eabdef3 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Sun, 5 Jan 2025 13:55:36 +0200 Subject: [PATCH] fix: lint warnings --- src/floor/systems/fog.rs | 18 ------------------ src/floor/systems/mod.rs | 3 --- src/maze/triggers/spawn.rs | 2 -- src/theme/palette/rose_pine.rs | 2 +- 4 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 src/floor/systems/fog.rs diff --git a/src/floor/systems/fog.rs b/src/floor/systems/fog.rs deleted file mode 100644 index 0c1de24..0000000 --- a/src/floor/systems/fog.rs +++ /dev/null @@ -1,18 +0,0 @@ -use bevy::prelude::*; - -use crate::theme::{palette::rose_pine::RosePineDawn, prelude::ColorScheme}; - -pub fn setup_camera_fog(mut commands: Commands) { - commands.spawn(( - Name::new("Fog"), - DistanceFog { - color: RosePineDawn::Overlay.to_color(), - directional_light_color: RosePineDawn::Overlay.to_color(), - falloff: FogFalloff::Linear { - start: 1., - end: 20., - }, - ..default() - }, - )); -} diff --git a/src/floor/systems/mod.rs b/src/floor/systems/mod.rs index e8e252f..8428a20 100644 --- a/src/floor/systems/mod.rs +++ b/src/floor/systems/mod.rs @@ -1,17 +1,14 @@ mod despawn; -mod fog; mod movement; mod spawn; use crate::maze::MazePluginLoaded; use bevy::prelude::*; use despawn::despawn_floor; -use fog::setup_camera_fog; use movement::{handle_floor_transition_events, move_floors}; use spawn::spawn_floor; pub(super) fn plugin(app: &mut App) { - app.add_systems(Startup, setup_camera_fog); app.add_systems( Update, ( diff --git a/src/maze/triggers/spawn.rs b/src/maze/triggers/spawn.rs index ba02770..6582a21 100644 --- a/src/maze/triggers/spawn.rs +++ b/src/maze/triggers/spawn.rs @@ -44,8 +44,6 @@ pub(super) fn spawn_maze( _ => FLOOR_Y_OFFSET, } as f32; - // (floor - 1) * FLOOR_Y_OFFSET - let entity = commands .spawn(( Name::new(format!("Floor {}", floor)), diff --git a/src/theme/palette/rose_pine.rs b/src/theme/palette/rose_pine.rs index 507b577..d1c5a1c 100644 --- a/src/theme/palette/rose_pine.rs +++ b/src/theme/palette/rose_pine.rs @@ -106,7 +106,7 @@ macro_rules! create_color_scheme { impl $name { fn hex_to_rgb(hex: &str) -> (u8, u8, u8) { - let hex = if hex.starts_with('#') { &hex[1..] } else { hex }; + let hex = hex.strip_prefix('#').unwrap_or(hex); let r = u8::from_str_radix(&hex[0..2], 16).unwrap_or(0); let g = u8::from_str_radix(&hex[2..4], 16).unwrap_or(0); let b = u8::from_str_radix(&hex[4..6], 16).unwrap_or(0);