equal
deleted
inserted
replaced
27 #ifndef CONTAINER_H |
27 #ifndef CONTAINER_H |
28 #define CONTAINER_H |
28 #define CONTAINER_H |
29 |
29 |
30 #include <vector> |
30 #include <vector> |
31 |
31 |
32 #include "scene.h" |
32 #include "shapes.h" |
33 |
33 |
34 using namespace std; |
34 using namespace std; |
35 |
35 |
36 /** |
36 /** |
37 * general container |
37 * general container |
47 virtual void addShape(Shape* aShape); |
47 virtual void addShape(Shape* aShape); |
48 //void addShapeNoExtend(Shape* aShape) { shapes.push_back(aShape); }; |
48 //void addShapeNoExtend(Shape* aShape) { shapes.push_back(aShape); }; |
49 virtual Shape *nearest_intersection(const Shape *origin_shape, const Ray &ray, |
49 virtual Shape *nearest_intersection(const Shape *origin_shape, const Ray &ray, |
50 Float &nearest_distance); |
50 Float &nearest_distance); |
51 virtual void optimize() {}; |
51 virtual void optimize() {}; |
|
52 |
|
53 ShapeList & getShapes() { return shapes; }; |
|
54 |
|
55 virtual ostream & dump(ostream &st); |
52 }; |
56 }; |
53 |
57 |
54 #endif |
58 #endif |