X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.cpp;h=1d5a4087af2b3b8f6c9db232792c7eff45732a1c;hb=a40fc85277dba5c34402a0e703d038efd30cc57b;hp=7d90dd5a5878f51fb7de27fddef0b89b28ffbf6e;hpb=a6acc6fc98f8571eaaa66f726c1ff4d60abe4f58;p=libs%2Fgl.git

diff --git a/source/material.cpp b/source/material.cpp
index 7d90dd5a..1d5a4087 100644
--- a/source/material.cpp
+++ b/source/material.cpp
@@ -1,5 +1,6 @@
 #include "gl.h"
 #include "material.h"
+#include "resources.h"
 
 namespace Msp {
 namespace GL {
@@ -11,95 +12,99 @@ Material::Material()
 	set_specular(0);
 	set_emission(0);
 	set_shininess(0);
-}
-
-void Material::update_parameter(int mask) const
-{
-	if(cur_obj!=this)
-		return;
-
-	if(mask&AMBIENT)
-		glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, &ambient.r);
-	if(mask&DIFFUSE)
-		glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, &diffuse.r);
-	if(mask&SPECULAR)
-		glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &specular.r);
-	if(mask&EMISSION)
-		glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, &emission.r);
-	if(mask&SHININESS)
-		glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shininess);
+	set_reflectivity(0);
 }
 
 void Material::set_ambient(const Color &a)
 {
 	ambient = a;
 	shdata.uniform("material.ambient", ambient);
-	update_parameter(AMBIENT);
 }
 
 void Material::set_diffuse(const Color &d)
 {
 	diffuse = d;
 	shdata.uniform("material.diffuse", diffuse);
-	update_parameter(DIFFUSE);
 }
 
 void Material::set_specular(const Color &s)
 {
 	specular = s;
 	shdata.uniform("material.specular", specular);
-	update_parameter(SPECULAR);
 }
 
 void Material::set_emission(const Color &e)
 {
 	emission = e;
 	shdata.uniform("material.emission", emission);
-	update_parameter(EMISSION);
 }
 
 void Material::set_shininess(float s)
 {
 	shininess = s;
 	shdata.uniform("material.shininess", shininess);
-	update_parameter(SHININESS);
 }
 
-void Material::bind() const
+void Material::set_reflectivity(float r)
 {
-	if(set_current(this))
-		update_parameter(-1);
+	reflectivity = r;
+	shdata.uniform("reflectivity", reflectivity);
 }
 
 
 Material::Loader::Loader(Material &m):
-	DataFile::ObjectLoader<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(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)
 {
-	obj.set_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)
 {
-	obj.set_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)
 {
-	obj.set_emission(GL::Color(r, g, b, a));
+	obj.set_emission(make_color(r, g, b, a));
 }
 
 void Material::Loader::shininess(float s)
@@ -107,5 +112,10 @@ void Material::Loader::shininess(float s)
 	obj.set_shininess(s);
 }
 
+void Material::Loader::reflectivity(float r)
+{
+	obj.set_reflectivity(r);
+}
+
 } // namespace GL
 } // namespace Msp