diff --git a/src/mat.rs b/src/mat.rs index bd6575d..8abf09d 100644 --- a/src/mat.rs +++ b/src/mat.rs @@ -245,7 +245,7 @@ pub trait Matrix: Index + Eq + Neg { */ pub trait Matrix2: Matrix { fn new(c0r0: T, c0r1: T, - c1r0: T, c1r1: T) -> Self; + c1r0: T, c1r1: T) -> Self; fn from_cols(c0: V, c1: V) -> Self; @@ -261,8 +261,8 @@ pub trait Matrix2: Matrix { */ pub trait Matrix3: Matrix { fn new(c0r0:T, c0r1:T, c0r2:T, - c1r0:T, c1r1:T, c1r2:T, - c2r0:T, c2r1:T, c2r2:T) -> Self; + c1r0:T, c1r1:T, c1r2:T, + c2r0:T, c2r1:T, c2r2:T) -> Self; fn from_cols(c0: V, c1: V, c2: V) -> Self; @@ -290,9 +290,9 @@ pub trait Matrix3: Matrix { */ pub trait Matrix4: Matrix { fn new(c0r0: T, c0r1: T, c0r2: T, c0r3: T, - c1r0: T, c1r1: T, c1r2: T, c1r3: T, - c2r0: T, c2r1: T, c2r2: T, c2r3: T, - c3r0: T, c3r1: T, c3r2: T, c3r3: T) -> Self; + c1r0: T, c1r1: T, c1r2: T, c1r3: T, + c2r0: T, c2r1: T, c2r2: T, c2r3: T, + c3r0: T, c3r1: T, c3r2: T, c3r3: T) -> Self; fn from_cols(c0: V, c1: V, c2: V, c3: V) -> Self; } @@ -558,7 +558,7 @@ impl + Add + Sub + Mul + */ #[inline(always)] fn new(c0r0: T, c0r1: T, - c1r0: T, c1r1: T) -> Mat2 { + c1r0: T, c1r1: T) -> Mat2 { Matrix2::from_cols(Vector2::new::>(c0r0, c0r1), Vector2::new::>(c1r0, c1r1)) } @@ -581,8 +581,7 @@ impl + Add + Sub + Mul + * ~~~ */ #[inline(always)] - fn from_cols(c0: Vec2, - c1: Vec2) -> Mat2 { + fn from_cols(c0: Vec2, c1: Vec2) -> Mat2 { Mat2 { x: c0, y: c1 } } @@ -1021,8 +1020,8 @@ impl + Add + Sub + Mul + */ #[inline(always)] fn new(c0r0:T, c0r1:T, c0r2:T, - c1r0:T, c1r1:T, c1r2:T, - c2r0:T, c2r1:T, c2r2:T) -> Mat3 { + c1r0:T, c1r1:T, c1r2:T, + c2r0:T, c2r1:T, c2r2:T) -> Mat3 { Matrix3::from_cols(Vector3::new::>(c0r0, c0r1, c0r2), Vector3::new::>(c1r0, c1r1, c1r2), Vector3::new::>(c2r0, c2r1, c2r2)) @@ -1049,9 +1048,7 @@ impl + Add + Sub + Mul + * ~~~ */ #[inline(always)] - fn from_cols(c0: Vec3, - c1: Vec3, - c2: Vec3) -> Mat3 { + fn from_cols(c0: Vec3, c1: Vec3, c2: Vec3) -> Mat3 { Mat3 { x: c0, y: c1, z: c2 } } @@ -1714,9 +1711,9 @@ impl + Add + Sub + Mul + */ #[inline(always)] fn new(c0r0: T, c0r1: T, c0r2: T, c0r3: T, - c1r0: T, c1r1: T, c1r2: T, c1r3: T, - c2r0: T, c2r1: T, c2r2: T, c2r3: T, - c3r0: T, c3r1: T, c3r2: T, c3r3: T) -> Mat4 { + c1r0: T, c1r1: T, c1r2: T, c1r3: T, + c2r0: T, c2r1: T, c2r2: T, c2r3: T, + c3r0: T, c3r1: T, c3r2: T, c3r3: T) -> Mat4 { Matrix4::from_cols(Vector4::new::>(c0r0, c0r1, c0r2, c0r3), Vector4::new::>(c1r0, c1r1, c1r2, c1r3), Vector4::new::>(c2r0, c2r1, c2r2, c2r3), @@ -1747,10 +1744,7 @@ impl + Add + Sub + Mul + * ~~~ */ #[inline(always)] - fn from_cols(c0: Vec4, - c1: Vec4, - c2: Vec4, - c3: Vec4) -> Mat4 { + fn from_cols(c0: Vec4, c1: Vec4, c2: Vec4, c3: Vec4) -> Mat4 { Mat4 { x: c0, y: c1, z: c2, w: c3 } } }