Fix clippy errors

This commit is contained in:
2020-09-04 16:49:24 -07:00
parent a48481db0d
commit 8e71e02ac1
7 changed files with 23 additions and 33 deletions

View File

@@ -1,12 +1,28 @@
use ansi_term::Color::RGB;
use crate::{consts, Material as _, SimState};
use crate::{Material as _, SimState};
use image::{RgbImage, Rgb};
use std::convert::TryInto as _;
use std::fmt::Write as _;
use std::fs::File;
use std::path::PathBuf;
use y4m;
// fn clamp(v: f32, range: f32) -> f32 {
// v.min(range).max(-range)
// }
// fn curl(x: f64, y: f64) -> f64 {
// let c = x * y;
// if c >= 0.0 {
// c.sqrt()
// } else {
// -(-c).sqrt()
// }
// }
fn norm_color(v: f64) -> u8 {
(v * 64.0 + 128.0).max(0.0).min(255.0) as u8
}
fn simstate_to_image(state: &SimState) -> RgbImage {
let w = state.width().try_into().unwrap();
let h = state.height().try_into().unwrap();
@@ -57,23 +73,6 @@ impl Renderer for NumericTermRenderer {
pub struct ColorTermRenderer;
fn clamp(v: f32, range: f32) -> f32 {
v.min(range).max(-range)
}
fn norm_color(v: f64) -> u8 {
(v * 64.0 + 128.0).max(0.0).min(255.0) as u8
}
fn curl(x: f64, y: f64) -> f64 {
let c = x * y;
if c >= 0.0 {
c.sqrt()
} else {
-(-c).sqrt()
}
}
impl Renderer for ColorTermRenderer {
fn render(&mut self, state: &SimState) {
let square = "";