X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fenvironmentmap.cpp;h=3902eb8c95b240434036bdd0915e9433cd373149;hp=bf2a63597cd512244953eba4a7d6ed5dc3248548;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=8697b05bf71c49882fe15d53aa4f502aa2b5f9a3

diff --git a/source/environmentmap.cpp b/source/environmentmap.cpp
index bf2a6359..3902eb8c 100644
--- a/source/environmentmap.cpp
+++ b/source/environmentmap.cpp
@@ -13,14 +13,13 @@ EnvironmentMap::EnvironmentMap(unsigned s, Renderable &r, Renderable &e):
 	Effect(r),
 	size(s),
 	environment(e),
+	sampler(get_linear_sampler()),
 	rendered(false),
 	update_interval(1),
 	update_delay(0)
 {
-	env_tex.storage(RGB, size, 1);
-	env_tex.set_wrap(CLAMP_TO_EDGE);
-	env_tex.set_min_filter(LINEAR);
-	depth_buf.storage(DEPTH_COMPONENT, size, size);
+	env_tex.storage(RGB8, size, 1);
+	depth_buf.storage(DEPTH_COMPONENT32F, size, size);
 	for(unsigned i=0; i<6; ++i)
 	{
 		fbo[i].attach(COLOR_ATTACHMENT0, env_tex, TextureCube::enumerate_faces(i), 0);
@@ -31,7 +30,6 @@ EnvironmentMap::EnvironmentMap(unsigned s, Renderable &r, Renderable &e):
 	camera.set_field_of_view(Geometry::Angle<float>::right());
 	camera.set_aspect_ratio(1);
 	camera.set_depth_clip(0.1, 100);
-
 }
 
 void EnvironmentMap::set_depth_clip(float n, float f)
@@ -83,8 +81,8 @@ void EnvironmentMap::setup_frame(Renderer &renderer)
 		TextureCubeFace face = TextureCube::enumerate_faces(i);
 		fbo[i].bind();
 		fbo[i].clear();
-		camera.set_look_direction(env_tex.get_face_direction(face));
-		camera.set_up_direction(env_tex.get_t_direction(face));
+		camera.set_look_direction(TextureCube::get_face_direction(face));
+		camera.set_up_direction(TextureCube::get_t_direction(face));
 		renderer.set_camera(camera);
 		renderer.render(environment);
 	}
@@ -109,6 +107,7 @@ void EnvironmentMap::render(Renderer &renderer, const Tag &tag) const
 
 	unsigned unit = renderer.allocate_effect_texunit();
 	shdata.uniform("environment", static_cast<int>(unit));
+	Bind _bind_sampler(*sampler, unit);
 	Bind _bind_env(env_tex, unit);
 
 	const Matrix &camera_matrix = renderer.get_camera()->get_object_matrix();