diff options
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/fparkan-assets/src/lib.rs | 26 | ||||
| -rw-r--r-- | crates/fparkan-runtime/src/lib.rs | 38 |
2 files changed, 56 insertions, 8 deletions
diff --git a/crates/fparkan-assets/src/lib.rs b/crates/fparkan-assets/src/lib.rs index 11e324f..6e3364d 100644 --- a/crates/fparkan-assets/src/lib.rs +++ b/crates/fparkan-assets/src/lib.rs @@ -490,6 +490,10 @@ pub struct VisualDependencyProgress { pub phase: VisualDependencyPhase, /// Number of requests reached in this class during the current expansion. pub request_count: usize, + /// Resource graph nodes materialized before this request is resolved. + pub graph_node_count: usize, + /// Resource graph edges materialized before this request is resolved. + pub graph_edge_count: usize, } /// Errors raised while preparing CPU-side assets. @@ -1239,6 +1243,8 @@ pub fn extend_graph_report_with_visual_dependencies_with_progress<R: ResourceRep &mut on_progress, VisualDependencyPhase::Wear, wear_requests, + graph.nodes.len(), + graph.edges.len(), ); match resolve_wear_table_cached(repository, mesh, &mut wear_validation) { Ok(table) => { @@ -1281,6 +1287,8 @@ pub fn extend_graph_report_with_visual_dependencies_with_progress<R: ResourceRep on_progress(VisualDependencyProgress { phase: VisualDependencyPhase::Material, request_count: material_requests, + graph_node_count: graph.nodes.len(), + graph_edge_count: graph.edges.len(), }); for (material_index, _entry) in table.entries.iter().enumerate() { material_requests = material_requests.saturating_add(1); @@ -1288,6 +1296,8 @@ pub fn extend_graph_report_with_visual_dependencies_with_progress<R: ResourceRep &mut on_progress, VisualDependencyPhase::Material, material_requests, + graph.nodes.len(), + graph.edges.len(), ); let Ok(material_index) = u16::try_from(material_index) else { push_visual_failure( @@ -1339,6 +1349,8 @@ pub fn extend_graph_report_with_visual_dependencies_with_progress<R: ResourceRep &mut on_progress, VisualDependencyPhase::Texture, texture_requests, + graph.nodes.len(), + graph.edges.len(), ); report.texture_request_count += 1; match resolve_texm_validation_cached( @@ -1405,6 +1417,8 @@ pub fn extend_graph_report_with_visual_dependencies_with_progress<R: ResourceRep &mut on_progress, VisualDependencyPhase::Texture, texture_requests, + graph.nodes.len(), + graph.edges.len(), ); report.lightmap_request_count += 1; match resolve_texm_validation_cached( @@ -1472,11 +1486,15 @@ fn report_visual_dependency_progress( on_progress: &mut impl FnMut(VisualDependencyProgress), phase: VisualDependencyPhase, request_count: usize, + graph_node_count: usize, + graph_edge_count: usize, ) { if request_count == 1 || request_count.is_multiple_of(VISUAL_DEPENDENCY_PROGRESS_INTERVAL) { on_progress(VisualDependencyProgress { phase, request_count, + graph_node_count, + graph_edge_count, }); } } @@ -2320,6 +2338,8 @@ mod tests { &mut |event| progress.push(event), VisualDependencyPhase::Texture, request_count, + 37, + 41, ); } @@ -2329,14 +2349,20 @@ mod tests { VisualDependencyProgress { phase: VisualDependencyPhase::Texture, request_count: 1, + graph_node_count: 37, + graph_edge_count: 41, }, VisualDependencyProgress { phase: VisualDependencyPhase::Texture, request_count: 64, + graph_node_count: 37, + graph_edge_count: 41, }, VisualDependencyProgress { phase: VisualDependencyPhase::Texture, request_count: 128, + graph_node_count: 37, + graph_edge_count: 41, }, ] ); diff --git a/crates/fparkan-runtime/src/lib.rs b/crates/fparkan-runtime/src/lib.rs index 42b3eda..1ab8e38 100644 --- a/crates/fparkan-runtime/src/lib.rs +++ b/crates/fparkan-runtime/src/lib.rs @@ -126,11 +126,25 @@ pub enum MissionLoadPhase { /// Resolve MAT0 documents while expanding visual dependencies. GraphVisualMaterials, /// Progress marker emitted after each 64 MAT0 validation requests. - GraphVisualMaterialRequests(usize), + GraphVisualMaterialRequests { + /// Number of MAT0 validation requests started. + request_count: usize, + /// Graph nodes materialized before the request. + graph_node_count: usize, + /// Graph edges materialized before the request. + graph_edge_count: usize, + }, /// Validate TEXM documents while expanding visual dependencies. GraphVisualTextures, /// Progress marker emitted after each 64 TEXM validation requests. - GraphVisualTextureRequests(usize), + GraphVisualTextureRequests { + /// Number of TEXM validation requests started. + request_count: usize, + /// Graph nodes materialized before the request. + graph_node_count: usize, + /// Graph edges materialized before the request. + graph_edge_count: usize, + }, /// Prepare all reachable visual/resource dependencies. Assets, /// Decode and validate MSH model meshes. @@ -728,12 +742,20 @@ fn load_mission_with_options_and_progress( if progress.request_count > 1 { let request_phase = match progress.phase { VisualDependencyPhase::Wear => None, - VisualDependencyPhase::Material => Some( - MissionLoadPhase::GraphVisualMaterialRequests(progress.request_count), - ), - VisualDependencyPhase::Texture => Some( - MissionLoadPhase::GraphVisualTextureRequests(progress.request_count), - ), + VisualDependencyPhase::Material => { + Some(MissionLoadPhase::GraphVisualMaterialRequests { + request_count: progress.request_count, + graph_node_count: progress.graph_node_count, + graph_edge_count: progress.graph_edge_count, + }) + } + VisualDependencyPhase::Texture => { + Some(MissionLoadPhase::GraphVisualTextureRequests { + request_count: progress.request_count, + graph_node_count: progress.graph_node_count, + graph_edge_count: progress.graph_edge_count, + }) + } }; if let Some(request_phase) = request_phase { record_load_phase(&mut trace, &mut on_phase, request_phase); |