From fcc6f1a7188f3a42f15e6edb4b4475aadc5a4363 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Fri, 13 Sep 2013 18:24:12 -0700 Subject: [PATCH] Add set_intensity; clean up PointLight constructors --- src/light.cc | 18 +++++++++++------- src/light.h | 1 + 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/light.cc b/src/light.cc index 4289ff7..6347917 100644 --- a/src/light.cc +++ b/src/light.cc @@ -17,7 +17,7 @@ AmbientLight::AmbientLight() AmbientLight::AmbientLight(const Color &c) - : AmbientLight(c, 1.0) + : AmbientLight(c, 0.0) { } @@ -44,6 +44,13 @@ AmbientLight::get_intensity() return intensity; } +void +AmbientLight::set_intensity(const float &i) +{ + intensity = i; + _clamp_intensity(); +} + Color AmbientLight::compute_color_contribution() @@ -67,21 +74,18 @@ AmbientLight::_clamp_intensity() #pragma mark - Point Lights PointLight::PointLight() - : AmbientLight(), - Object() + : PointLight(Vector3()) { } PointLight::PointLight(const Vector3 &o) - : AmbientLight(), - Object(o) + : PointLight(o, Color::White) { } PointLight::PointLight(const Vector3 &o, const Color &c) - : AmbientLight(c), - Object(o) + : PointLight(o, c, 1.0) { } diff --git a/src/light.h b/src/light.h index 1983e2a..236c593 100644 --- a/src/light.h +++ b/src/light.h @@ -21,6 +21,7 @@ public: const Color &get_color() const; const float &get_intensity() const; + void set_intensity(const float &i); Color compute_color_contribution() const;