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

diff --git a/source/material.h b/source/material.h
index 5a71aa34..a38dddd6 100644
--- a/source/material.h
+++ b/source/material.h
@@ -16,12 +16,18 @@ objects, application of material is done with several calls to glMaterial.
 class Material: public BindableWithDefault<Material>
 {
 public:
-	class Loader: public DataFile::ObjectLoader<Material>
+	class Loader: public DataFile::CollectionObjectLoader<Material>
 	{
+	private:
+		bool srgb;
+
 	public:
 		Loader(Material &);
-
+		Loader(Material &, Collection &);
 	private:
+		void init();
+
+		Color make_color(float, float, float, float);
 		void ambient(float, float, float, float);
 		void diffuse(float, float, float, float);
 		void specular(float, float, float, float);