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

diff --git a/source/environmentmap.cpp b/source/environmentmap.cpp
index bf2a6359..ac68ff99 100644
--- a/source/environmentmap.cpp
+++ b/source/environmentmap.cpp
@@ -18,8 +18,9 @@ EnvironmentMap::EnvironmentMap(unsigned s, Renderable &r, Renderable &e):
 	update_delay(0)
 {
 	env_tex.storage(RGB, size, 1);
-	env_tex.set_wrap(CLAMP_TO_EDGE);
-	env_tex.set_min_filter(LINEAR);
+	Sampler &env_samp = env_tex.get_default_sampler();
+	env_samp.set_wrap(CLAMP_TO_EDGE);
+	env_samp.set_min_filter(LINEAR);
 	depth_buf.storage(DEPTH_COMPONENT, size, size);
 	for(unsigned i=0; i<6; ++i)
 	{
@@ -31,7 +32,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 +83,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);
 	}