X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.h;h=17ea88391238ec31533261578c43ae244cf4e3a7;hb=a40fc85277dba5c34402a0e703d038efd30cc57b;hp=6614aeeae12cac4c51b0e9b91c320106b256eea1;hpb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;p=libs%2Fgl.git

diff --git a/source/material.h b/source/material.h
index 6614aeea..17ea8839 100644
--- a/source/material.h
+++ b/source/material.h
@@ -1,36 +1,43 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_MATERIAL_H_
 #define MSP_GL_MATERIAL_H_
 
 #include <msp/datafile/objectloader.h>
+#include "bindable.h"
 #include "color.h"
+#include "programdata.h"
 
 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:
-	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:
@@ -39,24 +46,42 @@ private:
 	Color specular;
 	Color emission;
 	float shininess;
+	float reflectivity;
+	ProgramData shdata;
 
 public:
 	Material();
-	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);
+
+	/** 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);
+
 	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; }
-	void bind() const;
+	float get_reflectivity() const { return reflectivity; }
 
-	static void unbind();
-private:
-	static const Material *current;
+	/** Returns the uniforms for the material. */
+	const ProgramData &get_shader_data() const { return shdata; }
 };
 
 } // namespace GL