X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.cpp;h=b7dd767eaff72dd309f5cb6adc4f4d211cfed4e5;hb=23d4100160bfa33359ce297b6b36244abcaa5f82;hp=2d7e448788e0d81612bb191c7b4733b793e2c6c1;hpb=5b652353d545a3190ea2d86ba82a87b2e3382a0d;p=libs%2Fgl.git

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index 2d7e4487..b7dd767e 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;
@@ -18,12 +17,12 @@ const Program *Material::create_compatible_shader(const map<string, int> &extra_
 	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));
@@ -91,14 +90,20 @@ void Material::Loader::sampler(const string &name)
 
 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;