Redesign the material system

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

diff --git a/source/material.cpp b/source/material.cpp
index eee1ebc6152057d8799db1a118fa3dcda2bfcd2c..8bd6e54ca51b4bf1a48d5b86c07da3fe075d76c5 100644 (file)
--- a/source/material.cpp
+++ b/source/material.cpp
@@ -1,98 +1,48 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include "basicmaterial.h"
 #include "gl.h"
-#include "material.h"
+#include "resources.h"
+#include "texturing.h"
+
+using namespace std;
 
 namespace Msp {
 namespace GL {
 
-Material::Material():
-       ambient(0.2),
-       diffuse(0.8),
-       specular(0),
-       emission(0),
-       shininess(0)
-{ }
-
-void Material::set_ambient(const Color &a)
-{
-       ambient = a;
-}
-
-void Material::set_diffuse(const Color &d)
+void Material::attach_texture_to(const Texture *tex, Texturing &texturing, ProgramData &tex_shdata, const string &name) const
 {
-       diffuse = d;
-}
+       if(!tex)
+               return;
 
-void Material::set_specular(const Color &s)
-{
-       specular = s;
+       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_emission(const Color &e)
+Material::MaterialRegistry &Material::get_material_registry()
 {
-       emission = e;
-}
-
-void Material::set_shininess(float s)
-{
-       shininess = s;
-}
-
-void Material::bind() const
-{
-       if(current!=this)
+       static MaterialRegistry registry;
+       static bool initialized = false;
+       if(!initialized)
        {
-               glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, &ambient.r);
-               glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, &diffuse.r);
-               glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &specular.r);
-               glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, &emission.r);
-               glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shininess);
-               current = this;
+               registry.register_type<BasicMaterial>("basic");
        }
+       return registry;
 }
 
-void Material::unbind()
-{
-       current = 0;
-}
-
-const Material *Material::current = 0;
 
+DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
 
-Material::Loader::Loader(Material &m):
-       DataFile::ObjectLoader<Material>(m)
-{
-       add("ambient",   &Loader::ambient);
-       add("diffuse",   &Loader::diffuse);
-       add("specular",  &Loader::specular);
-       add("emission",  &Loader::emission);
-       add("shininess", &Material::shininess);
-}
-
-void Material::Loader::ambient(float r, float g, float b, float a)
-{
-       obj.ambient = GL::Color(r, g, b, a);
-}
-
-void Material::Loader::diffuse(float r, float g, float b, float a)
-{
-       obj.diffuse = GL::Color(r, g, b, a);
-}
-
-void Material::Loader::specular(float r, float g, float b, float a)
+Material::GenericLoader::GenericLoader(DataFile::Collection *c):
+       coll(c)
 {
-       obj.specular = GL::Color(r, g, b, a);
+       set_actions(shared_actions);
 }
 
-void Material::Loader::emission(float r, float g, float b, float a)
+void Material::GenericLoader::init_actions()
 {
-       obj.emission = GL::Color(r, g, b, a);
+       get_material_registry().add_all(*this);
 }
 
 } // namespace GL