X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Feffects%2Fenvironmentmap.cpp;h=315390b1ca81664c47a2a5c940ef445ee94faa97;hp=2291a2023471ca4c960b1dd922bbff6896b0aa98;hb=f19366d32cc29287a2730cfba90893e407754081;hpb=f96d553dbf78f9d664d1dbb1fe002fc43f23ad47

diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp
index 2291a202..315390b1 100644
--- a/source/effects/environmentmap.cpp
+++ b/source/effects/environmentmap.cpp
@@ -12,16 +12,8 @@ namespace Msp {
 namespace GL {
 
 EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, Renderable &r, Renderable &e):
-	Effect(r),
-	environment(e),
-	irradiance_shprog(Resources::get_global().get<Program>("_envmap_irradiance.glsl.shader")),
-	specular_shprog(Resources::get_global().get<Program>("_envmap_specular.glsl.shader")),
-	fullscreen_mesh(Resources::get_global().get<Mesh>("_fullscreen_quad.mesh")),
-	sampler(Resources::get_global().get<Sampler>("_linear_clamp.samp")),
-	mip_sampler(Resources::get_global().get<Sampler>("_mip_clamp.samp"))
-{
-	init(s, f, 1);
-}
+	EnvironmentMap(s, f, 1, r, e)
+{ }
 
 EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable &r, Renderable &e):
 	Effect(r),
@@ -31,11 +23,6 @@ EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable
 	fullscreen_mesh(Resources::get_global().get<Mesh>("_fullscreen_quad.mesh")),
 	sampler(Resources::get_global().get<Sampler>("_linear_clamp.samp")),
 	mip_sampler(Resources::get_global().get<Sampler>("_mip_clamp.samp"))
-{
-	init(s, f, l);
-}
-
-void EnvironmentMap::init(unsigned s, PixelFormat f, unsigned l)
 {
 	if(!l || (1U<<(l-1))>=s)
 		throw invalid_argument("EnvironmentMap::EnvironmentMap");