X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.h;h=a149f6d4131fe0ee928f361aabd6065605948921;hb=99ffd618b531395fe369b33fb029855d57547365;hp=5a71aa34bae2be1470016f1c9ef7a3848447503a;hpb=a6acc6fc98f8571eaaa66f726c1ff4d60abe4f58;p=libs%2Fgl.git

diff --git a/source/material.h b/source/material.h
index 5a71aa34..a149f6d4 100644
--- a/source/material.h
+++ b/source/material.h
@@ -16,17 +16,24 @@ 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);
 		void emission(float, float, float, float);
 		void shininess(float);
+		void reflectivity(float);
 	};
 
 private:
@@ -44,6 +51,7 @@ private:
 	Color specular;
 	Color emission;
 	float shininess;
+	float reflectivity;
 	ProgramData shdata;
 
 public:
@@ -58,11 +66,13 @@ public:
 	void set_specular(const Color &s);
 	void set_emission(const Color &e);
 	void set_shininess(float s);
+	void set_reflectivity(float);
 	const Color &get_ambient() const { return ambient; }
 	const Color &get_diffuse() const { return diffuse; }
 	const Color &get_specular() const { return specular; }
 	const Color &get_emission() const { return emission; }
 	float get_shininess() const { return shininess; }
+	float get_reflectivity() const { return reflectivity; }
 	const ProgramData &get_shader_data() const { return shdata; }
 	void bind() const;
 };