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

Clean up for Lights (and AmbientLights)

Browse source
This commit is contained in:
Eryn Wells 2014-08-09 20:04:42 -07:00
parent d085a192e8
commit e1ded8a9ad
2 changed files with 80 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

143
src/light.cc
View file

@ -1,112 +1,77 @@
/* light.cc
*
* Lights light the scene.
*
* vim: set tw=80:
* Eryn Wells <eryn@erynwells.me>
*/
#include "basics.h"
#include "light.h"
#include "object.h"
#include "light.hh"
#pragma mark - Ambient Lights
AmbientLight::AmbientLight()
: AmbientLight(Color::White)
using charles::basics::Color;
namespace charles {
Light::Light(const Color& color,
const Double& intensity)
: mColor(color),
mIntensity(ClampIntensity(intensity))
{ }
AmbientLight::AmbientLight(const Color &c)
: AmbientLight(c, 0.0)
{ }
AmbientLight::AmbientLight(const Color &c, const float &i)
: color(c),
intensity(i)
Color&
Light::GetColor()
{
_clamp_intensity();
return mColor;
}
const Color &
AmbientLight::get_color()
const Color&
Light::GetColor()
const
{
return color;
return mColor;
}
const float &
AmbientLight::get_intensity()
void
Light::SetColor(const Color& color)
{
mColor = color;
}
Double
Light::GetIntensity()
const
{
return mIntensity;
}
void
Light::SetIntensity(const Double& intensity)
{
mIntensity = ClampIntensity(intensity);
}
Color&&
Light::Contribution()
const
{
return mColor * mIntensity;
}
Double
Light::ClampIntensity(const Double& intensity)
{
if (intensity < 0.0) {
return 0.0;
} else if (intensity > 1.0) {
return 1.0;
}
return intensity;
}
void
AmbientLight::set_intensity(const float &i)
{
intensity = i;
_clamp_intensity();
}
Color
AmbientLight::compute_color_contribution()
const
{
return color * intensity;
}
void
AmbientLight::_clamp_intensity()
{
if (intensity < 0.0) {
intensity = 0.0;
}
else if (intensity > 1.0) {
intensity = 1.0;
}
}
#pragma mark - Point Lights
PointLight::PointLight()
: PointLight(Vector3())
{ }
PointLight::PointLight(const Vector3 &o)
: PointLight(o, Color::White)
{ }
PointLight::PointLight(const Vector3 &o,
const Color &c)
: PointLight(o, c, 1.0)
{ }
PointLight::PointLight(const Vector3 &o,
const Color &c,
const float &i)
: AmbientLight(c, i),
mOrigin(o)
{ }
const Vector3&
PointLight::GetOrigin()
const
{
return mOrigin;
}
void
PointLight::SetOrigin(const Vector3& origin)
{
mOrigin = origin;
}
} /* namespace charles */

59
src/light.hh
View file

@ -1,53 +1,46 @@
/* light.h
*
* Lights light the scene.
*
/* light.hh
* vim: set tw=80:
* Eryn Wells <eryn@erynwells.me>
*/
#ifndef __LIGHT_H__
#define __LIGHT_H__
#include "basics.h"
#include "basics/basics.hh"
class AmbientLight
namespace charles {
struct Light
{
public:
AmbientLight();
AmbientLight(const Color &c);
AmbientLight(const Color &c, const float &i);
Light(const basics::Color& color,
const Double& intensity = 1.0);
const Color &get_color() const;
const float &get_intensity() const;
void set_intensity(const float &i);
basics::Color& GetColor();
const basics::Color& GetColor() const;
void SetColor(basics::Color& color);
Color compute_color_contribution() const;
Double GetIntensity() const;
void SetIntensity(const Double& intensity);
protected:
Color color;
float intensity;
basics::Color&& Contribution() const;
private:
void _clamp_intensity();
Double ClampIntensity(const Double& intensity);
/** The color of the light. */
basics::Color mColor;
/**
* The intensity of the light. Normal values range from 0.0 to 1.0, but
* they can be set higher.
*/
Double mIntensity;
};
class PointLight
: public AmbientLight
{
public:
PointLight();
typedef Light AmbientLight;
PointLight(const Vector3 &o);
PointLight(const Vector3 &o, const Color &c);
PointLight(const Vector3 &o, const Color &c, const float &i);
const Vector3& GetOrigin() const;
void SetOrigin(const Vector3& origin);
private:
Vector3 mOrigin;
};
} /* namespace charles */
#endif