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

matrices: moving another doctest to unit

Browse Source
This commit is contained in:
Bill Thiede 2021-07-30 21:33:43 -07:00
parent e4846de25b
commit e3d8988658
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
rtchallenge/src/matrices.rs
View File

@ -446,17 +446,6 @@ impl Mul<Matrix4x4> for Matrix4x4 {
type Output = Matrix4x4; type Output = Matrix4x4;
/// Implement matrix multiplication for `Matrix4x4`. /// Implement matrix multiplication for `Matrix4x4`.
///
/// # Examples
/// ```
/// use rtchallenge::matrices::Matrix4x4;
///
/// let i = Matrix4x4::identity();
/// let m1 = Matrix4x4::identity();
/// let m2 = Matrix4x4::identity();
///
/// assert_eq!(m1 * m2, i);
/// ```
fn mul(self, m2: Matrix4x4) -> Matrix4x4 { fn mul(self, m2: Matrix4x4) -> Matrix4x4 {
let m1 = self; let m1 = self;
let mut r: Matrix4x4 = Default::default(); let mut r: Matrix4x4 = Default::default();
@ -476,22 +465,6 @@ impl Mul<Tuple> for Matrix4x4 {
type Output = Tuple; type Output = Tuple;
/// Implement matrix multiplication for `Matrix4x4` * `Tuple`. /// Implement matrix multiplication for `Matrix4x4` * `Tuple`.
///
/// # Examples
/// ```
/// use rtchallenge::matrices::Matrix4x4;
/// use rtchallenge::tuples::Tuple;
///
/// let a = Matrix4x4::new(
/// [1., 2., 3., 4.],
/// [2., 4., 4., 2.],
/// [8., 6., 4., 1.],
/// [0., 0., 0., 1.],
/// );
/// let b = Tuple::new(1., 2., 3., 1.);
///
/// assert_eq!(a * b, Tuple::new(18., 24., 33., 1.));
/// ```
fn mul(self, t: Tuple) -> Tuple { fn mul(self, t: Tuple) -> Tuple {
let m = self; let m = self;
Tuple { Tuple {
@ -938,4 +911,16 @@ mod tests {
) )
); );
} }
#[test]
fn mul4x4_tuple() {
let a = Matrix4x4::new(
[1., 2., 3., 4.],
[2., 4., 4., 2.],
[8., 6., 4., 1.],
[0., 0., 0., 1.],
);
let b = Tuple::new(1., 2., 3., 1.);
assert_eq!(a * b, Tuple::new(18., 24., 33., 1.));
}
} }