Update Scene a bit for new code style and namespaces in Object and Sphere

This commit is contained in:
Eryn Wells 2014-07-20 16:54:10 -07:00
parent cf7806484f
commit 5a8d634590
2 changed files with 29 additions and 29 deletions

View file

@ -15,11 +15,11 @@
#include <string>
#include "basics.h"
#include "camera.h"
#include "object.h"
class AmbientLight;
class PointLight;
class Shape;
class Writer;
@ -46,7 +46,7 @@ public:
void write(Writer &writer, const std::string &filename);
void render();
void add_shape(Shape *obj);
void add_shape(charles::Object::Ptr obj);
void add_light(PointLight *light);
private:
@ -66,7 +66,7 @@ private:
// Scene objects.
AmbientLight *ambient;
std::list<Shape *> shapes;
std::list<charles::Object::Ptr> shapes;
std::list<PointLight *> lights;
// Rendering stats