X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Fpointlight.cpp;h=3147eaa31bab0640fbe9c7aa62b54f5729890f5e;hp=4bbf4135dae9a7eabe6a24ba2c8a90cf62999781;hb=HEAD;hpb=adc26a2e141a2853b6c5025130c46a46cece4b84

diff --git a/source/materials/pointlight.cpp b/source/materials/pointlight.cpp
index 4bbf4135..1607066c 100644
--- a/source/materials/pointlight.cpp
+++ b/source/materials/pointlight.cpp
@@ -6,11 +6,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-PointLight::PointLight():
-	position(0.0f, 0.0f, 0.0f),
-	attenuation{1.0f, 0.0f, 0.1f}
-{ }
-
 void PointLight::update_matrix()
 {
 	matrix = Matrix::translation(position);
@@ -42,8 +37,9 @@ void PointLight::set_attenuation(float c, float l, float q)
 void PointLight::update_shader_data(ProgramData &shdata, const string &base) const
 {
 	shdata.uniform(base+".type", 2);
-	shdata.uniform(base+".position", position.x, position.y, position.z, 1.0f);
+	shdata.uniform(base+".position", compose(position, 1.0f));
 	shdata.uniform(base+".color", color.r, color.g, color.b);
+	shdata.uniform3(base+".attenuation", attenuation);
 }