X-Git-Url: http://git.tdb.fi/?p=libs%2Fmath.git;a=blobdiff_plain;f=source%2Fgeometry%2Ftransformedshape.h;h=168fbd9732e960dfbc79dc254cb281e8553859f1;hp=9387123508dcf081341c076f8c4e41970a10ead0;hb=HEAD;hpb=60caa19c84877c89d750140a90e5d891bce30ee7 diff --git a/source/geometry/transformedshape.h b/source/geometry/transformedshape.h index 9387123..168fbd9 100644 --- a/source/geometry/transformedshape.h +++ b/source/geometry/transformedshape.h @@ -1,7 +1,7 @@ #ifndef MSP_GEOMETRY_TRANSFORMEDSHAPE_H_ #define MSP_GEOMETRY_TRANSFORMEDSHAPE_H_ -#include "affinetransformation.h" +#include "affinetransform.h" #include "shape.h" namespace Msp { @@ -15,11 +15,11 @@ class TransformedShape: public Shape { private: Shape *shape; - AffineTransformation transformation; - AffineTransformation inverse_trans; + AffineTransform transformation; + AffineTransform inverse_trans; public: - TransformedShape(const Shape &, const AffineTransformation &); + TransformedShape(const Shape &, const AffineTransform &); TransformedShape(const TransformedShape &); TransformedShape &operator=(const TransformedShape &); ~TransformedShape(); @@ -27,7 +27,7 @@ public: virtual TransformedShape *clone() const; const Shape &get_shape() const { return *shape; } - const AffineTransformation &get_transformation() const { return transformation; } + const AffineTransform &get_transformation() const { return transformation; } virtual BoundingBox get_axis_aligned_bounding_box(unsigned = 0) const; virtual bool contains(const LinAl::Vector &) const; @@ -37,7 +37,7 @@ public: }; template -inline TransformedShape::TransformedShape(const Shape &s, const AffineTransformation &t): +inline TransformedShape::TransformedShape(const Shape &s, const AffineTransform &t): shape(s.clone()), transformation(t), inverse_trans(invert(t))