Scene reader reads figures now.

tracer.hpp

@@ -6,10 +6,8 @@
 
 #include <glm/glm.hpp>
 
-#include "figure.hpp"
-#include "light.hpp"
-#include "environment.hpp"
 #include "ray.hpp"
+#include "scene.hpp"
 
 using std::vector;
 using glm::vec2;
@@ -29,7 +27,7 @@ public:
 
   virtual ~Tracer() { }
 
-  virtual vec3 trace_ray(Ray & r, vector<Figure *> & v_figures, vector<Light *> & v_lights, Environment * e, unsigned int rec_level) const = 0;
+  virtual vec3 trace_ray(Ray & r, Scene * s, unsigned int rec_level) const = 0;
 
 protected:
   float fresnel(const vec3 & i, const vec3 & n, const float ir1, const float ir2) const;