X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Fpbrmaterial.cpp;h=ebd3321f2268a05054c05f086c035e5b88fdb39a;hp=ed94bf799f53179e17ad977c782d365272e88edc;hb=HEAD;hpb=ae45c0397e2cb8f0a01f2f31d01c95ff3870271e

diff --git a/source/materials/pbrmaterial.cpp b/source/materials/pbrmaterial.cpp
index ed94bf79..4a5f0a41 100644
--- a/source/materials/pbrmaterial.cpp
+++ b/source/materials/pbrmaterial.cpp
@@ -27,6 +27,7 @@ PbrMaterial::PbrMaterial():
 	fresnel_sampler(Resources::get_global().get<Sampler>("_linear_clamp.samp"))
 {
 	set_base_color(0.8f);
+	set_tint(1.0f);
 	set_metalness(0.0f);
 	set_roughness(0.5f);
 	set_emission(0.0f);
@@ -36,7 +37,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;
@@ -55,16 +56,18 @@ const Texture2D &PbrMaterial::get_or_create_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 +117,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;
@@ -175,6 +184,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