M-Labs
/
nalgebra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added scale * scalar + Cleanup scale_ops

This commit is contained in:
Yuri Edward 2021-10-19 16:33:12 +02:00
parent 865ac001d3
commit 1341801c56
1 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/geometry/scale_ops.rs
View File

@ -36,34 +36,19 @@ add_sub_impl!(Mul, mul, ClosedMul;
self: Scale<T, D>, right: Scale<T, D>, Output = Scale<T, D>; self: Scale<T, D>, right: Scale<T, D>, Output = Scale<T, D>;
#[allow(clippy::suspicious_arithmetic_impl)] { Scale::from(self.vector.component_mul(&right.vector)) }; ); #[allow(clippy::suspicious_arithmetic_impl)] { Scale::from(self.vector.component_mul(&right.vector)) }; );
// Scale ÷ Scale // Scale × scalar
// TODO: instead of calling inverse explicitly, could we just add a `mul_tr` or `mul_inv` method? add_sub_impl!(Mul, mul, ClosedMul;
/*add_sub_impl!(Div, div, ClosedSub;
(Const<D>, U1), (Const<D>, U1) -> (Const<D>, U1) (Const<D>, U1), (Const<D>, U1) -> (Const<D>, U1)
const D; for; where; const D; for; where;
self: &'a Scale<T, D>, right: &'b Scale<T, D>, Output = Scale<T, D>; self: &'a Scale<T, D>, right: T, Output = Scale<T, D>;
#[allow(clippy::suspicious_arithmetic_impl)] { todo!(); }; #[allow(clippy::suspicious_arithmetic_impl)] { Scale::from(&self.vector * right) };
'a, 'b);
add_sub_impl!(Div, div, ClosedSub;
(Const<D>, U1), (Const<D>, U1) -> (Const<D>, U1)
const D; for; where;
self: &'a Scale<T, D>, right: Scale<T, D>, Output = Scale<T, D>;
#[allow(clippy::suspicious_arithmetic_impl)] { todo!(); };
'a); 'a);
add_sub_impl!(Div, div, ClosedSub; add_sub_impl!(Mul, mul, ClosedMul;
(Const<D>, U1), (Const<D>, U1) -> (Const<D>, U1) (Const<D>, U1), (Const<D>, U1) -> (Const<D>, U1)
const D; for; where; const D; for; where;
self: Scale<T, D>, right: &'b Scale<T, D>, Output = Scale<T, D>; self: Scale<T, D>, right: T, Output = Scale<T, D>;
#[allow(clippy::suspicious_arithmetic_impl)] { todo!(); }; #[allow(clippy::suspicious_arithmetic_impl)] { Scale::from(self.vector * right) }; );
'b);
add_sub_impl!(Div, div, ClosedSub;
(Const<D>, U1), (Const<D>, U1) -> (Const<D>, U1)
const D; for; where;
self: Scale<T, D>, right: Scale<T, D>, Output = Scale<T, D>;
#[allow(clippy::suspicious_arithmetic_impl)] { todo!(); }; );*/
// Scale × Point // Scale × Point
// TODO: we don't handle properly non-zero origins here. Do we want this to be the intended // TODO: we don't handle properly non-zero origins here. Do we want this to be the intended
@ -106,14 +91,3 @@ add_sub_assign_impl!(MulAssign, mul_assign, ClosedMul;
const D; const D;
self: Scale<T, D>, right: Scale<T, D>; self: Scale<T, D>, right: Scale<T, D>;
#[allow(clippy::suspicious_op_assign_impl)] { self.vector.component_mul_assign(&right.vector); }; ); #[allow(clippy::suspicious_op_assign_impl)] { self.vector.component_mul_assign(&right.vector); }; );
/*add_sub_assign_impl!(DivAssign, div_assign, ClosedSub;
const D;
self: Scale<T, D>, right: &'b Scale<T, D>;
#[allow(clippy::suspicious_op_assign_impl)] { todo!(); };
'b);
add_sub_assign_impl!(DivAssign, div_assign, ClosedSub;
const D;
self: Scale<T, D>, right: Scale<T, D>;
#[allow(clippy::suspicious_op_assign_impl)] { todo!(); }; );*/