Access builtin resources through a global instance

[libs/gl.git] / source / materials / material.cpp

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index ace87e70954847d299061205826d9dacf9029919..b2ee973ad11c0b8d55fc4d6ea14dabaebf31a3a8 100644 (file)
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -13,7 +13,7 @@ using namespace std;
 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;
@@ -26,16 +26,17 @@ const Program *Material::create_compatible_shader(DataFile::Collection &coll, co
        for(map<string, int>::const_iterator i=spec_values.begin(); i!=spec_values.end(); ++i)
                info += format(",%s:%d", i->first, i->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(...)
        {