#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);
+ for(const auto &kvp: spec_values)
+ info += format(",%s:%d", kvp.first, kvp.second);
Resources &res = Resources::get_global();
string name = format("_material_%016x.shader", hash64(info));
DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
-Material::GenericLoader::GenericLoader(DataFile::Collection *c):
- coll(c),
+Material::GenericLoader::GenericLoader():
+ coll(0),
material(0),
mat_loader(0)
{
set_actions(shared_actions);
}
+Material::GenericLoader::GenericLoader(DataFile::Collection &c):
+ GenericLoader()
+{
+ coll = &c;
+}
+
Material::GenericLoader::~GenericLoader()
{
delete material;