eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 12:49:18 +02:00
Code Issues 123 Wiki Activity

shader loading tweak

Browse Source
This commit is contained in:
milek7
2019-03-28 21:06:41 +01:00
parent cbf3011371
commit a8a0cbb9b3
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
material.cpp
View File

@@ -124,6 +124,9 @@ void opengl_material::finalize(bool Loadnow)
parse_info.reset(); parse_info.reset();
} }
if (!shader)
return;
for (auto it : shader->param_conf) for (auto it : shader->param_conf)
{ {
gl::shader::param_entry entry = it.second; gl::shader::param_entry entry = it.second;
@@ -376,10 +379,15 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) {
if( false == material.name.empty() ) { if( false == material.name.empty() ) {
// if we have material name and shader it means resource was processed succesfully // if we have material name and shader it means resource was processed succesfully
material.finalize(Loadnow); try {
materialhandle = m_materials.size(); material.finalize(Loadnow);
m_materialmappings.emplace( material.name, materialhandle ); materialhandle = m_materials.size();
m_materials.emplace_back( std::move(material) ); m_materialmappings.emplace( material.name, materialhandle );
m_materials.emplace_back( std::move(material) );
} catch (gl::shader_exception const &e) {
ErrorLog("invalid shader: " + std::string(e.what()));
m_materialmappings.emplace( filename, materialhandle );
}
} }
else { else {
// otherwise record our failure to process the resource, to speed up subsequent attempts // otherwise record our failure to process the resource, to speed up subsequent attempts