me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use debug assertions instead of clamp

Browse source
This commit is contained in:
Clark Moody 2020-03-31 16:40:44 -05:00
parent fd484c7638
commit 9a4ad3d6a7
1 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

37
core/src/color.rs
View file

@ -41,12 +41,24 @@ impl Color {
/// New Color with range checks /// New Color with range checks
pub fn new(r: f32, g: f32, b: f32, a: f32) -> Color { pub fn new(r: f32, g: f32, b: f32, a: f32) -> Color {
Color { debug_assert!(
r: clamp(r), (0.0f32..=1.0f32).contains(&r),
g: clamp(g), "Red component must be on [0, 1]"
b: clamp(b), );
a: clamp(a), debug_assert!(
} (0.0f32..=1.0f32).contains(&g),
"Green component must be on [0, 1]"
);
debug_assert!(
(0.0f32..=1.0f32).contains(&b),
"Blue component must be on [0, 1]"
);
debug_assert!(
(0.0f32..=1.0f32).contains(&a),
"Alpha component must be on [0, 1]"
);
Color { r, g, b, a }
} }
/// Creates a [`Color`] from its RGB components. /// Creates a [`Color`] from its RGB components.
@ -71,7 +83,7 @@ impl Color {
r: f32::from(r) / 255.0, r: f32::from(r) / 255.0,
g: f32::from(g) / 255.0, g: f32::from(g) / 255.0,
b: f32::from(b) / 255.0, b: f32::from(b) / 255.0,
a: clamp(a), a,
} }
} }
@ -117,9 +129,9 @@ impl Color {
/// Invert the Color in-place /// Invert the Color in-place
pub fn invert(&mut self) { pub fn invert(&mut self) {
self.r = clamp(1.0f32 - self.r); self.r = 1.0f32 - self.r;
self.b = clamp(1.0f32 - self.g); self.b = 1.0f32 - self.g;
self.g = clamp(1.0f32 - self.b); self.g = 1.0f32 - self.b;
} }
/// Return an inverted Color /// Return an inverted Color
@ -161,8 +173,3 @@ impl From<Color> for Srgba {
Srgba::new(c.r, c.g, c.b, c.a) Srgba::new(c.r, c.g, c.b, c.a)
} }
} }
/// Clamps a float value to the range [0.0, 1.0]
pub fn clamp(v: f32) -> f32 {
v.max(0.0f32).min(1.0f32)
}