X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry%2Ftransformedshape.h;h=02587bfd87877efac86f365d39e1a68e072a7020;hb=313e10c1dcf5504789cc145166aece93d8141212;hp=90c37b0bb0a2b234c0e7929796846c25cc7e4648;hpb=24f239e418599c13a9d0bdc4942c188ccf0a8437;p=libs%2Fmath.git diff --git a/source/geometry/transformedshape.h b/source/geometry/transformedshape.h index 90c37b0..02587bf 100644 --- a/source/geometry/transformedshape.h +++ b/source/geometry/transformedshape.h @@ -35,7 +35,6 @@ public: private: Ray make_local_ray(const Ray &) const; public: - virtual bool check_intersection(const Ray &) const; virtual unsigned get_max_ray_intersections() const { return shape->get_max_ray_intersections(); } virtual unsigned get_intersections(const Ray &, SurfacePoint *, unsigned) const; }; @@ -48,7 +47,7 @@ inline TransformedShape::TransformedShape(const Shape &s, const Affi { } template -inline TransformedShape::TransformedShape(const TransformedShape &other): +inline TransformedShape::TransformedShape(const TransformedShape &other): shape(other.shape->clone()), transformation(other.transformation), inverse_trans(other.inverse_trans) @@ -96,12 +95,6 @@ inline Ray TransformedShape::make_local_ray(const Ray &ray) co return Ray(inverse_trans.transform(ray.get_start()), local_dir, ray.get_limit()*distortion); } -template -inline bool TransformedShape::check_intersection(const Ray &ray) const -{ - return shape->check_intersection(make_local_ray(ray)); -} - template inline unsigned TransformedShape::get_intersections(const Ray &ray, SurfacePoint *points, unsigned size) const { @@ -115,7 +108,7 @@ inline unsigned TransformedShape::get_intersections(const Ray &ray, points[i].position = transformation.transform(points[i].position); /* XXX This is not correct for nonuniform scaling. Inverse of the transpose of the upper DxD part of the matrix should be used. */ - points[i].normal = transformation.transform(points[i].normal); + points[i].normal = transformation.transform_linear(points[i].normal); points[i].distance = inner_product(points[i].position-ray.get_start(), ray.get_direction()); } }