RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:37:36 +00:00
Code Issues Activity Actions

3DFileViewer: Properly propagate errors from WavefrontOBJLoader

Browse source 
Fixes 3 FIXMEs.
This commit is contained in:
Maciej 2022-12-04 14:52:41 +01:00 • committed by Linus Groh
parent a3e82eaad3
commit 6e4f886999
4 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Applications/3DFileViewer/main.cpp
View file

@ -320,8 +320,8 @@ bool GLContextWidget::load_file(Core::File& file)
}
auto new_mesh = m_mesh_loader->load(file);
if (new_mesh.is_null()) {
GUI::MessageBox::show(window(), DeprecatedString::formatted("Reading \"{}\" failed.", filename), "Error"sv, GUI::MessageBox::Type::Error);
if (new_mesh.is_error()) {
GUI::MessageBox::show(window(), DeprecatedString::formatted("Reading \"{}\" failed: {}", filename, new_mesh.release_error()), "Error"sv, GUI::MessageBox::Type::Error);
return false;
}
@ -358,7 +358,7 @@ bool GLContextWidget::load_file(Core::File& file)
dbgln("3DFileViewer: Couldn't load texture for {}", filename);
}
m_mesh = new_mesh;
m_mesh = new_mesh.release_value();
dbgln("3DFileViewer: mesh has {} triangles.", m_mesh->triangle_count());
return true;