diff options
Diffstat (limited to 'source/blender/freestyle/intern/geometry/VecMat.h')
| -rw-r--r-- | source/blender/freestyle/intern/geometry/VecMat.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/source/blender/freestyle/intern/geometry/VecMat.h b/source/blender/freestyle/intern/geometry/VecMat.h index 22fcd3aef41..b9cf604fed7 100644 --- a/source/blender/freestyle/intern/geometry/VecMat.h +++ b/source/blender/freestyle/intern/geometry/VecMat.h @@ -796,24 +796,22 @@ template<class T, unsigned N> class SquareMatrix : public Matrix<T, N, N> { ///////////////////////////////////////////////////////////////////////////// #if 0 -template <class T, unsigned N> -inline Vec<T, N> operator+(const Vec<T, N>& v1, const Vec<T, N>& v2) +template<class T, unsigned N> inline Vec<T, N> operator+(const Vec<T, N> &v1, const Vec<T, N> &v2) { Vec<T, N> res(v1); res += v2; return res; } -template <class T, unsigned N> -inline Vec<T, N> operator-(const Vec<T, N>& v1, const Vec<T, N>& v2) +template<class T, unsigned N> inline Vec<T, N> operator-(const Vec<T, N> &v1, const Vec<T, N> &v2) { Vec<T, N> res(v1); res -= v2; return res; } -template <class T, unsigned N> -inline Vec<T, N> operator*(const Vec<T, N>& v, const typename Vec<T, N>::value_type r) +template<class T, unsigned N> +inline Vec<T, N> operator*(const Vec<T, N> &v, const typename Vec<T, N>::value_type r) { Vec<T, N> res(v); res *= r; @@ -830,8 +828,8 @@ inline Vec<T, N> operator*(const typename Vec<T, N>::value_type r, const Vec<T, } #if 0 -template <class T, unsigned N> -inline Vec<T, N> operator/(const Vec<T, N>& v, const typename Vec<T, N>::value_type r) +template<class T, unsigned N> +inline Vec<T, N> operator/(const Vec<T, N> &v, const typename Vec<T, N>::value_type r) { Vec<T, N> res(v); if (r) @@ -840,8 +838,8 @@ inline Vec<T, N> operator/(const Vec<T, N>& v, const typename Vec<T, N>::value_t } // dot product -template <class T, unsigned N> -inline typename Vec<T, N>::value_type operator*(const Vec<T, N>& v1, const Vec<T, N>& v2) +template<class T, unsigned N> +inline typename Vec<T, N>::value_type operator*(const Vec<T, N> &v1, const Vec<T, N> &v2) { typename Vec<T, N>::value_type sum = 0; for (unsigned int i = 0; i < N; i++) @@ -850,10 +848,10 @@ inline typename Vec<T, N>::value_type operator*(const Vec<T, N>& v1, const Vec<T } // cross product for 3D Vectors -template <typename T> -inline Vec3<T> operator^(const Vec<T, 3>& v1, const Vec<T, 3>& v2) +template<typename T> inline Vec3<T> operator^(const Vec<T, 3> &v1, const Vec<T, 3> &v2) { - Vec3<T> res(v1[1] * v2[2] - v1[2] * v2[1], v1[2] * v2[0] - v1[0] * v2[2], v1[0] * v2[1] - v1[1] * v2[0]); + Vec3<T> res( + v1[1] * v2[2] - v1[2] * v2[1], v1[2] * v2[0] - v1[0] * v2[2], v1[0] * v2[1] - v1[1] * v2[0]); return res; } #endif |