X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.cpp;fp=source%2Fmaterials%2Fmaterial.cpp;h=b737c03183b504b82592f5959cfd70e80ec10f77;hp=36d0958f5afb18aaa5270750f7c8e031193583a4;hb=cb7db94f7837e6a3be037d07575dc248177d9426;hpb=04005f74fece3c33848ed9420dc0f9c431a9f0ec diff --git a/source/materials/material.cpp b/source/materials/material.cpp index 36d0958f..b737c031 100644 --- a/source/materials/material.cpp +++ b/source/materials/material.cpp @@ -13,12 +13,15 @@ using namespace std; namespace Msp { namespace GL { -const Program *Material::create_compatible_shader(DataFile::Collection &coll) const +const Program *Material::create_compatible_shader(DataFile::Collection &coll, const map &extra_spec) const { string module_name; map spec_values; fill_program_info(module_name, spec_values); + for(map::const_iterator i=extra_spec.begin(); i!=extra_spec.end(); ++i) + spec_values[i->first] = i->second; + string info = module_name; for(map::const_iterator i=spec_values.begin(); i!=spec_values.end(); ++i) info += format(",%s:%d", i->first, i->second);