eryn/charles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up some dependencies between scene, material, and color

Browse source
This commit is contained in:
Eryn Wells 2014-08-09 20:34:23 -07:00
parent 48e35dfc81
commit c3da70cdd9
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/scene.hh
View file

@ -11,6 +11,7 @@
#include "camera.hh"
#include "light.hh"
#include "lightPoint.hh"
#include "object.hh"
#include "stats.hh"
#include "basics/basics.hh"
@ -42,16 +43,16 @@ struct Scene
void Render();
bool IsRendered() const;
const Color* GetPixels() const;
const basics::Color* GetPixels() const;
AmbientLight& GetAmbient();
void AddObject(Object::Ptr obj);
void AddLight(PointLight* light);
private:
Color TraceRay(const basics::Ray &ray,
const int depth = 0,
const Double weight = 1.0);
basics::Color TraceRay(const basics::Ray &ray,
const int depth = 0,
const Double weight = 1.0);
void LogCamera() const;
void LogObjects() const;
@ -78,7 +79,7 @@ private:
// Rendering output.
bool mIsRendered;
Color *mPixels;
basics::Color *mPixels;
};
} /* namespace charles */