Merge branch 'QuadricT_operators' into 'master'

QuadricT: implement Q+Q and Q*scalar operators for convenience.

See merge request !113
This commit is contained in:
Jan Möbius
2016-12-23 13:48:19 +01:00

View File

@@ -180,6 +180,12 @@ public:
return *this; return *this;
} }
QuadricT<Scalar> operator+(const QuadricT<Scalar>& _other ) const
{
QuadricT<Scalar> result = *this;
return result += _other;
}
/// multiply by scalar /// multiply by scalar
QuadricT<Scalar>& operator*=( Scalar _s) QuadricT<Scalar>& operator*=( Scalar _s)
@@ -191,6 +197,11 @@ public:
return *this; return *this;
} }
QuadricT<Scalar> operator*(Scalar _s) const
{
QuadricT<Scalar> result = *this;
return result *= _s;
}
/// multiply 4D vector from right: Q*v /// multiply 4D vector from right: Q*v
template <class _Vec4> template <class _Vec4>