X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Faffinetransformation.h;h=0e377baaa51d633186969ace978494d79edfccf1;hb=3d124f6903553a9fc54341aba1b6f565c6d442f2;hp=e0ca370d66aa74b918f307497a065cc3deea396c;hpb=6ff13022b53830d35283905d562c2ef3af198cc1;p=libs%2Fmath.git

diff --git a/source/geometry/affinetransformation.h b/source/geometry/affinetransformation.h
index e0ca370..0e377ba 100644
--- a/source/geometry/affinetransformation.h
+++ b/source/geometry/affinetransformation.h
@@ -62,6 +62,9 @@ public:
 	static AffineTransformation<T, D> scaling(const LinAl::Vector<T, D> &);
 	static AffineTransformation<T, D> shear(const LinAl::Vector<T, D> &, const LinAl::Vector<T, D> &);
 
+	AffineTransformation &operator*=(const AffineTransformation &);
+	AffineTransformation &invert();
+
 	const LinAl::SquareMatrix<T, D+1> &get_matrix() const { return matrix; }
 	operator const LinAl::SquareMatrix<T, D+1> &() const { return matrix; }
 
@@ -81,7 +84,7 @@ AffineTransformation<T, D> AffineTransformation<T, D>::translation(const LinAl::
 {
 	AffineTransformation<T, D> r;
 	for(unsigned i=0; i<D; ++i)
-		r.matrix(D, i) = v[i];
+		r.matrix(i, D) = v[i];
 	return r;
 }
 
@@ -137,46 +140,44 @@ AffineTransformation<T, 3> AffineTransformationOps<T, 3>::rotation(const Angle<T
 	return r;
 }
 
-
-template<typename T, unsigned N>
-inline LinAl::Vector<T, N+1> augment_vector(const LinAl::Vector<T, N> &v, T s)
+template<typename T, unsigned D>
+inline AffineTransformation<T, D> &AffineTransformation<T, D>::operator*=(const AffineTransformation<T, D> &other)
 {
-	LinAl::Vector<T, N+1> r;
-	for(unsigned i=0; i<N; ++i)
-		r[i] = v[i];
-	r[N] = s;
-	return r;
+	matrix *= other.get_matrix();
+	return *this;
 }
 
-template<typename T, unsigned N>
-inline LinAl::Vector<T, N-1> reduce_vector(const LinAl::Vector<T, N> &v)
+template<typename T, unsigned D>
+inline AffineTransformation<T, D> operator*(const AffineTransformation<T, D> &at1, const AffineTransformation<T, D> &at2)
 {
-	LinAl::Vector<T, N-1> r;
-	for(unsigned i=0; i<N-1; ++i)
-		r[i] = v[i];
-	return r;
+	AffineTransformation<T, D> r = at1;
+	return r *= at2;
 }
 
-template<typename T, unsigned N>
-inline LinAl::Vector<T, N-1> divide_vector(const LinAl::Vector<T, N> &v)
+template<typename T, unsigned D>
+inline AffineTransformation<T, D> &AffineTransformation<T, D>::invert()
 {
-	LinAl::Vector<T, N-1> r;
-	for(unsigned i=0; i<N-1; ++i)
-		r[i] = v[i]/v[N-1];
-	return r;
+	matrix.invert();
+	return *this;
 }
 
+template<typename T, unsigned D>
+inline AffineTransformation<T, D> invert(const AffineTransformation<T, D> &at)
+{
+	AffineTransformation<T, D> r = at;
+	return r.invert();
+}
 
 template<typename T, unsigned D>
 inline LinAl::Vector<T, D> AffineTransformation<T, D>::transform(const LinAl::Vector<T, D> &v) const
 {
-	return reduce_vector(matrix*augment_vector(v, T(1)));
+	return LinAl::Vector<T, D>(matrix*LinAl::Vector<T, D+1>(v, T(1)));
 }
 
 template<typename T, unsigned D>
 inline LinAl::Vector<T, D> AffineTransformation<T, D>::transform_linear(const LinAl::Vector<T, D> &v) const
 {
-	return reduce_vector(matrix*augment_vector(v, T(0)));
+	return LinAl::Vector<T, D>(matrix*LinAl::Vector<T, D+1>(v, T(0)));
 }
 
 } // namespace Geometry