X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fpbrmaterial.cpp;h=b153a2cbeb32b890aec9cb9219725d73fd18f92a;hb=e196a09d1df1e8504ff037d1701b7159c4f04e84;hp=5dc1b55c67f83b80779ae3e19f61dfe6523f845c;hpb=ce3658993ce2f6b7527a04a36a5e1af349c6f2e9;p=libs%2Fgl.git

diff --git a/source/materials/pbrmaterial.cpp b/source/materials/pbrmaterial.cpp
index 5dc1b55c..b153a2cb 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,19 +52,21 @@ 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);
+	Framebuffer fresnel_lookup_fbo((COLOR_ATTACHMENT,RG8));
+	fresnel_lookup_fbo.attach(COLOR_ATTACHMENT, *fresnel_lookup);
 	Renderer renderer;
+	renderer.begin();
 	renderer.set_framebuffer(&fresnel_lookup_fbo);
 	renderer.set_shader_program(&shprog, &shdata);
 	mesh.draw(renderer);
+	renderer.end();
 
 	return *fresnel_lookup;
 }
 
 void PbrMaterial::fill_program_info(string &module_name, map<string, int> &spec_values) const
 {
-	module_name = "cooktorrance.glsl";
+	module_name = "pbr_material.glsl";
 	spec_values["use_base_color_map"] = (base_color.texture!=0);
 	spec_values["use_normal_map"] = (normal.texture!=0);
 	spec_values["use_metalness_map"] = (metalness.texture!=0);
@@ -114,6 +116,12 @@ void PbrMaterial::set_base_color_map(const Texture *tex)
 	base_color.texture = tex;
 }
 
+void PbrMaterial::set_tint(const Color &color)
+{
+	tint.value = color;
+	shdata.uniform("pbr_material.tint", color);
+}
+
 void PbrMaterial::set_normal_map(const Texture *tex)
 {
 	normal.texture = tex;
@@ -160,12 +168,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)
 {
@@ -181,6 +183,7 @@ void PbrMaterial::Loader::init_actions()
 	add_property("roughness", &PbrMaterial::set_roughness, &PbrMaterial::set_roughness_map);
 	add_property("occlusion", &PbrMaterial::set_occlusion_map);
 	add_property("emission", &PbrMaterial::set_emission, &PbrMaterial::set_emission_map, false);
+	add_property("tint", &PbrMaterial::set_tint, 0, true);
 }
 
 } // namespace GL