X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.cpp;h=ef3662e964d8be98421e6e187256b0f028daa232;hb=fd62e55d37716787fe909883a1b18e5b8128ec80;hp=b0f62bbc5fbef9f1d07b7bcfd4b688135394c32e;hpb=4af69ec90120a0be828a1ae475a38674087110b5;p=libs%2Fgl.git diff --git a/source/material.cpp b/source/material.cpp index b0f62bbc..ef3662e9 100644 --- a/source/material.cpp +++ b/source/material.cpp @@ -1,3 +1,5 @@ +#include +#include #include "basicmaterial.h" #include "gl.h" #include "resources.h" @@ -9,6 +11,33 @@ using namespace std; namespace Msp { namespace GL { +Program *Material::create_compatible_shader() const +{ + return new Program(create_program_source()); +} + +const Program *Material::create_compatible_shader(DataFile::Collection &coll) const +{ + string source = create_program_source(); + string name = format("_material_%016x.glsl", hash64(source)); + Program *shprog = coll.find(name); + if(shprog) + return shprog; + + shprog = new Program(create_program_source()); + try + { + coll.add(name, shprog); + } + catch(...) + { + delete shprog; + throw; + } + + return shprog; +} + void Material::attach_texture_to(const Texture *tex, Texturing &texturing, ProgramData &tex_shdata, const string &name) const { if(!tex)