Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'vfoulon80/loading-animations' into 'master'

Browse Source 
Remove unwraps when asset loading fails

See merge request veloren/veloren!1939
This commit is contained in:
Marcel 2021-03-18 12:56:17 +00:00
commit 571a6689e3
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
voxygen/src/menu/main/ui/connecting.rs
View File

@ -19,10 +19,19 @@ impl LoadingAnimation {
fn new(raw: &(f32, Vec<String>), ui: &mut Ui) -> Self {
let mut frames = vec![];
for frame_path in raw.1.iter() {
frames.push(ui.add_graphic(Graphic::Image(
assets::Image::load(frame_path).unwrap().read().to_image(),
None,
)));
if let Ok(image) = assets::Image::load(frame_path) {
frames.push(ui.add_graphic(Graphic::Image(image.read().to_image(), None)));
} else {
frames.push(
ui.add_graphic(Graphic::Image(
assets::Image::load("voxygen.element.not_found")
.unwrap_or_else(|_| panic!("Missing asset '{}'", frame_path))
.read()
.to_image(),
None,
)),
)
}
}
Self {
speed_factor: raw.0,
@ -51,7 +60,9 @@ impl Screen {
pub fn new(ui: &mut Ui) -> Self {
let animations =
LoadingAnimationManifest::load("voxygen.element.animation.loaders.manifest")
.unwrap()
.expect(
"Missing loader manifest file 'voxygen/element/animation/loaders/manifest.ron'",
)
.cloned()
.0;
Self {