diff --git a/ezgui/src/color.rs b/ezgui/src/color.rs index 6a03f10b54..5cd39e76f9 100644 --- a/ezgui/src/color.rs +++ b/ezgui/src/color.rs @@ -75,14 +75,6 @@ impl Color { Color::rgba_f(self.r, self.g, self.b, a) } - pub fn fade(&self, factor: f32) -> Color { - let mut c = self.clone(); - c.r /= factor; - c.g /= factor; - c.b /= factor; - c - } - pub fn hex(raw: &str) -> Color { // Skip the leading '#' let r = usize::from_str_radix(&raw[1..3], 16).unwrap(); diff --git a/game/src/colors.rs b/game/src/colors.rs index 8a03c50faf..9ee1daae9d 100644 --- a/game/src/colors.rs +++ b/game/src/colors.rs @@ -106,6 +106,7 @@ pub struct ColorScheme { pub ped_preparing_bike_body: Color, pub ped_crowd: Color, pub bike_frame: Color, + pub parked_car: Color, // Layers pub good_to_bad_red: ColorScale, @@ -209,6 +210,7 @@ impl ColorScheme { ped_preparing_bike_body: Color::rgb(255, 0, 144), ped_crowd: Color::rgb_f(0.2, 0.7, 0.7), bike_frame: Color::hex("#AAA9AD"), + parked_car: Color::hex("#938E85"), // Layers good_to_bad_red: ColorScale(vec![hex("#F19A93"), hex("#A32015")]), diff --git a/game/src/render/car.rs b/game/src/render/car.rs index 56ded73002..d952f1970e 100644 --- a/game/src/render/car.rs +++ b/game/src/render/car.rs @@ -196,7 +196,7 @@ fn zoomed_color_car(input: &DrawCarInput, cs: &ColorScheme) -> Color { } else { match input.status { CarStatus::Moving => cs.rotating_color_agents(input.id.0), - CarStatus::Parked => cs.rotating_color_agents(input.id.0).fade(1.5), + CarStatus::Parked => cs.parked_car, } } }