diff -r 4c8abb8977dc -r ca7d4c665531 include/container.h --- a/include/container.h Thu May 08 09:21:25 2008 +0200 +++ b/include/container.h Sat May 10 14:29:37 2008 +0200 @@ -47,20 +47,20 @@ Container(): bbox(), shapes() {}; virtual ~Container() {}; - virtual void addShape(Shape* aShape); - //void addShapeNoExtend(Shape* aShape) { shapes.push_back(aShape); }; - virtual Shape *nearest_intersection(const Shape *origin_shape, const Ray &ray, + virtual void addShape(const Shape* aShape); + //void addShapeNoExtend(const Shape* aShape) { shapes.push_back(aShape); }; + virtual const Shape *nearest_intersection(const Shape *origin_shape, const Ray &ray, Float &nearest_distance); virtual void optimize() {}; ShapeList & getShapes() { return shapes; }; - virtual ostream & dump(ostream &st); + virtual ostream & dump(ostream &st) const; #ifndef NO_SIMD virtual void packet_intersection(const Shape* const* origin_shapes, const RayPacket &rays, - Float *nearest_distances, Shape** nearest_shapes); + Float *nearest_distances, const Shape** nearest_shapes); #endif };