X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.cpp;fp=source%2Fmaterial.cpp;h=13f2d1d9d9f785ddefa152a22ad3f4dd0fed3a01;hb=e37851b98dde5082ee92570354746f2f92e21940;hp=7d90dd5a5878f51fb7de27fddef0b89b28ffbf6e;hpb=49758ab622d2e8ed4b3a60d7b9afc4abd741300c;p=libs%2Fgl.git

diff --git a/source/material.cpp b/source/material.cpp
index 7d90dd5a..13f2d1d9 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 {
@@ -73,8 +74,24 @@ void Material::bind() const
 
 
 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);
@@ -82,24 +99,32 @@ Material::Loader::Loader(Material &m):
 	add("shininess", &Loader::shininess);
 }
 
+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)