wathiede/raytracers
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

patterns: make From for Pattern a little generic.

Browse Source
This commit is contained in:
Bill Thiede 2021-07-25 13:35:14 -07:00
parent b9f2c3f0ec
commit 2e4e8b3dcd
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rtchallenge/src/patterns.rs
View File

@ -2,7 +2,7 @@ use crate::{
matrices::Matrix4x4, matrices::Matrix4x4,
shapes::Shape, shapes::Shape,
tuples::{Color, Tuple}, tuples::{Color, Tuple},
Float, WHITE, WHITE,
}; };
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
@ -34,19 +34,13 @@ impl Default for Pattern {
} }
/// Creates a [Pattern] with a color type of [ColorMapper::Constant] from the given [Color] /// Creates a [Pattern] with a color type of [ColorMapper::Constant] from the given [Color]
impl From<[Float; 3]> for Pattern { impl<C> From<C> for Pattern
fn from(rgb: [Float; 3]) -> Self { where
C: Into<Color>,
{
fn from(c: C) -> Self {
Pattern { Pattern {
color: ColorMapper::Constant(rgb.into()), color: ColorMapper::Constant(c.into()),
..Pattern::default()
}
}
}
/// Creates a [Pattern] with a color type of [ColorMapper::Constant] from the given [Color]
impl From<Color> for Pattern {
fn from(c: Color) -> Self {
Pattern {
color: ColorMapper::Constant(c),
..Pattern::default() ..Pattern::default()
} }
} }