X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.cpp;h=6d9c0571f429f37e8c2ce265ca8c88e92bfaf70c;hb=c8520aa336e92f2eaf9a38c3430c608520a90324;hp=b2ee973ad11c0b8d55fc4d6ea14dabaebf31a3a8;hpb=fe2fc291a4fc618425c64112c9ffd3519f0b8a3e;p=libs%2Fgl.git

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index b2ee973a..6d9c0571 100644
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -1,11 +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 "texturing.h"
-#include "uniform.h"
 #include "unlitmaterial.h"
 
 using namespace std;
@@ -19,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));
@@ -47,29 +45,6 @@ const Program *Material::create_compatible_shader(const map<string, int> &extra_
 	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)
-		return;
-
-	int unit = -1;
-
-	if(const Uniform *uni = tex_shdata.find_uniform(name))
-		if(const Uniform1i *uni_int = dynamic_cast<const Uniform1i *>(uni))
-			unit = uni_int->get();
-
-	if(unit<0)
-		unit = texturing.find_free_unit(name);
-	if(unit<0)
-		throw runtime_error("no free texunit");
-
-	texturing.attach(unit, *tex, sampler);
-	tex_shdata.uniform(name, unit);
-}
-#pragma GCC diagnostic pop
-
 void Material::set_debug_name(const string &name)
 {
 #ifdef DEBUG
@@ -79,9 +54,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)
 	{
@@ -94,10 +69,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)
 { }
@@ -112,32 +83,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