Redesign the material system

[libs/gl.git] / source / material.cpp

diff --git a/source/material.cpp b/source/material.cpp
index 1d5a4087af2b3b8f6c9db232792c7eff45732a1c..8bd6e54ca51b4bf1a48d5b86c07da3fe075d76c5 100644 (file)
--- a/source/material.cpp
+++ b/source/material.cpp
@@ -1,120 +1,48 @@
+#include "basicmaterial.h"
 #include "gl.h"
-#include "material.h"
 #include "resources.h"
+#include "texturing.h"
+
+using namespace std;
 
 namespace Msp {
 namespace GL {
 
-Material::Material()
-{
-       set_ambient(0.2);
-       set_diffuse(0.8);
-       set_specular(0);
-       set_emission(0);
-       set_shininess(0);
-       set_reflectivity(0);
-}
-
-void Material::set_ambient(const Color &a)
-{
-       ambient = a;
-       shdata.uniform("material.ambient", ambient);
-}
-
-void Material::set_diffuse(const Color &d)
-{
-       diffuse = d;
-       shdata.uniform("material.diffuse", diffuse);
-}
-
-void Material::set_specular(const Color &s)
+void Material::attach_texture_to(const Texture *tex, Texturing &texturing, ProgramData &tex_shdata, const string &name) const
 {
-       specular = s;
-       shdata.uniform("material.specular", specular);
-}
+       if(!tex)
+               return;
 
-void Material::set_emission(const Color &e)
-{
-       emission = e;
-       shdata.uniform("material.emission", emission);
-}
-
-void Material::set_shininess(float s)
-{
-       shininess = s;
-       shdata.uniform("material.shininess", shininess);
+       int unit = texturing.find_free_unit(name);
+       if(unit<0)
+               throw runtime_error("no free texunit");
+       texturing.attach(unit, *tex);
+       tex_shdata.uniform(name, unit);
 }
 
-void Material::set_reflectivity(float r)
+Material::MaterialRegistry &Material::get_material_registry()
 {
-       reflectivity = r;
-       shdata.uniform("reflectivity", reflectivity);
+       static MaterialRegistry registry;
+       static bool initialized = false;
+       if(!initialized)
+       {
+               registry.register_type<BasicMaterial>("basic");
+       }
+       return registry;
 }
 
 
-Material::Loader::Loader(Material &m):
-       DataFile::CollectionObjectLoader<Material>(m, 0)
-{
-       init();
-}
-
-Material::Loader::Loader(Material &m, Collection &c):
-       DataFile::CollectionObjectLoader<Material>(m, &c)
-{
-       init();
-}
-
-void Material::Loader::init()
-{
-       if(Resources *res = dynamic_cast<Resources *>(coll))
-               srgb = res->get_srgb_conversion();
-       else
-               srgb = false;
-
-       add("ambient",   &Loader::ambient);
-       add("diffuse",   &Loader::diffuse);
-       add("specular",  &Loader::specular);
-       add("emission",  &Loader::emission);
-       add("shininess", &Loader::shininess);
-       add("reflectivity", &Loader::reflectivity);
-}
-
-Color Material::Loader::make_color(float r, float g, float b, float a)
-{
-       Color c(r, g, b, a);
-       if(srgb)
-               c = c.to_linear();
-       return c;
-}
-
-void Material::Loader::ambient(float r, float g, float b, float a)
-{
-       obj.set_ambient(make_color(r, g, b, a));
-}
-
-void Material::Loader::diffuse(float r, float g, float b, float a)
-{
-       obj.set_diffuse(make_color(r, g, b, a));
-}
-
-void Material::Loader::specular(float r, float g, float b, float a)
-{
-       obj.set_specular(make_color(r, g, b, a));
-}
-
-void Material::Loader::emission(float r, float g, float b, float a)
-{
-       obj.set_emission(make_color(r, g, b, a));
-}
+DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
 
-void Material::Loader::shininess(float s)
+Material::GenericLoader::GenericLoader(DataFile::Collection *c):
+       coll(c)
 {
-       obj.set_shininess(s);
+       set_actions(shared_actions);
 }
 
-void Material::Loader::reflectivity(float r)
+void Material::GenericLoader::init_actions()
 {
-       obj.set_reflectivity(r);
+       get_material_registry().add_all(*this);
 }
 
 } // namespace GL