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

Updated operator overloads + fixed scale_construction

This commit is contained in:
Yuri Edward 2021-10-19 14:31:20 +02:00
parent 9c506b18e1
commit bfb4aceede
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/geometry/scale_construction.rs
View File

@ -10,7 +10,7 @@ use rand::{
Rng,
};
use simba::scalar::{ClosedAdd, SupersetOf};
use simba::scalar::{ClosedMul, SupersetOf};
use crate::base::{SVector, Scalar};
use crate::geometry::Scale;
@ -55,7 +55,7 @@ impl<T: Scalar, const D: usize> Scale<T, D> {
}
}
impl<T: Scalar + Zero + ClosedAdd, const D: usize> One for Scale<T, D> {
impl<T: Scalar + Zero + ClosedMul, const D: usize> One for Scale<T, D> {
#[inline]
fn one() -> Self {
Self::identity()

52
src/geometry/scale_ops.rs
View File

@ -1,6 +1,6 @@
use std::ops::{Div, DivAssign, Mul, MulAssign};
use std::ops::{Mul, MulAssign};
use simba::scalar::{ClosedAdd, ClosedSub};
use simba::scalar::{ClosedMul};
use crate::base::constraint::{SameNumberOfColumns, SameNumberOfRows, ShapeConstraint};
use crate::base::dimension::U1;
@ -9,36 +9,36 @@ use crate::base::{Const, Scalar};
use crate::geometry::{Point, Scale};
// Scale × Scale
add_sub_impl!(Mul, mul, ClosedAdd;
add_sub_impl!(Mul, mul, ClosedMul;
(Const<D>, U1), (Const<D>, U1) -> (Const<D>, U1)
const D; for; where;
self: &'a Scale<T, D>, right: &'b Scale<T, D>, Output = Scale<T, D>;
#[allow(clippy::suspicious_arithmetic_impl)] { todo!(); };
#[allow(clippy::suspicious_arithmetic_impl)] { Scale::from(self.vector.component_mul(&right.vector)) };
'a, 'b);
add_sub_impl!(Mul, mul, ClosedAdd;
add_sub_impl!(Mul, mul, ClosedMul;
(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!(); };
#[allow(clippy::suspicious_arithmetic_impl)] { Scale::from(self.vector.component_mul(&right.vector)) };
'a);
add_sub_impl!(Mul, mul, ClosedAdd;
add_sub_impl!(Mul, mul, ClosedMul;
(Const<D>, U1), (Const<D>, U1) -> (Const<D>, U1)
const D; for; where;
self: Scale<T, D>, right: &'b Scale<T, D>, Output = Scale<T, D>;
#[allow(clippy::suspicious_arithmetic_impl)] { todo!(); };
#[allow(clippy::suspicious_arithmetic_impl)] { Scale::from(self.vector.component_mul(&right.vector)) };
'b);
add_sub_impl!(Mul, mul, ClosedAdd;
add_sub_impl!(Mul, mul, ClosedMul;
(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!(); }; );
#[allow(clippy::suspicious_arithmetic_impl)] { Scale::from(self.vector.component_mul(&right.vector)) }; );
// Scale ÷ Scale
// TODO: instead of calling inverse explicitly, could we just add a `mul_tr` or `mul_inv` method?
add_sub_impl!(Div, div, ClosedSub;
/*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: &'b Scale<T, D>, Output = Scale<T, D>;
@ -63,51 +63,51 @@ 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!(); }; );
#[allow(clippy::suspicious_arithmetic_impl)] { todo!(); }; );*/
// Scale × Point
// TODO: we don't handle properly non-zero origins here. Do we want this to be the intended
// behavior?
add_sub_impl!(Mul, mul, ClosedAdd;
add_sub_impl!(Mul, mul, ClosedMul;
(Const<D>, U1), (Const<D>, U1) -> (Const<D>, U1)
const D; for; where;
self: &'a Scale<T, D>, right: &'b Point<T, D>, Output = Point<T, D>;
#[allow(clippy::suspicious_arithmetic_impl)] { todo!(); };
#[allow(clippy::suspicious_arithmetic_impl)] { Point::from(self.vector.component_mul(&right.coords)) };
'a, 'b);
add_sub_impl!(Mul, mul, ClosedAdd;
add_sub_impl!(Mul, mul, ClosedMul;
(Const<D>, U1), (Const<D>, U1) -> (Const<D>, U1)
const D; for; where;
self: &'a Scale<T, D>, right: Point<T, D>, Output = Point<T, D>;
#[allow(clippy::suspicious_arithmetic_impl)] { todo!(); };
#[allow(clippy::suspicious_arithmetic_impl)] { Point::from(self.vector.component_mul(&right.coords)) };
'a);
add_sub_impl!(Mul, mul, ClosedAdd;
add_sub_impl!(Mul, mul, ClosedMul;
(Const<D>, U1), (Const<D>, U1) -> (Const<D>, U1)
const D; for; where;
self: Scale<T, D>, right: &'b Point<T, D>, Output = Point<T, D>;
#[allow(clippy::suspicious_arithmetic_impl)] { todo!(); };
#[allow(clippy::suspicious_arithmetic_impl)] { Point::from(self.vector.component_mul(&right.coords)) };
'b);
add_sub_impl!(Mul, mul, ClosedAdd;
add_sub_impl!(Mul, mul, ClosedMul;
(Const<D>, U1), (Const<D>, U1) -> (Const<D>, U1)
const D; for; where;
self: Scale<T, D>, right: Point<T, D>, Output = Point<T, D>;
#[allow(clippy::suspicious_arithmetic_impl)] { todo!(); }; );
#[allow(clippy::suspicious_arithmetic_impl)] { Point::from(self.vector.component_mul(&right.coords)) }; );
// Scale *= Scale
add_sub_assign_impl!(MulAssign, mul_assign, ClosedAdd;
add_sub_assign_impl!(MulAssign, mul_assign, ClosedMul;
const D;
self: Scale<T, D>, right: &'b Scale<T, D>;
#[allow(clippy::suspicious_op_assign_impl)] { todo!(); };
#[allow(clippy::suspicious_op_assign_impl)] { self.vector.component_mul_assign(&right.vector); };
'b);
add_sub_assign_impl!(MulAssign, mul_assign, ClosedAdd;
add_sub_assign_impl!(MulAssign, mul_assign, ClosedMul;
const D;
self: Scale<T, D>, right: Scale<T, D>;
#[allow(clippy::suspicious_op_assign_impl)] { todo!(); }; );
#[allow(clippy::suspicious_op_assign_impl)] { self.vector.component_mul_assign(&right.vector); }; );
add_sub_assign_impl!(DivAssign, div_assign, ClosedSub;
/*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!(); };
@ -116,4 +116,4 @@ add_sub_assign_impl!(DivAssign, div_assign, ClosedSub;
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!(); }; );
#[allow(clippy::suspicious_op_assign_impl)] { todo!(); }; );*/