X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Fmaterial.h;h=a38dddd6a8d5efe097882e44623a3f1f7474a118;hb=8ed7051d1a80c7e8b198d96575338eee6a5e2485;hp=a787a6d3b7078ee60f706debaf2d62b903c4989f;hpb=126161d1d44ab9503bc747d24a07b7b9d15e527a;p=libs%2Fgl.git

diff --git a/source/material.h b/source/material.h
index a787a6d3..a38dddd6 100644
--- a/source/material.h
+++ b/source/material.h
@@ -4,6 +4,7 @@
 #include <msp/datafile/objectloader.h>
 #include "bindable.h"
 #include "color.h"
+#include "programdata.h"
 
 namespace Msp {
 namespace GL {
@@ -15,16 +16,23 @@ 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);
 	};
 
 private:
@@ -42,6 +50,7 @@ private:
 	Color specular;
 	Color emission;
 	float shininess;
+	ProgramData shdata;
 
 public:
 	Material();
@@ -60,6 +69,7 @@ public:
 	const Color &get_specular() const { return specular; }
 	const Color &get_emission() const { return emission; }
 	float get_shininess() const { return shininess; }
+	const ProgramData &get_shader_data() const { return shdata; }
 	void bind() const;
 };