X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.cpp;h=a34c0457384025f2af87f91ed45fac78dd042835;hb=5ced451549e2238bb1195d03419437a395b9afec;hp=d03a72a53eaca89a5debb1ccace6a6054c80e504;hpb=e9a898f315b5d1396f196d785913a283c30940f2;p=libs%2Fgl.git

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index d03a72a5..a34c0457 100644
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -1,10 +1,9 @@
 #include <msp/core/hash.h>
 #include <msp/strings/format.h>
 #include "basicmaterial.h"
-#include "gl.h"
 #include "pbrmaterial.h"
+#include "program.h"
 #include "resources.h"
-#include "uniform.h"
 #include "unlitmaterial.h"
 
 using namespace std;
@@ -21,12 +20,15 @@ const Program *Material::create_compatible_shader(const map<string, int> &extra_
 	for(const auto &kvp: extra_spec)
 		spec_values[kvp.first] = kvp.second;
 
-	string info = module_name;
+	uint64_t info_hash = hash<64>(module_name);
 	for(const auto &kvp: spec_values)
-		info += format(",%s:%d", kvp.first, kvp.second);
+	{
+		info_hash = hash_update<64>(info_hash, kvp.first);
+		info_hash = hash_update<64>(info_hash, kvp.second);
+	}
 
 	Resources &res = Resources::get_global();
-	string name = format("_material_%016x.shader", hash64(info));
+	string name = format("_material_%016x.shader", info_hash);
 	Program *shprog = res.find<Program>(name);
 	if(shprog)
 		return shprog;
@@ -55,9 +57,9 @@ void Material::set_debug_name(const string &name)
 #endif
 }
 
-Material::MaterialRegistry &Material::get_material_registry()
+Material::GenericLoader::TypeRegistry &Material::get_material_registry()
 {
-	static MaterialRegistry registry;
+	static GenericLoader::TypeRegistry registry;
 	static bool initialized = false;
 	if(!initialized)
 	{
@@ -70,10 +72,6 @@ Material::MaterialRegistry &Material::get_material_registry()
 }
 
 
-Material::Loader::Loader(Material &m):
-	CollectionObjectLoader(m, 0)
-{ }
-
 Material::Loader::Loader(Material &m, Collection &c):
 	CollectionObjectLoader(m, &c)
 { }
@@ -88,32 +86,5 @@ void Material::Loader::sampler(const string &name)
 	obj.sampler = &get_collection().get<Sampler>(name);
 }
 
-
-DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
-
-Material::GenericLoader::GenericLoader(DataFile::Collection *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()
-{
-	add("type", &GenericLoader::type);
-}
-
-void Material::GenericLoader::type(const DataFile::Symbol &sym)
-{
-	get_material_registry().invoke(sym.name, *this);
-}
-
 } // namespace GL
 } // namespace Msp