X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fpbrmaterial.cpp;h=4a5f0a419d370ef1bc935bdf15fc3ff0cd0929d5;hb=01113149a4f70b590e6817aa4ba04062f7db4771;hp=c5d849c1cfcc6030a5caa5ff430907db439d9462;hpb=7a5d84b06d0217c5edad5d9f4ef51404de0cb911;p=libs%2Fgl.git diff --git a/source/materials/pbrmaterial.cpp b/source/materials/pbrmaterial.cpp index c5d849c1..4a5f0a41 100644 --- a/source/materials/pbrmaterial.cpp +++ b/source/materials/pbrmaterial.cpp @@ -27,6 +27,7 @@ PbrMaterial::PbrMaterial(): fresnel_sampler(Resources::get_global().get("_linear_clamp.samp")) { set_base_color(0.8f); + set_tint(1.0f); set_metalness(0.0f); set_roughness(0.5f); set_emission(0.0f); @@ -66,7 +67,7 @@ const Texture2D &PbrMaterial::get_or_create_fresnel_lookup() void PbrMaterial::fill_program_info(string &module_name, map &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);