#include "gl.h"
#include "pbrmaterial.h"
#include "resources.h"
-#include "texturing.h"
#include "uniform.h"
#include "unlitmaterial.h"
namespace Msp {
namespace GL {
-const Program *Material::create_compatible_shader(DataFile::Collection &coll, const map<string, int> &extra_spec) const
+const Program *Material::create_compatible_shader(const map<string, int> &extra_spec) const
{
string module_name;
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));
- Program *shprog = coll.find<Program>(name);
+ Program *shprog = res.find<Program>(name);
if(shprog)
return shprog;
- const Module &module = coll.get<Module>(module_name);
+ const Module &module = res.get<Module>(module_name);
shprog = new Program(module, spec_values);
try
{
- coll.add(name, shprog);
+ res.add(name, shprog);
}
catch(...)
{
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