X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.h;h=17ea88391238ec31533261578c43ae244cf4e3a7;hb=d42c443d24a8e428c43f849b218c9e1a1dca4189;hp=a38dddd6a8d5efe097882e44623a3f1f7474a118;hpb=e37851b98dde5082ee92570354746f2f92e21940;p=libs%2Fgl.git

diff --git a/source/material.h b/source/material.h
index a38dddd6..17ea8839 100644
--- a/source/material.h
+++ b/source/material.h
@@ -10,10 +10,14 @@ namespace Msp {
 namespace GL {
 
 /**
-Stores OpenGL material properties.  Since OpenGL does not support material
-objects, application of material is done with several calls to glMaterial.
+Stores basic material properties.  This includes color and reflection
+parameters, but does not include texturing.  Materials interact with light
+soucres and ambient lighting to produce the base color of a surface.  Textures
+can be used to add detail.
+
+Material provides a set of uniform variables for use with shaders.
 */
-class Material: public BindableWithDefault<Material>
+class Material
 {
 public:
 	class Loader: public DataFile::CollectionObjectLoader<Material>
@@ -33,44 +37,51 @@ public:
 		void specular(float, float, float, float);
 		void emission(float, float, float, float);
 		void shininess(float);
+		void reflectivity(float);
 	};
 
 private:
-	enum ParameterMask
-	{
-		AMBIENT = 1,
-		DIFFUSE = 2,
-		SPECULAR = 4,
-		EMISSION = 8,
-		SHININESS = 16
-	};
-
 	Color ambient;
 	Color diffuse;
 	Color specular;
 	Color emission;
 	float shininess;
+	float reflectivity;
 	ProgramData shdata;
 
 public:
 	Material();
 
-private:
-	void update_parameter(int) const;
+	/** Sets the ambient color of the material.  Provided to shaders with the
+	name material.ambient. */
+	void set_ambient(const Color &);
+
+	/** Sets the diffuse (direction-independent) color of the material.
+	Provided to shaders with the name material.diffuse. */
+	void set_diffuse(const Color &);
+
+	/** Sets the specular (direction-dependent) color of the material.  Provided
+	to shaders with the name material.specular. */
+	void set_specular(const Color &);
+	void set_emission(const Color &);
+
+	/** Sets the specular exponent of the material.  Provided to shaders with
+	the name material.shininess. */
+	void set_shininess(float);
+
+	/** Sets the reflectivity of the material.  Provided to shaders with the
+	name reflectivity.  Has no effect when shaders are not used. */
+	void set_reflectivity(float);
 
-public:
-	void set_ambient(const Color &a);
-	void set_diffuse(const Color &d);
-	void set_specular(const Color &s);
-	void set_emission(const Color &e);
-	void set_shininess(float s);
 	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; }
+
+	/** Returns the uniforms for the material. */
 	const ProgramData &get_shader_data() const { return shdata; }
-	void bind() const;
 };
 
 } // namespace GL