#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;
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;
+ for(const auto &kvp: extra_spec)
+ spec_values[kvp.first] = kvp.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);
+ uint64_t info_hash = hash<64>(module_name);
+ for(const auto &kvp: spec_values)
+ {
+ 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;
#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)
{
}
-Material::Loader::Loader(Material &m):
- CollectionObjectLoader(m, 0)
-{ }
-
Material::Loader::Loader(Material &m, Collection &c):
CollectionObjectLoader(m, &c)
{ }
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