Check the flat qualifier from the correct member

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

diff --git a/source/materials/basicmaterial.cpp b/source/materials/basicmaterial.cpp
index 362fc9db14e6a8636960bec3a746cd8e62715ed8..3a4b7487ec2fc528fe2cecc54010800a552e3971 100644 (file)
--- a/source/materials/basicmaterial.cpp
+++ b/source/materials/basicmaterial.cpp
@@ -5,8 +5,18 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-BasicMaterial::BasicMaterial():
-       receive_shadows(false)
+const Tag BasicMaterial::texture_tags[] =
+{
+       Tag("diffuse_map"),
+       Tag("specular_map"),
+       Tag("shininess_map"),
+       Tag("normal_map"),
+       Tag("emission_map"),
+       Tag("reflectivity_map"),
+       Tag()
+};
+
+BasicMaterial::BasicMaterial()
 {
        set_diffuse(Color(1.0f));
        set_specular(Color(0.0f));
@@ -15,46 +25,38 @@ BasicMaterial::BasicMaterial():
        set_reflectivity(0.0f);
 }
 
-string BasicMaterial::create_program_source() const
-{
-       string source = "import phong;\n";
-       if(diffuse.texture)
-               source += "const bool use_diffuse_map = true;\n";
-       if(specular.texture || specular.value.r || specular.value.g || specular.value.b)
-       {
-               source += "const bool use_specular = true;\n";
-               if(specular.texture)
-                       source += "const bool use_specular_map = true;\n";
-               if(shininess.texture)
-                       source += "const bool use_shininess_map = true;\n";
-       }
-       if(normal.texture)
-               source += "const bool use_normal_map = true;\n";
-       if(emission.texture || emission.value.r || emission.value.g || emission.value.b)
-       {
-               source += "const bool use_emission = true;\n";
-               if(emission.texture)
-                       source += "const bool use_emission_map = true;\n";
-       }
-       if(reflectivity.value || reflectivity.texture)
-       {
-               source += "const bool use_reflectivity = true;\n";
-               if (reflectivity.texture)
-                       source += "const bool use_reflectivity_map = true;\n";
-       }
-       if(receive_shadows)
-               source += "const bool use_shadow_map = true;\n";
-       return source;
-}
-
-void BasicMaterial::attach_textures_to(Texturing &texturing, ProgramData &tex_shdata) const
-{
-       attach_texture_to(diffuse.texture, texturing, tex_shdata, "diffuse_map");
-       attach_texture_to(specular.texture, texturing, tex_shdata, "specular_map");
-       attach_texture_to(normal.texture, texturing, tex_shdata, "normal_map");
-       attach_texture_to(emission.texture, texturing, tex_shdata, "emission_map");
-       attach_texture_to(shininess.texture, texturing, tex_shdata, "shininess_map");
-       attach_texture_to(reflectivity.texture, texturing, tex_shdata, "reflectivity_map");
+void BasicMaterial::fill_program_info(string &module_name, map<string, int> &spec_values) const
+{
+       module_name = "phong.glsl";
+       spec_values["use_diffuse_map"] = (diffuse.texture!=0);
+       bool use_specular = (specular.texture || specular.value.r || specular.value.g || specular.value.b);
+       spec_values["use_specular"] = use_specular;
+       spec_values["use_specular_map"] = (specular.texture!=0);
+       spec_values["use_shininess_map"] = (use_specular && shininess.texture!=0);
+       spec_values["use_normal_map"] = (normal.texture!=0);
+       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_reflectivity"] = (reflectivity.value!=0 || reflectivity.texture!=0);
+       spec_values["use_reflectivity_map"] = (reflectivity.texture!=0);
+}
+
+const Texture *BasicMaterial::get_texture(Tag tag) const
+{
+       if(tag==texture_tags[0])
+               return diffuse.texture;
+       else if(tag==texture_tags[1])
+               return specular.texture;
+       else if(tag==texture_tags[2])
+               return shininess.texture;
+       else if(tag==texture_tags[3])
+               return normal.texture;
+       else if(tag==texture_tags[4])
+               return emission.texture;
+       else if(tag==texture_tags[5])
+               return reflectivity.texture;
+       else
+               return 0;
 }
 
 void BasicMaterial::set_diffuse(const Color &color)
@@ -117,20 +119,9 @@ void BasicMaterial::set_reflectivity_map(const Texture *tex)
        reflectivity.texture = tex;
 }
 
-void BasicMaterial::set_receive_shadows(bool s)
-{
-       receive_shadows = s;
-}
-
 
 DataFile::Loader::ActionMap BasicMaterial::Loader::shared_actions;
 
-BasicMaterial::Loader::Loader(BasicMaterial &m):
-       DerivedObjectLoader<BasicMaterial, Material::PropertyLoader<BasicMaterial> >(m)
-{
-       set_actions(shared_actions);
-}
-
 BasicMaterial::Loader::Loader(BasicMaterial &m, Collection &c):
        DerivedObjectLoader<BasicMaterial, Material::PropertyLoader<BasicMaterial> >(m, c)
 {
@@ -146,7 +137,6 @@ void BasicMaterial::Loader::init_actions()
        add_property("emission", &BasicMaterial::set_emission, &BasicMaterial::set_emission_map, false);
        add_property("shininess", &BasicMaterial::set_shininess, &BasicMaterial::set_shininess_map);
        add_property("reflectivity", &BasicMaterial::set_reflectivity, &BasicMaterial::set_reflectivity_map);
-       add("receive_shadows", &BasicMaterial::receive_shadows);
 }
 
 } // namespace GL