X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.cpp;h=b2ee973ad11c0b8d55fc4d6ea14dabaebf31a3a8;hp=3eaf83ab9b59728b1f21c1800acb2ecc2f1c4f33;hb=fe2fc291a4fc618425c64112c9ffd3519f0b8a3e;hpb=6f39983060a27634c012f66c82fea0d09fea9774

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index 3eaf83ab..b2ee973a 100644
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -13,26 +13,30 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-const Program *Material::create_compatible_shader(DataFile::Collection &coll) const
+const Program *Material::create_compatible_shader(const map<string, int> &extra_spec) const
 {
 	string module_name;
 	map<string, int> spec_values;
 	fill_program_info(module_name, spec_values);
 
+	for(map<string, int>::const_iterator i=extra_spec.begin(); i!=extra_spec.end(); ++i)
+		spec_values[i->first] = i->second;
+
 	string info = module_name;
 	for(map<string, int>::const_iterator i=spec_values.begin(); i!=spec_values.end(); ++i)
 		info += format(",%s:%d", i->first, i->second);
 
+	Resources &res = Resources::get_global();
 	string name = format("_material_%016x.shader", hash64(info));
-	Program *shprog = coll.find<Program>(name);
+	Program *shprog = res.find<Program>(name);
 	if(shprog)
 		return shprog;
 
-	const Module &module = coll.get<Module>(module_name);
+	const Module &module = res.get<Module>(module_name);
 	shprog = new Program(module, spec_values);
 	try
 	{
-		coll.add(name, shprog);
+		res.add(name, shprog);
 	}
 	catch(...)
 	{
@@ -66,6 +70,15 @@ void Material::attach_texture_to(const Texture *tex, Texturing &texturing, Progr
 }
 #pragma GCC diagnostic pop
 
+void Material::set_debug_name(const string &name)
+{
+#ifdef DEBUG
+	shdata.set_debug_name(name+" [UBO]");
+#else
+	(void)name;
+#endif
+}
+
 Material::MaterialRegistry &Material::get_material_registry()
 {
 	static MaterialRegistry registry;
@@ -103,14 +116,27 @@ void Material::Loader::sampler(const string &name)
 DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
 
 Material::GenericLoader::GenericLoader(DataFile::Collection *c):
-	coll(c)
+	coll(c),
+	material(0),
+	mat_loader(0)
 {
 	set_actions(shared_actions);
 }
 
+Material::GenericLoader::~GenericLoader()
+{
+	delete material;
+	delete mat_loader;
+}
+
 void Material::GenericLoader::init_actions()
 {
-	get_material_registry().add_all(*this);
+	add("type", &GenericLoader::type);
+}
+
+void Material::GenericLoader::type(const DataFile::Symbol &sym)
+{
+	get_material_registry().invoke(sym.name, *this);
 }
 
 } // namespace GL