Remove support for legacy OpenGL features

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

diff --git a/source/material.cpp b/source/material.cpp
index f165c744fcdf06277c362977954b800c06e6e6df..1d5a4087af2b3b8f6c9db232792c7eff45732a1c 100644 (file)
--- a/source/material.cpp
+++ b/source/material.cpp
@@ -1,86 +1,120 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include "gl.h"
 #include "material.h"
+#include "resources.h"
 
 namespace Msp {
 namespace GL {
 
-Material::Material():
-       ambient(0.2),
-       diffuse(0.8),
-       specular(0),
-       emission(0),
-       shininess(0)
-{ }
+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;
+       ambient = a;
+       shdata.uniform("material.ambient", ambient);
 }
 
 void Material::set_diffuse(const Color &d)
 {
-       diffuse=d;
+       diffuse = d;
+       shdata.uniform("material.diffuse", diffuse);
 }
 
 void Material::set_specular(const Color &s)
 {
-       specular=s;
+       specular = s;
+       shdata.uniform("material.specular", specular);
 }
 
 void Material::set_emission(const Color &e)
 {
-       emission=e;
+       emission = e;
+       shdata.uniform("material.emission", emission);
 }
 
 void Material::set_shininess(float s)
 {
-       shininess=s;
+       shininess = s;
+       shdata.uniform("material.shininess", shininess);
 }
 
-void Material::apply() const
+void Material::set_reflectivity(float r)
 {
-       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);
+       reflectivity = r;
+       shdata.uniform("reflectivity", reflectivity);
 }
 
 
 Material::Loader::Loader(Material &m):
-       mat(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", &Material::shininess);
+       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)
 {
-       mat.ambient=GL::Color(r, g, b, a);
+       obj.set_ambient(make_color(r, g, b, a));
 }
 
 void Material::Loader::diffuse(float r, float g, float b, float a)
 {
-       mat.diffuse=GL::Color(r, g, b, a);
+       obj.set_diffuse(make_color(r, g, b, a));
 }
 
 void Material::Loader::specular(float r, float g, float b, float a)
 {
-       mat.specular=GL::Color(r, g, b, a);
+       obj.set_specular(make_color(r, g, b, a));
 }
 
 void Material::Loader::emission(float r, float g, float b, float a)
 {
-       mat.emission=GL::Color(r, g, b, a);
+       obj.set_emission(make_color(r, g, b, a));
+}
+
+void Material::Loader::shininess(float s)
+{
+       obj.set_shininess(s);
+}
+
+void Material::Loader::reflectivity(float r)
+{
+       obj.set_reflectivity(r);
 }
 
 } // namespace GL