};
PbrMaterial::PbrMaterial():
- fresnel_lookup(get_or_create_fresnel_lookup())
+ fresnel_lookup(get_or_create_fresnel_lookup()),
+ 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);
{
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;
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.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);
return 0;
}
+const Sampler *PbrMaterial::get_sampler(Tag tag) const
+{
+ if(tag==texture_tags[6])
+ return &fresnel_sampler;
+ else
+ return sampler;
+}
+
void PbrMaterial::set_base_color(const Color &color)
{
base_color.value = color;
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;
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)
{
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