X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Fpbrmaterial.cpp;h=e01bbb9d5f0043463a6d38a987f04758a2c95022;hp=f50baf9b7d4cdc019728315efb1a493fa19035d9;hb=c8520aa336e92f2eaf9a38c3430c608520a90324;hpb=a482029babea3210840d8c62e9df9ece4342b2b9

diff --git a/source/materials/pbrmaterial.cpp b/source/materials/pbrmaterial.cpp
index f50baf9b..e01bbb9d 100644
--- a/source/materials/pbrmaterial.cpp
+++ b/source/materials/pbrmaterial.cpp
@@ -36,7 +36,7 @@ const Texture2D &PbrMaterial::get_or_create_fresnel_lookup()
 {
 	Resources &resources = Resources::get_global();
 
-	static const string name = "_pbr_fresnel_lookup.tex2d";
+	static const string name = "_pbr_fresnel_lookup.tex";
 	Texture2D *fresnel_lookup = resources.find<Texture2D>(name);
 	if(fresnel_lookup)
 		return *fresnel_lookup;
@@ -52,10 +52,10 @@ const Texture2D &PbrMaterial::get_or_create_fresnel_lookup()
 	shdata.uniform("roughness", 0.0f);
 
 	const Mesh &mesh = resources.get<Mesh>("_fullscreen_quad.mesh");
-	Framebuffer fresnel_lookup_fbo;
-	fresnel_lookup_fbo.attach(COLOR_ATTACHMENT0, *fresnel_lookup);
-	Bind bind_fbo(fresnel_lookup_fbo);
+	Framebuffer fresnel_lookup_fbo((COLOR_ATTACHMENT,RG8));
+	fresnel_lookup_fbo.attach(COLOR_ATTACHMENT, *fresnel_lookup);
 	Renderer renderer;
+	renderer.set_framebuffer(&fresnel_lookup_fbo);
 	renderer.set_shader_program(&shprog, &shdata);
 	mesh.draw(renderer);
 
@@ -160,12 +160,6 @@ void PbrMaterial::set_emission_map(const Texture *tex)
 
 DataFile::Loader::ActionMap PbrMaterial::Loader::shared_actions;
 
-PbrMaterial::Loader::Loader(PbrMaterial &m):
-	DerivedObjectLoader<PbrMaterial, Material::PropertyLoader<PbrMaterial> >(m)
-{
-	set_actions(shared_actions);
-}
-
 PbrMaterial::Loader::Loader(PbrMaterial &m, Collection &c):
 	DerivedObjectLoader<PbrMaterial, Material::PropertyLoader<PbrMaterial> >(m, c)
 {