diff options
| author | Valentin Popov <valentin@popov.link> | 2026-07-04 00:50:59 +0300 |
|---|---|---|
| committer | Valentin Popov <valentin@popov.link> | 2026-07-04 00:50:59 +0300 |
| commit | 08550849c7f293f3c49abb0ba5c47c65b68bee0d (patch) | |
| tree | 54af8ee37f25879923de9af536e4ecc833f46a32 /apps | |
| parent | 0c54142ad5f7dea0f4371de16a277b002110e008 (diff) | |
| download | fparkan-08550849c7f293f3c49abb0ba5c47c65b68bee0d.tar.xz fparkan-08550849c7f293f3c49abb0ba5c47c65b68bee0d.zip | |
chore: clarify planning acceptance semantics
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/fparkan-game/src/main.rs | 8 | ||||
| -rw-r--r-- | apps/fparkan-viewer/src/main.rs | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/apps/fparkan-game/src/main.rs b/apps/fparkan-game/src/main.rs index 252cd16..8d9d89b 100644 --- a/apps/fparkan-game/src/main.rs +++ b/apps/fparkan-game/src/main.rs @@ -19,7 +19,7 @@ ) )] #![allow(clippy::print_stderr, clippy::print_stdout)] -//! `FParkan` rendered game composition root. +//! `FParkan` render-planning composition root. use fparkan_assets::PreparedVisual; use fparkan_platform::WindowPort; @@ -98,7 +98,7 @@ fn run(args: &[String]) -> Result<String, String> { let capture_report = backend.report(); Ok(format!( - "{{\"mission\":{},\"objects\":{},\"frames\":{},\"tick\":{},\"draws\":{},\"captures\":{},\"last_capture_bytes\":{},\"hash\":{}}}", + "{{\"report_kind\":\"render-planning\",\"backend\":\"vulkan-planning\",\"window\":\"synthetic\",\"mission\":{},\"objects\":{},\"frames\":{},\"tick\":{},\"draws\":{},\"submission_plans\":{},\"last_command_capture_bytes\":{},\"hash\":{}}}", json_string(&args.mission), loaded.object_count, args.frames, @@ -325,12 +325,12 @@ mod tests { RenderCase { root: "IS", mission: "MISSIONS/CAMPAIGN/CAMPAIGN.00/Mission.01/data.tma", - expected: "{\"mission\":\"MISSIONS/CAMPAIGN/CAMPAIGN.00/Mission.01/data.tma\",\"objects\":33,\"frames\":1,\"tick\":1,\"draws\":33,\"captures\":1,\"last_capture_bytes\":810,\"hash\":\"ca17cc76e55c45e83c1c9c1c088e84bf1a698be91a7730943210fe27596af841\"}", + expected: "{\"report_kind\":\"render-planning\",\"backend\":\"vulkan-planning\",\"window\":\"synthetic\",\"mission\":\"MISSIONS/CAMPAIGN/CAMPAIGN.00/Mission.01/data.tma\",\"objects\":33,\"frames\":1,\"tick\":1,\"draws\":33,\"submission_plans\":1,\"last_command_capture_bytes\":810,\"hash\":\"ca17cc76e55c45e83c1c9c1c088e84bf1a698be91a7730943210fe27596af841\"}", }, RenderCase { root: "IS2", mission: "MISSIONS/Campaign/CAMPAIGN.00/Mission.02/data.tma", - expected: "{\"mission\":\"MISSIONS/Campaign/CAMPAIGN.00/Mission.02/data.tma\",\"objects\":10,\"frames\":1,\"tick\":1,\"draws\":10,\"captures\":1,\"last_capture_bytes\":235,\"hash\":\"5d720b3ab690076a398a79a404850bbeaee2e33811b5bb570ec8a96d4a7a2fc4\"}", + expected: "{\"report_kind\":\"render-planning\",\"backend\":\"vulkan-planning\",\"window\":\"synthetic\",\"mission\":\"MISSIONS/Campaign/CAMPAIGN.00/Mission.02/data.tma\",\"objects\":10,\"frames\":1,\"tick\":1,\"draws\":10,\"submission_plans\":1,\"last_command_capture_bytes\":235,\"hash\":\"5d720b3ab690076a398a79a404850bbeaee2e33811b5bb570ec8a96d4a7a2fc4\"}", }, ] { assert_eq!( diff --git a/apps/fparkan-viewer/src/main.rs b/apps/fparkan-viewer/src/main.rs index 783ef92..6befe2a 100644 --- a/apps/fparkan-viewer/src/main.rs +++ b/apps/fparkan-viewer/src/main.rs @@ -19,7 +19,7 @@ ) )] #![allow(clippy::print_stderr, clippy::print_stdout)] -//! `FParkan` asset viewer composition root. +//! `FParkan` asset inspection composition root. use fparkan_inspection::{ inspect_land_file, inspect_model_from_root, inspect_texture_from_root, ArchiveInspection, @@ -68,14 +68,14 @@ fn inspect_archive(args: &[String]) -> Result<String, String> { lookup_order_valid, sample, } => Ok(format!( - "{{\"kind\":\"NRes\",\"path\":{},\"entries\":{},\"lookup_order_valid\":{},\"sample\":[{}]}}", + "{{\"report_kind\":\"archive-inspection\",\"kind\":\"NRes\",\"path\":{},\"entries\":{},\"lookup_order_valid\":{},\"sample\":[{}]}}", json_string(&file.display().to_string()), entries, lookup_order_valid, render_nres_entries(&sample) )), ArchiveInspection::Rsli { entries } => Ok(format!( - "{{\"kind\":\"RsLi\",\"path\":{},\"entries\":{}}}", + "{{\"report_kind\":\"archive-inspection\",\"kind\":\"RsLi\",\"path\":{},\"entries\":{}}}", json_string(&file.display().to_string()), entries )), @@ -92,7 +92,7 @@ fn inspect_model(args: &[String]) -> Result<String, String> { let inspection = inspect_model_from_root(&query.root, &query.archive, &query.name)?; Ok(format!( - "{{\"kind\":\"model\",\"archive\":{},\"name\":{},\"streams\":{},\"nodes\":{},\"slots\":{},\"positions\":{},\"indices\":{},\"batches\":{}}}", + "{{\"report_kind\":\"model-inspection\",\"kind\":\"model\",\"archive\":{},\"name\":{},\"streams\":{},\"nodes\":{},\"slots\":{},\"positions\":{},\"indices\":{},\"batches\":{}}}", json_string(&query.archive), json_string(&query.name), inspection.streams, @@ -136,7 +136,7 @@ impl ViewerModelService { .count(); Ok(format!( - "{{\"kind\":\"model\",\"fixture\":{},\"service\":\"synthetic-model\",\"draw_commands\":{draw_commands}}}", + "{{\"report_kind\":\"model-inspection\",\"kind\":\"model\",\"fixture\":{},\"service\":\"synthetic-model-inspection\",\"draw_commands\":{draw_commands}}}", json_string(fixture) )) } @@ -147,7 +147,7 @@ fn inspect_texture(args: &[String]) -> Result<String, String> { let inspection = inspect_texture_from_root(&query.root, &query.archive, &query.name)?; Ok(format!( - "{{\"kind\":\"texture\",\"archive\":{},\"name\":{},\"width\":{},\"height\":{},\"format\":{},\"mips\":{},\"pages\":{}}}", + "{{\"report_kind\":\"texture-inspection\",\"kind\":\"texture\",\"archive\":{},\"name\":{},\"width\":{},\"height\":{},\"format\":{},\"mips\":{},\"pages\":{}}}", json_string(&query.archive), json_string(&query.name), inspection.width, @@ -180,7 +180,7 @@ fn inspect_map(args: &[String]) -> Result<String, String> { fn render_map_inspection_json(path: &str, kind: &str, inspection: &MapInspection) -> String { match kind { "land-msh" => format!( - "{{\"kind\":\"land-msh\",\"path\":{},\"streams\":{},\"positions\":{},\"faces\":{},\"slots\":{}}}", + "{{\"report_kind\":\"map-inspection\",\"kind\":\"land-msh\",\"path\":{},\"streams\":{},\"positions\":{},\"faces\":{},\"slots\":{}}}", json_string(path), inspection.streams, inspection.positions, @@ -188,7 +188,7 @@ fn render_map_inspection_json(path: &str, kind: &str, inspection: &MapInspection inspection.slots ), "land-map" => format!( - "{{\"kind\":\"land-map\",\"path\":{},\"areals\":{},\"declared_areals\":{},\"grid_width\":{},\"grid_height\":{}}}", + "{{\"report_kind\":\"map-inspection\",\"kind\":\"land-map\",\"path\":{},\"areals\":{},\"declared_areals\":{},\"grid_width\":{},\"grid_height\":{}}}", json_string(path), inspection.areals, inspection.declared_areals, @@ -342,7 +342,7 @@ mod tests { fn model_fixture_uses_viewer_service_and_render_commands() -> Result<(), String> { assert_eq!( run(&strings(&["model", "--fixture", "synthetic/model-basic"]))?, - "{\"kind\":\"model\",\"fixture\":\"synthetic/model-basic\",\"service\":\"synthetic-model\",\"draw_commands\":1}" + "{\"report_kind\":\"model-inspection\",\"kind\":\"model\",\"fixture\":\"synthetic/model-basic\",\"service\":\"synthetic-model-inspection\",\"draw_commands\":1}" ); Ok(()) } |
