diff --git a/src/interact/add_delete.rs b/src/interact/add_delete.rs index d7ef1c2..676770b 100644 --- a/src/interact/add_delete.rs +++ b/src/interact/add_delete.rs @@ -811,7 +811,7 @@ pub fn draw_add_overlay(app: &DungeonApp, painter: &egui::Painter, geometry: &Gr let start = cell_center(geometry, drag.start_cell.0, drag.start_cell.1); let end = cell_center(geometry, drag.current_cell.0, drag.current_cell.1); - let stroke = Stroke::new(2.0, Color32::WHITE); + let stroke = Stroke::new(2.0_f32, Color32::WHITE); painter.circle_filled(start, 3.0, Color32::WHITE); crate::rendering::draw_dashed_line(painter, start, end, stroke, 8.0, 6.0); } @@ -854,7 +854,7 @@ pub fn draw_add_tool_ghost(app: &DungeonApp, painter: &egui::Painter, geometry: rect, 4.0, Stroke::new( - 1.5, + 1.5_f32, Color32::from_rgb(150, 200, 240).gamma_multiply(ghost_alpha + 0.3), ), egui::StrokeKind::Middle, @@ -881,7 +881,7 @@ pub fn draw_add_tool_ghost(app: &DungeonApp, painter: &egui::Painter, geometry: rect.expand(4.0), 4.0, Stroke::new( - 1.0, + 1.0_f32, Color32::from_rgb(180, 180, 220).gamma_multiply(ghost_alpha + 0.2), ), egui::StrokeKind::Middle, @@ -919,7 +919,7 @@ pub fn draw_add_tool_ghost(app: &DungeonApp, painter: &egui::Painter, geometry: rect, 4.0, Stroke::new( - 1.5, + 1.5_f32, Color32::from_rgb(255, 255, 255).gamma_multiply(ghost_alpha + 0.2), ), egui::StrokeKind::Middle, @@ -962,7 +962,7 @@ pub fn draw_add_tool_ghost(app: &DungeonApp, painter: &egui::Painter, geometry: rect, 4.0, Stroke::new( - 1.5, + 1.5_f32, Color32::from_rgb(220, 180, 80).gamma_multiply(ghost_alpha + 0.2), ), egui::StrokeKind::Middle, @@ -978,7 +978,7 @@ pub fn draw_add_tool_ghost(app: &DungeonApp, painter: &egui::Painter, geometry: egui::pos2(rect.left() + 2.0, y), egui::pos2(rect.right() - 2.0, y), ], - Stroke::new(1.5, line_color), + Stroke::new(1.5_f32, line_color), ); } } @@ -1082,7 +1082,7 @@ pub fn draw_paste_ghost(app: &DungeonApp, painter: &egui::Painter, geometry: &Gr let ghost_alpha = 0.35; let fill = Color32::from_rgb(100, 160, 100).gamma_multiply(ghost_alpha); let stroke = Stroke::new( - 1.5, + 1.5_f32, Color32::from_rgb(180, 240, 180).gamma_multiply(ghost_alpha + 0.3), ); diff --git a/src/interact/drag.rs b/src/interact/drag.rs index f757a31..3760ea6 100644 --- a/src/interact/drag.rs +++ b/src/interact/drag.rs @@ -474,7 +474,7 @@ pub fn draw_corridor_hover_overlay( }; let color = Color32::from_gray(170); - let stroke = Stroke::new(2.0, color); + let stroke = Stroke::new(2.0_f32, color); for pair in corridor.path.windows(2) { let a = cell_center(geometry, pair[0].0, pair[0].1); let b = cell_center(geometry, pair[1].0, pair[1].1); @@ -496,7 +496,7 @@ pub fn draw_door_hover_overlay(app: &DungeonApp, painter: &egui::Painter, geomet return; }; let color = Color32::from_gray(200); - let stroke = Stroke::new(2.0, color); + let stroke = Stroke::new(2.0_f32, color); crate::rendering::draw_door_line( painter, geometry, diff --git a/src/interact/geometry.rs b/src/interact/geometry.rs index 94c9ea9..abfffb2 100644 --- a/src/interact/geometry.rs +++ b/src/interact/geometry.rs @@ -36,7 +36,7 @@ pub fn draw_grid( egui::vec2(grid_width, grid_height), ); - let stroke = Stroke::new(1.0, Color32::from_gray(160)); + let stroke = Stroke::new(1.0_f32, Color32::from_gray(160)); painter.rect_stroke(grid_rect, 0.0, stroke, egui::StrokeKind::Middle); for col in 1..cols { diff --git a/src/interact/multi_select.rs b/src/interact/multi_select.rs index 8136d1d..3edab0a 100644 --- a/src/interact/multi_select.rs +++ b/src/interact/multi_select.rs @@ -617,7 +617,7 @@ pub fn draw_selection_box(app: &DungeonApp, painter: &egui::Painter, geometry: & painter.rect_stroke( rect, 0.0, - Stroke::new(1.5, Color32::from_rgba_unmultiplied(100, 160, 255, 200)), + Stroke::new(1.5_f32, Color32::from_rgba_unmultiplied(100, 160, 255, 200)), egui::StrokeKind::Middle, ); } @@ -636,7 +636,7 @@ pub fn draw_selection_highlights( } let layout = &app.levels[app.settings.active_level_index]; let color = Color32::from_rgba_unmultiplied(100, 180, 255, 220); - let stroke = Stroke::new(2.0, color); + let stroke = Stroke::new(2.0_f32, color); for item in &app.selection { match item { diff --git a/src/interact/resize.rs b/src/interact/resize.rs index 42d97f3..4c4aba6 100644 --- a/src/interact/resize.rs +++ b/src/interact/resize.rs @@ -369,7 +369,7 @@ pub fn draw_resize_overlay(app: &DungeonApp, painter: &egui::Painter, geometry: painter.rect_stroke( rect, 0.0, - Stroke::new(2.0, Color32::from_gray(180)), + Stroke::new(2.0_f32, Color32::from_gray(180)), egui::StrokeKind::Middle, ); let pos = crate::interact::cell_center( @@ -423,7 +423,7 @@ pub fn draw_resize_overlay(app: &DungeonApp, painter: &egui::Painter, geometry: painter.rect_stroke( rect, 0.0, - Stroke::new(2.0, Color32::from_gray(180)), + Stroke::new(2.0_f32, Color32::from_gray(180)), egui::StrokeKind::Middle, ); } @@ -446,7 +446,7 @@ pub fn draw_room_resize_visuals( show_handles: bool, ) { let color = Color32::from_gray(170); - let stroke = Stroke::new(1.5, color); + let stroke = Stroke::new(1.5_f32, color); let left = geometry.rect.left() + room.x as f32 * geometry.cell_size; let top = geometry.rect.top() + room.y as f32 * geometry.cell_size; @@ -491,7 +491,7 @@ pub fn draw_staircase_resize_visuals( show_handles: bool, ) { let color = Color32::from_gray(170); - let stroke = Stroke::new(1.5, color); + let stroke = Stroke::new(1.5_f32, color); let left = geometry.rect.left() + stair.cell.0 as f32 * geometry.cell_size; let top = geometry.rect.top() + stair.cell.1 as f32 * geometry.cell_size; @@ -527,10 +527,10 @@ pub fn draw_resize_handle( let half = size * 0.5; let rect = egui::Rect::from_center_size(corner, egui::vec2(size, size)); painter.rect_filled(rect, 2.0, Color32::from_gray(30)); - painter.rect_stroke(rect, 2.0, Stroke::new(1.0, color), egui::StrokeKind::Middle); + painter.rect_stroke(rect, 2.0, Stroke::new(1.0_f32, color), egui::StrokeKind::Middle); let center = corner; - let stroke = Stroke::new(1.0, color); + let stroke = Stroke::new(1.0_f32, color); match which { ResizeCorner::TopLeft => { painter.line_segment( diff --git a/src/rendering.rs b/src/rendering.rs index 346e757..fa768fb 100644 --- a/src/rendering.rs +++ b/src/rendering.rs @@ -134,7 +134,7 @@ pub fn draw_layout( painter, geometry, room, - Stroke::new(1.5, Color32::BLACK.gamma_multiply(alpha)), + Stroke::new(1.5_f32, Color32::BLACK.gamma_multiply(alpha)), ); } } @@ -277,7 +277,7 @@ pub fn draw_layout( painter.rect_stroke( text_label_rect(geometry, label).expand(2.0), 0.0, - Stroke::new(2.0, Color32::from_rgb(255, 220, 120).gamma_multiply(alpha)), + Stroke::new(2.0_f32, Color32::from_rgb(255, 220, 120).gamma_multiply(alpha)), egui::StrokeKind::Middle, ); } @@ -388,7 +388,7 @@ pub fn draw_staircase( rect, 4.0, Stroke::new( - if is_hovered { 3.0 } else { 2.0 }, + if is_hovered { 3.0_f32 } else { 2.0_f32 }, stroke_color.gamma_multiply(alpha), ), egui::StrokeKind::Middle, @@ -408,7 +408,7 @@ pub fn draw_staircase( egui::pos2(rect.left() + 2.0, y), egui::pos2(rect.right() - 2.0, y), ], - Stroke::new(1.5, line_color.gamma_multiply(alpha)), + Stroke::new(1.5_f32, line_color.gamma_multiply(alpha)), ); } } @@ -455,7 +455,7 @@ pub fn draw_area_marker( rect, 4.0, Stroke::new( - if hovered { 3.0 } else { 2.0 }, + if hovered { 3.0_f32 } else { 2.0_f32 }, stroke_color.gamma_multiply(alpha), ), egui::StrokeKind::Middle, diff --git a/src/ui/widgets.rs b/src/ui/widgets.rs index 6d62325..c1b6707 100644 --- a/src/ui/widgets.rs +++ b/src/ui/widgets.rs @@ -18,7 +18,7 @@ pub fn draw_legend_entry(ui: &mut egui::Ui, color: Color32, label: &str) { ui.painter().rect_stroke( rect, 0.0, - Stroke::new(1.0, Color32::WHITE), + Stroke::new(1.0_f32, Color32::WHITE), egui::StrokeKind::Middle, ); ui.add_space(6.0); @@ -49,7 +49,7 @@ pub fn draw_legend_entry_colorblind(ui: &mut egui::Ui, label: &str, style: Legen ui.painter().rect_stroke( rect, 0.0, - Stroke::new(1.0, Color32::BLACK), + Stroke::new(1.0_f32, Color32::BLACK), egui::StrokeKind::Middle, ); @@ -57,11 +57,11 @@ pub fn draw_legend_entry_colorblind(ui: &mut egui::Ui, label: &str, style: Legen LegendStyle::Crosshatch => { ui.painter().line_segment( [rect.left_top(), rect.right_bottom()], - Stroke::new(1.2, Color32::BLACK), + Stroke::new(1.2_f32, Color32::BLACK), ); ui.painter().line_segment( [rect.right_top(), rect.left_bottom()], - Stroke::new(1.2, Color32::BLACK), + Stroke::new(1.2_f32, Color32::BLACK), ); } LegendStyle::Dots => { @@ -84,14 +84,14 @@ pub fn draw_legend_entry_colorblind(ui: &mut egui::Ui, label: &str, style: Legen egui::pos2(rect.left() + 1.0, rect.center().y), egui::pos2(rect.right() - 1.0, rect.center().y), ], - Stroke::new(2.0, Color32::BLACK), + Stroke::new(2.0_f32, Color32::BLACK), ); } LegendStyle::Label(prefix) => { ui.painter() .circle_filled(rect.center(), 6.0, Color32::from_gray(180)); ui.painter() - .circle_stroke(rect.center(), 6.0, Stroke::new(1.0, Color32::BLACK)); + .circle_stroke(rect.center(), 6.0, Stroke::new(1.0_f32, Color32::BLACK)); let font_size = 10.0; let font_id = egui::FontId::monospace(font_size); let text_width = prefix.len() as f32 * font_size * 0.6; @@ -112,7 +112,7 @@ pub fn draw_legend_entry_colorblind(ui: &mut egui::Ui, label: &str, style: Legen ui.painter() .circle_filled(rect.center(), 6.0, Color32::from_gray(180)); ui.painter() - .circle_stroke(rect.center(), 6.0, Stroke::new(1.0, Color32::BLACK)); + .circle_stroke(rect.center(), 6.0, Stroke::new(1.0_f32, Color32::BLACK)); let font_size = 10.0; let font_id = egui::FontId::monospace(font_size); let text_width = font_size * 0.6; @@ -133,7 +133,7 @@ pub fn draw_legend_entry_colorblind(ui: &mut egui::Ui, label: &str, style: Legen ui.painter(), egui::pos2(rect.left() + 1.0, rect.center().y), egui::pos2(rect.right() - 1.0, rect.center().y), - Stroke::new(2.0, Color32::BLACK), + Stroke::new(2.0_f32, Color32::BLACK), 6.0, 3.0, ), @@ -141,7 +141,7 @@ pub fn draw_legend_entry_colorblind(ui: &mut egui::Ui, label: &str, style: Legen ui.painter(), egui::pos2(rect.left() + 1.0, rect.center().y), egui::pos2(rect.right() - 1.0, rect.center().y), - Stroke::new(2.0, Color32::BLACK), + Stroke::new(2.0_f32, Color32::BLACK), 3.0, 2.0, ), @@ -149,19 +149,19 @@ pub fn draw_legend_entry_colorblind(ui: &mut egui::Ui, label: &str, style: Legen ui.painter(), egui::pos2(rect.left() + 1.0, rect.center().y), egui::pos2(rect.right() - 1.0, rect.center().y), - Stroke::new(2.0, Color32::BLACK), + Stroke::new(2.0_f32, Color32::BLACK), ), LegendStyle::DashDotLine => draw_dash_dot_line( ui.painter(), egui::pos2(rect.left() + 1.0, rect.center().y), egui::pos2(rect.right() - 1.0, rect.center().y), - Stroke::new(2.0, Color32::BLACK), + Stroke::new(2.0_f32, Color32::BLACK), ), LegendStyle::DashDotDotLine => draw_dash_dot_dot_line( ui.painter(), egui::pos2(rect.left() + 1.0, rect.center().y), egui::pos2(rect.right() - 1.0, rect.center().y), - Stroke::new(2.0, Color32::BLACK), + Stroke::new(2.0_f32, Color32::BLACK), ), }