diff -r 9d66d323c354 -r 9af5c039b678 include/container.h --- a/include/container.h Fri May 02 13:27:47 2008 +0200 +++ b/include/container.h Mon May 05 15:31:14 2008 +0200 @@ -42,8 +42,10 @@ BBox bbox; public: ShapeList shapes; + 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, @@ -55,9 +57,9 @@ virtual ostream & dump(ostream &st); -#ifndef NO_SSE - virtual void packet_intersection(const Shape **origin_shapes, const RayPacket &rays, - Float *nearest_distances, Shape **nearest_shapes); +#ifndef NO_SIMD + virtual void packet_intersection(const Shape* const* origin_shapes, const RayPacket &rays, + Float *nearest_distances, Shape** nearest_shapes); #endif };