migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-31 05:40:03 -04:00
Code Activity

Replace emath::clamp with f32::clamp (new in rustc 1.50)

Browse Source
This commit is contained in:
Emil Ernerfeldt
2021-03-21 17:47:03 +01:00
parent cdab9d777f
commit f5c372910c
16 changed files with 66 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
epaint/src/color.rs
View File

@@ -4,8 +4,6 @@
//! If you want to manipulate RGBA colors use [`Rgba`].
//! If you want to manipulate colors in a way closer to how humans think about colors, use [`HsvaGamma`].
use emath::clamp;
/// This format is used for space-efficient color representation (32 bits).
///
/// Instead of manipulating this directly it is often better
@@ -363,7 +361,7 @@ pub fn gamma_u8_from_linear_f32(l: f32) -> u8 {
/// linear [0, 1] -> linear [0, 255] (clamped).
/// Useful for alpha-channel.
pub fn linear_u8_from_linear_f32(a: f32) -> u8 {
clamp(a * 255.0, 0.0..=255.0).round() as u8
(a * 255.0).round() as u8 // rust does a saturating cast since 1.45
}
#[test]
@@ -593,7 +591,7 @@ pub fn hsv_from_rgb([r, g, b]: [f32; 3]) -> (f32, f32, f32) {
pub fn rgb_from_hsv((h, s, v): (f32, f32, f32)) -> [f32; 3] {
#![allow(clippy::many_single_char_names)]
let h = (h.fract() + 1.0).fract(); // wrap
let s = clamp(s, 0.0..=1.0);
let s = s.clamp(0.0, 1.0);
let f = h * 6.0 - (h * 6.0).floor();
let p = v * (1.0 - s);

4
epaint/src/tessellator.rs
View File

@@ -49,7 +49,7 @@ impl Path {
pub fn add_circle(&mut self, center: Pos2, radius: f32) {
let n = (radius * 4.0).round() as i32; // TODO: tweak a bit more
let n = clamp(n, 4..=64);
let n = n.clamp(4, 64);
self.reserve(n as usize);
for i in 0..n {
let angle = remap(i as f32, 0.0..=n as f32, 0.0..=TAU);
@@ -199,7 +199,7 @@ pub mod path {
// TODO: optimize with precalculated vertices for some radii ranges
let n = (radius * 0.75).round() as i32; // TODO: tweak a bit more
let n = clamp(n, 2..=32);
let n = n.clamp(2, 32);
const RIGHT_ANGLE: f32 = TAU / 4.0;
path.reserve(n as usize + 1);
for i in 0..=n {