diff options
| author | HampusM <hampus@hampusmat.com> | 2026-10-27 08:44:52 +0100 |
|---|---|---|
| committer | HampusM <hampus@hampusmat.com> | 2026-10-27 08:44:52 +0100 |
| commit | 98796261e0898d984ff2e956e50bdc061f044c92 (patch) | |
| tree | 62c407d6e5b436627580da0161d238fbd8ce4189 /engine/src | |
| parent | 885f025ae2310d5e9b3de641224806fa1e996886 (diff) | |
refactor(engine): rename asset::Event::Stored to Loaded
Diffstat (limited to 'engine/src')
| -rw-r--r-- | engine/src/asset.rs | 9 | ||||
| -rw-r--r-- | engine/src/material.rs | 2 | ||||
| -rw-r--r-- | engine/src/model.rs | 2 | ||||
| -rw-r--r-- | engine/src/rendering/shader.rs | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/engine/src/asset.rs b/engine/src/asset.rs index 570a0c7..4e50d9b 100644 --- a/engine/src/asset.rs +++ b/engine/src/asset.rs @@ -581,7 +581,7 @@ impl Assets } else { metadata.state = AssetState::Ready; - self.curr_tick_events.push(Event::Stored( + self.curr_tick_events.push(Event::Loaded( Id::from_valid(id), label.to_owned().into_label(), )); @@ -717,7 +717,7 @@ impl Assets continue; } - self.curr_tick_events.push(Event::Stored( + self.curr_tick_events.push(Event::Loaded( Id::from_valid(dependant_id), dependant_metadata.label.clone().into_label(), )); @@ -1202,9 +1202,8 @@ impl Events #[derive(Debug)] pub enum Event { - /// Asset stored. - Stored(Id, Label<'static>), - // ImportFailed() + /// Asset loading is completed. + Loaded(Id, Label<'static>), } #[derive(Debug, thiserror::Error)] diff --git a/engine/src/material.rs b/engine/src/material.rs index ded30a2..853670d 100644 --- a/engine/src/material.rs +++ b/engine/src/material.rs @@ -255,7 +255,7 @@ pub(crate) fn set_stored_materials_texture_handles( let assets = assets.get_mut().unwrap(); let asset_events = asset_events.get().unwrap(); - for AssetEvent::Stored(asset_id, ..) in asset_events.iter_last_tick() { + for AssetEvent::Loaded(asset_id, ..) in asset_events.iter_last_tick() { let asset_handle = AssetHandle::<Material>::from_id(*asset_id); if !assets.is_loaded_and_has_type(&asset_handle) { diff --git a/engine/src/model.rs b/engine/src/model.rs index 62cfe21..daca6f0 100644 --- a/engine/src/model.rs +++ b/engine/src/model.rs @@ -88,7 +88,7 @@ pub(crate) fn set_stored_mat_descs_handles( let assets = assets.get_mut().unwrap(); let asset_events = asset_events.get().unwrap(); - for AssetEvent::Stored(asset_id, ..) in asset_events.iter_last_tick() { + for AssetEvent::Loaded(asset_id, ..) in asset_events.iter_last_tick() { let asset_handle = AssetHandle::<MaterialDescription>::from_id(*asset_id); if !assets.is_loaded_and_has_type(&asset_handle) { diff --git a/engine/src/rendering/shader.rs b/engine/src/rendering/shader.rs index a4edbc0..3ba3a41 100644 --- a/engine/src/rendering/shader.rs +++ b/engine/src/rendering/shader.rs @@ -1400,7 +1400,7 @@ fn load_modules( let assets = assets.get()?; let asset_events = asset_events.get()?; - for AssetEvent::Stored(asset_id, asset_label) in asset_events.iter_last_tick() { + for AssetEvent::Loaded(asset_id, asset_label) in asset_events.iter_last_tick() { let asset_handle = AssetHandle::<ModuleSource>::from_id(*asset_id); if !assets.is_loaded_and_has_type(&asset_handle) { |