X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.h;h=5a71aa34bae2be1470016f1c9ef7a3848447503a;hb=f33a98b1a044c8ac7b12778cbca6c4a124875e4a;hp=9af86a700b6f5502c12b9b240f307263311a800a;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/material.h b/source/material.h
index 9af86a70..5a71aa34 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 {
@@ -12,30 +13,46 @@ namespace GL {
 Stores OpenGL material properties.  Since OpenGL does not support material
 objects, application of material is done with several calls to glMaterial.
 */
-class Material: public Bindable<Material>
+class Material: public BindableWithDefault<Material>
 {
 public:
 	class Loader: public DataFile::ObjectLoader<Material>
 	{
 	public:
 		Loader(Material &);
-	
+
 	private:
 		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:
+	enum ParameterMask
+	{
+		AMBIENT = 1,
+		DIFFUSE = 2,
+		SPECULAR = 4,
+		EMISSION = 8,
+		SHININESS = 16
+	};
+
 	Color ambient;
 	Color diffuse;
 	Color specular;
 	Color emission;
 	float shininess;
+	ProgramData shdata;
 
 public:
 	Material();
+
+private:
+	void update_parameter(int) const;
+
+public:
 	void set_ambient(const Color &a);
 	void set_diffuse(const Color &d);
 	void set_specular(const Color &s);
@@ -46,9 +63,8 @@ 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;
-
-	static void unbind();
 };
 
 } // namespace GL