X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.cpp;h=b0f62bbc5fbef9f1d07b7bcfd4b688135394c32e;hb=4af69ec90120a0be828a1ae475a38674087110b5;hp=d6e21683d2a7f3b8fb08498b269419d386d7d9d7;hpb=126161d1d44ab9503bc747d24a07b7b9d15e527a;p=libs%2Fgl.git

diff --git a/source/material.cpp b/source/material.cpp
index d6e21683..b0f62bbc 100644
--- a/source/material.cpp
+++ b/source/material.cpp
@@ -1,99 +1,57 @@
+#include "basicmaterial.h"
 #include "gl.h"
-#include "material.h"
+#include "resources.h"
+#include "texturing.h"
+#include "uniform.h"
+
+using namespace std;
 
 namespace Msp {
 namespace GL {
 
-Material::Material():
-	ambient(0.2),
-	diffuse(0.8),
-	specular(0),
-	emission(0),
-	shininess(0)
-{ }
-
-void Material::update_parameter(int mask) const
+void Material::attach_texture_to(const Texture *tex, Texturing &texturing, ProgramData &tex_shdata, const string &name) const
 {
-	if(cur_obj!=this)
+	if(!tex)
 		return;
 
-	if(mask&AMBIENT)
-		glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, &ambient.r);
-	if(mask&DIFFUSE)
-		glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, &diffuse.r);
-	if(mask&SPECULAR)
-		glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &specular.r);
-	if(mask&EMISSION)
-		glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, &emission.r);
-	if(mask&SHININESS)
-		glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shininess);
-}
-
-void Material::set_ambient(const Color &a)
-{
-	ambient = a;
-	update_parameter(AMBIENT);
-}
-
-void Material::set_diffuse(const Color &d)
-{
-	diffuse = d;
-	update_parameter(DIFFUSE);
-}
-
-void Material::set_specular(const Color &s)
-{
-	specular = s;
-	update_parameter(SPECULAR);
-}
+	int unit = -1;
 
-void Material::set_emission(const Color &e)
-{
-	emission = e;
-	update_parameter(EMISSION);
-}
+	if(const Uniform *uni = tex_shdata.find_uniform(name))
+		if(const Uniform1i *uni_int = dynamic_cast<const Uniform1i *>(uni))
+			unit = uni_int->get();
 
-void Material::set_shininess(float s)
-{
-	shininess = s;
-	update_parameter(SHININESS);
-}
+	if(unit<0)
+		unit = texturing.find_free_unit(name);
+	if(unit<0)
+		throw runtime_error("no free texunit");
 
-void Material::bind() const
-{
-	if(set_current(this))
-		update_parameter(-1);
+	texturing.attach(unit, *tex);
+	tex_shdata.uniform(name, unit);
 }
 
-
-Material::Loader::Loader(Material &m):
-	DataFile::ObjectLoader<Material>(m)
+Material::MaterialRegistry &Material::get_material_registry()
 {
-	add("ambient",   &Loader::ambient);
-	add("diffuse",   &Loader::diffuse);
-	add("specular",  &Loader::specular);
-	add("emission",  &Loader::emission);
-	add("shininess", &Material::shininess);
+	static MaterialRegistry registry;
+	static bool initialized = false;
+	if(!initialized)
+	{
+		registry.register_type<BasicMaterial>("basic");
+	}
+	return registry;
 }
 
-void Material::Loader::ambient(float r, float g, float b, float a)
-{
-	obj.ambient = GL::Color(r, g, b, a);
-}
 
-void Material::Loader::diffuse(float r, float g, float b, float a)
-{
-	obj.diffuse = GL::Color(r, g, b, a);
-}
+DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
 
-void Material::Loader::specular(float r, float g, float b, float a)
+Material::GenericLoader::GenericLoader(DataFile::Collection *c):
+	coll(c)
 {
-	obj.specular = GL::Color(r, g, b, a);
+	set_actions(shared_actions);
 }
 
-void Material::Loader::emission(float r, float g, float b, float a)
+void Material::GenericLoader::init_actions()
 {
-	obj.emission = GL::Color(r, g, b, a);
+	get_material_registry().add_all(*this);
 }
 
 } // namespace GL