X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fdirectionallight.cpp;h=61e98093a6996857c627926e52272f5ef8bfc06f;hb=f1e296bb2442dfbea12e7b38a97cc152aa34569c;hp=a306196afba7001b049ca5ae01e59a8bfca6c95f;hpb=adc26a2e141a2853b6c5025130c46a46cece4b84;p=libs%2Fgl.git

diff --git a/source/materials/directionallight.cpp b/source/materials/directionallight.cpp
index a306196a..61e98093 100644
--- a/source/materials/directionallight.cpp
+++ b/source/materials/directionallight.cpp
@@ -6,11 +6,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-DirectionalLight::DirectionalLight():
-	transmittance(1.0f),
-	direction(0.0f, 0.0f, -1.0f)
-{ }
-
 void DirectionalLight::update_matrix()
 {
 	Vector3 up_dir;
@@ -52,7 +47,7 @@ void DirectionalLight::set_transmittance(const Color &t)
 void DirectionalLight::update_shader_data(ProgramData &shdata, const string &base) const
 {
 	shdata.uniform(base+".type", 1);
-	shdata.uniform(base+".position", -direction.x, -direction.y, -direction.z, 0.0f);
+	shdata.uniform(base+".position", compose(-direction, 0.0f));
 	shdata.uniform(base+".color", color.r*transmittance.r, color.g*transmittance.g, color.b*transmittance.b);
 	shdata.uniform(base+".attenuation", 1.0f, 0.0f, 0.0f);
 }