renderer: Gracefully handle missing ao buffer when loading MapStaticAO

cohaereo · Jan 10, 2025 · a5dc359 · a5dc359
1 parent 70aeb43
commit a5dc359
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/crates/alkahest-renderer/src/ecs/map.rs b/crates/alkahest-renderer/src/ecs/map.rs
@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 
 use alkahest_data::map::{SMapAtmosphere, SStaticAmbientOcclusion};
+use anyhow::Context;
 use bevy_ecs::{prelude::Component, system::Resource};
 use destiny_pkg::TagHash;
 use glam::Vec3;
@@ -138,7 +139,8 @@ pub struct MapStaticAO {
 
 impl MapStaticAO {
     pub fn from_tag(gpu: &GpuContext, tag: &SStaticAmbientOcclusion) -> anyhow::Result<Self> {
-        let ao_buffer = load_vertex_buffer(gpu, tag.ao0.buffer)?;
+        let ao_buffer =
+            load_vertex_buffer(gpu, tag.ao0.buffer).context("Failed to load AO vertex buffer")?;
         let offset_map = tag
             .ao0
             .mappings

diff --git a/crates/alkahest-renderer/src/loaders/map.rs b/crates/alkahest-renderer/src/loaders/map.rs
@@ -779,10 +779,12 @@ fn load_datatable_into_scene<R: Read + Seek>(
                         }
                     };
 
-                scene.insert_resource(
-                    MapStaticAO::from_tag(&renderer.gpu, &static_ao)
-                        .context("Failed to load static AO")?,
-                );
+                match MapStaticAO::from_tag(&renderer.gpu, &static_ao) {
+                    Ok(o) => scene.insert_resource(o),
+                    Err(e) => {
+                        error!(error=?e, tag=%tag, "Failed to load static AO");
+                    }
+                }
             }
             0x80806a63 => {
                 table_data