Access builtin resources through a global instance

[libs/gl.git] / source / materials / pbrmaterial.cpp

diff --git a/source/materials/pbrmaterial.cpp b/source/materials/pbrmaterial.cpp
index 16c287b4e40f6ad97987ac517ba57315646dc711..7c73996fd2f7b8e91af2ab4eb27d08fd5592de70 100644 (file)
--- a/source/materials/pbrmaterial.cpp
+++ b/source/materials/pbrmaterial.cpp
@@ -5,8 +5,18 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-PbrMaterial::PbrMaterial():
-       receive_shadows(false)
+const Tag PbrMaterial::texture_tags[] =
+{
+       Tag("base_color_map"),
+       Tag("normal_map"),
+       Tag("metalness_map"),
+       Tag("roughness_map"),
+       Tag("occlusion_map"),
+       Tag("emission_map"),
+       Tag()
+};
+
+PbrMaterial::PbrMaterial()
 {
        set_base_color(0.8f);
        set_metalness(0.0f);
@@ -25,9 +35,10 @@ void PbrMaterial::fill_program_info(string &module_name, map<string, int> &spec_
        bool use_emission = (emission.texture || emission.value.r || emission.value.g || emission.value.b);
        spec_values["use_emission"] = use_emission;
        spec_values["use_emission_map"] = (emission.texture!=0);
-       spec_values["use_shadow_map"] = receive_shadows;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 void PbrMaterial::attach_textures_to(Texturing &texturing, ProgramData &tex_shdata) const
 {
        attach_texture_to(base_color.texture, texturing, tex_shdata, "base_color_map");
@@ -37,6 +48,25 @@ void PbrMaterial::attach_textures_to(Texturing &texturing, ProgramData &tex_shda
        attach_texture_to(occlusion.texture, texturing, tex_shdata, "occlusion_map");
        attach_texture_to(emission.texture, texturing, tex_shdata, "emission_map");
 }
+#pragma GCC diagnostic pop
+
+const Texture *PbrMaterial::get_texture(Tag tag) const
+{
+       if(tag==texture_tags[0])
+               return base_color.texture;
+       else if(tag==texture_tags[1])
+               return normal.texture;
+       else if(tag==texture_tags[2])
+               return metalness.texture;
+       else if(tag==texture_tags[3])
+               return roughness.texture;
+       else if(tag==texture_tags[4])
+               return occlusion.texture;
+       else if(tag==texture_tags[5])
+               return emission.texture;
+       else
+               return 0;
+}
 
 void PbrMaterial::set_base_color(const Color &color)
 {
@@ -92,11 +122,6 @@ void PbrMaterial::set_emission_map(const Texture *tex)
        emission.texture = tex;
 }
 
-void PbrMaterial::set_receive_shadows(bool s)
-{
-       receive_shadows = s;
-}
-
 
 DataFile::Loader::ActionMap PbrMaterial::Loader::shared_actions;
 
@@ -121,7 +146,6 @@ 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("receive_shadows", &PbrMaterial::receive_shadows);
 }
 
 } // namespace GL