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

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index b2ee973a..d03a72a5 100644
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -4,7 +4,6 @@
 #include "gl.h"
 #include "pbrmaterial.h"
 #include "resources.h"
-#include "texturing.h"
 #include "uniform.h"
 #include "unlitmaterial.h"
 
@@ -19,12 +18,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 +46,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