X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.cpp;h=36d0958f5afb18aaa5270750f7c8e031193583a4;hb=a4b9ae04a0a89bb2cf3ab4235d7376d3ff70af7b;hp=810ecd174d81fb407730b33b0488b456dcee4f86;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index 810ecd17..36d0958f 100644
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -6,26 +6,30 @@
 #include "resources.h"
 #include "texturing.h"
 #include "uniform.h"
+#include "unlitmaterial.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
-Program *Material::create_compatible_shader() const
-{
-	return new Program(create_program_source());
-}
-
 const Program *Material::create_compatible_shader(DataFile::Collection &coll) const
 {
-	string source = create_program_source();
-	string name = format("_material_%016x.glsl", hash64(source));
+	string module_name;
+	map<string, int> spec_values;
+	fill_program_info(module_name, spec_values);
+
+	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);
@@ -39,6 +43,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)
@@ -58,6 +64,7 @@ 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
 
 Material::MaterialRegistry &Material::get_material_registry()
 {
@@ -68,6 +75,7 @@ Material::MaterialRegistry &Material::get_material_registry()
 		initialized = true;
 		registry.register_type<BasicMaterial>("basic");
 		registry.register_type<PbrMaterial>("pbr");
+		registry.register_type<UnlitMaterial>("unlit");
 	}
 	return registry;
 }
@@ -86,7 +94,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);
 }
@@ -95,14 +103,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