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

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index 3eaf83ab..b737c031 100644
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -13,12 +13,15 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-const Program *Material::create_compatible_shader(DataFile::Collection &coll) const
+const Program *Material::create_compatible_shader(DataFile::Collection &coll, 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);
@@ -103,14 +106,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