josh/fart
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added an ambient color component to Material, changed Lighting to use it

Browse Source 
git-svn-id: svn://anubis/fart/trunk@75 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop 2009-01-31 22:34:36 +00:00
parent 7181a894a4
commit c4509d0594
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/Lighting.cc
View File

@ -11,7 +11,7 @@ Color Lighting::computePhong(const Material & material,
const Vector & surfaceNormal, const Vector & surfaceNormal,
const Color & ambientLight) const Color & ambientLight)
{ {
Color result = ambientLight; Color result = ambientLight * material.getAmbientColor();
Vector viewDirection = -viewRay.getDirection(); Vector viewDirection = -viewRay.getDirection();
double shininess = material.getShininess(); double shininess = material.getShininess();

7
main/Material.h
View File

@ -12,6 +12,12 @@ class Material
Material(); Material();
void setAmbientColor(const Color & ambient)
{
m_ambient_color = ambient;
}
const Color & getAmbientColor() const { return m_ambient_color; }
void setDiffuseColor(const Color & diffuse) void setDiffuseColor(const Color & diffuse)
{ {
m_diffuse_color = diffuse; m_diffuse_color = diffuse;
@ -28,6 +34,7 @@ class Material
double getShininess() const { return m_shininess; } double getShininess() const { return m_shininess; }
protected: protected:
Color m_ambient_color;
Color m_diffuse_color; Color m_diffuse_color;
Color m_specular_color; Color m_specular_color;
double m_shininess; double m_shininess;

9
main/Scene.cc
View File

@ -25,7 +25,7 @@ Scene::Scene(const map<string, const char *> & options,
m_vfov = 60.0; m_vfov = 60.0;
m_verbose = false; m_verbose = false;
m_data = NULL; m_data = NULL;
m_ambient_light = Color(0.1, 0.1, 0.1); m_ambient_light = Color(0.05, 0.05, 0.05);
load(filename); load(filename);
@ -91,12 +91,17 @@ void Scene::load(const char * filename)
Shape * plane = new Plane(0, 0, 1, -2); Shape * plane = new Plane(0, 0, 1, -2);
m_shapes.push_back(plane); m_shapes.push_back(plane);
Material * m = new Material();
m->setDiffuseColor(Color::red);
m->setAmbientColor(Color::red);
Shape * shape = new Sphere(1.0); Shape * shape = new Sphere(1.0);
m_transform.translate(1.0, 5.0, 0.5); m_transform.translate(1.0, 5.0, 0.5);
shape->setTransform(m_transform); shape->setTransform(m_transform);
shape->setMaterial(m);
m_shapes.push_back(shape); m_shapes.push_back(shape);
Light * light = new PointLight(Vector(-1, -1, 1)); Light * light = new PointLight(Vector(2, -1, 2));
m_lights.push_back(light); m_lights.push_back(light);
} }