|
|
@@ -77,7 +77,7 @@ identity<shader> manager::get(shaders::type type,
|
|
|
auto & cache = pcache_->shaders;
|
|
|
auto found = cache.values.find(key);
|
|
|
if (found != cache.values.end()) { return found->second; }
|
|
|
- return cache.emplace(key, shader(type, path));
|
|
|
+ return cache.emplace(key, compile(type, path));
|
|
|
}
|
|
|
|
|
|
identity<shader_program> manager::get(std::string const & fragment,
|
|
|
@@ -89,14 +89,14 @@ identity<shader_program> manager::get(std::string const & fragment,
|
|
|
auto fragment_shader = get(shaders::type::FRAGMENT, fragment);
|
|
|
auto vertex_shader = get(shaders::type::VERTEX, vertex);
|
|
|
|
|
|
- return cache.emplace(key, shader_program(fragment_shader, vertex_shader));
|
|
|
+ return cache.emplace(key, compile(fragment_shader, vertex_shader));
|
|
|
}
|
|
|
|
|
|
identity<texture> manager::get(std::string const & path) const {
|
|
|
auto & cache = pcache_->textures;
|
|
|
auto found = cache.values.find(path);
|
|
|
if (found != cache.values.end()) { return found->second; }
|
|
|
- return cache.emplace(path, texture(path));
|
|
|
+ return cache.emplace(path, compile(path));
|
|
|
}
|
|
|
|
|
|
object manager::create_object(identity<material> fromMaterial,
|