X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.cpp;h=ace87e70954847d299061205826d9dacf9029919;hb=fcde8390ad577fe434dcd4b29e0f410d29f867c9;hp=17fa546bbf0ba9f94fb7e08688afd3a46a2d7cee;hpb=2f198e3210714c7abac53bbe1be4d41b1ef85c14;p=libs%2Fgl.git

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index 17fa546b..ace87e70 100644
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -13,20 +13,26 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Program *Material::create_compatible_shader() const
+const Program *Material::create_compatible_shader(DataFile::Collection &coll, const map<string, int> &extra_spec) const
 {
-	return new Program(create_program_source());
-}
+	string module_name;
+	map<string, int> spec_values;
+	fill_program_info(module_name, spec_values);
 
-const Program *Material::create_compatible_shader(DataFile::Collection &coll) const
-{
-	string source = create_program_source();
-	string name = format("_material_%016x.glsl", hash64(source));
+	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);
+
+	string name = format("_material_%016x.shader", hash64(info));
 	Program *shprog = coll.find<Program>(name);
 	if(shprog)
 		return shprog;
 
-	shprog = new Program(create_program_source());
+	const Module &module = coll.get<Module>(module_name);
+	shprog = new Program(module, spec_values);
 	try
 	{
 		coll.add(name, shprog);
@@ -40,6 +46,8 @@ const Program *Material::create_compatible_shader(DataFile::Collection &coll) co
 	return shprog;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 void Material::attach_texture_to(const Texture *tex, Texturing &texturing, ProgramData &tex_shdata, const string &name) const
 {
 	if(!tex)
@@ -59,6 +67,16 @@ void Material::attach_texture_to(const Texture *tex, Texturing &texturing, Progr
 	texturing.attach(unit, *tex, sampler);
 	tex_shdata.uniform(name, unit);
 }
+#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()
 {
@@ -88,7 +106,7 @@ void Material::Loader::init_actions()
 	add("sampler", &Loader::sampler);
 }
 
-void Material::Loader::sampler(const std::string &name)
+void Material::Loader::sampler(const string &name)
 {
 	obj.sampler = &get_collection().get<Sampler>(name);
 }
@@ -97,14 +115,27 @@ void Material::Loader::sampler(const std::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