diff --git a/docs/modernization/build-inventory.md b/docs/modernization/build-inventory.md index e60546b..f0cbfe8 100644 --- a/docs/modernization/build-inventory.md +++ b/docs/modernization/build-inventory.md @@ -296,12 +296,14 @@ powershell -ExecutionPolicy Bypass -File scripts\automation\apple-remote-build.p document/paint-renderer equirectangular PNG before falling back to the retained writer. Payload-complete layer and animation-frame PNG collections write pure document/paint-renderer equirectangular PNG sequences through the - app-core collection write/publish executor before retained fallback; JPEG/XMP - equirectangular export, Web handoff, incomplete-readback collection cases, - and video export remain on retained writer paths. Depth export now plans the - retained image/depth output paths in `pp_app_core` and logs a tested - `pp_paint_renderer` depth render plan plus the shared document-frame - renderer-readiness report before retained `Canvas::export_depth` execution. + app-core collection write/publish executor before retained fallback. JPEG + equirectangular export writes a pure document/paint-renderer JPEG with GPano + XMP metadata before retained fallback; Web handoff, incomplete-readback + collection cases, and video export remain on retained writer paths. Depth + export now plans the retained image/depth output paths in `pp_app_core` and + logs a tested `pp_paint_renderer` depth render plan plus the shared + document-frame renderer-readiness report before retained + `Canvas::export_depth` execution. - `pano_cli save-document-project` writes that pure document export to a PPI file and is covered by `pano_cli_save_document_project_roundtrip_smoke`, which inspects and loads the generated file. @@ -1149,8 +1151,10 @@ powershell -ExecutionPolicy Bypass -File scripts\automation\apple-remote-build.p animation-frame collections write pure document/paint-renderer PNG sequences through the app-core collection write/publish executor, depth export plans image/depth targets and logs the paint-renderer render plan plus shared - renderer readiness before retained execution, and JPEG/XMP plus - Web/incomplete-readback collection cases remain on older retained paths. It + renderer readiness before retained execution, and JPEG equirectangular export + writes a pure document/paint-renderer JPEG with GPano XMP metadata before + retained fallback while Web/incomplete-readback collection cases remain on + older retained paths. It also bridges timelapse and animation MP4 export picker-selected paths while preserving desktop worker-thread timelapse behavior, mobile/Web save callbacks, `App::rec_export`, animation `Canvas::export_anim_mp4`, and diff --git a/docs/modernization/capability-map.md b/docs/modernization/capability-map.md index 33a9f1b..9e17107 100644 --- a/docs/modernization/capability-map.md +++ b/docs/modernization/capability-map.md @@ -24,8 +24,8 @@ and validation command. | Capability | Current Area | Target Owner | Required Tests | | --- | --- | --- | --- | | PNG/JPEG import | `Image`, `Canvas` import paths | `pp_assets`, `pp_document` | Fixture import, malformed file | -| PNG/JPEG export | `Canvas`, `Image`, export dialogs | `pp_assets`, `pp_paint_renderer`, `pp_app_core` | Golden output tolerance, export start/target planning tests, live export-adapter document snapshot readiness through the shared paint-renderer export report, pure cube-face PNG writer, pure equirectangular PNG writer, pure layer/frame collection PNG writers, app-core collection write executor, JPEG/XMP parity still retained | -| Equirectangular import/export | `Canvas`, shaders, RTT, export dialogs | `pp_paint_renderer`, `pp_app_core` | Tiny cube/equirect golden, app-core file target tests, live export-adapter renderer-upload/face-PNG readiness report, pure document-frame equirectangular PNG export and live PNG writer fallback, pure layer/frame equirectangular PNG collection export, JPEG/XMP retained until metadata parity is owned | +| PNG/JPEG export | `Canvas`, `Image`, export dialogs | `pp_assets`, `pp_paint_renderer`, `pp_app_core` | Golden output tolerance, export start/target planning tests, live export-adapter document snapshot readiness through the shared paint-renderer export report, pure cube-face PNG writer, pure equirectangular PNG/JPEG+XMP writers, pure layer/frame collection PNG writers, app-core collection write executor, retained fallback coverage | +| Equirectangular import/export | `Canvas`, shaders, RTT, export dialogs | `pp_paint_renderer`, `pp_app_core` | Tiny cube/equirect golden, app-core file target tests, live export-adapter renderer-upload/face-PNG readiness report, pure document-frame equirectangular PNG and JPEG+XMP export with live writer fallback, pure layer/frame equirectangular PNG collection export, exact GPU/golden parity | | Cube face export | `Canvas` fallback | `pp_paint_renderer`, `pp_app_core` | Pure six-face document frame composite, renderer texture-upload bridge, shared export-readiness report, app-core face filename planning and write/publish service execution, payload-complete canvas-snapshot renderer-upload and face-PNG automation, live document/renderer face-PNG writer with retained Canvas fallback, OpenGL command-plan coverage, six-face golden set | | Depth export | `Canvas`, grid tools | `pp_paint_renderer`, `pp_app_core` | Depth target/write planning, document-snapshot renderer-readiness logging, depth render-plan draw/readback counts, retained render/readback parity, and format/golden validation | diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index 4caa9cf..e5d436b 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -532,8 +532,9 @@ agent or engineer to remove them without reconstructing context from chat. the composited document-frame cube faces into an equirectangular PNG with the shader-equivalent cube sampling policy and `pp_assets` PNG encoding. Live PNG equirectangular export writes through that path before retained fallback; - JPEG/XMP metadata parity, GPU filtering/golden parity, Web prepared-file - handoff, and the then-retained collection/depth/video writers stayed open. + then-open JPEG/XMP metadata parity, GPU filtering/golden parity, Web + prepared-file handoff, and the then-retained collection/depth/video writers + stayed open. - 2026-06-05: DEBT-0010/DEBT-0036/DEBT-0043 were narrowed again. `pp_paint_renderer` now exports independent layer equirectangular PNGs and merged animation-frame equirectangular PNGs from payload-complete @@ -541,8 +542,8 @@ agent or engineer to remove them without reconstructing context from chat. filename suffixes plus collection write/publish execution. Live layer and animation-frame PNG collection export uses those paths before retained fallback; Web handoff, incomplete renderer-readback snapshots, progress and - threading parity, exact GPU filtering/goldens, depth, video, and JPEG/XMP - remain open. + threading parity, exact GPU filtering/goldens, depth, video, and then-open + JPEG/XMP remained open. - 2026-06-05: DEBT-0010/DEBT-0036/DEBT-0043 were narrowed again. Depth export now plans the retained image/depth output target paths in tested `pp_app_core`, has a tested `pp_app_core` two-payload write/publish executor @@ -558,6 +559,13 @@ agent or engineer to remove them without reconstructing context from chat. payload-complete snapshots report the 1024x1024 merged-face and per-layer depth draw counts while still marking final depth image readback as renderer-owned. +- 2026-06-05: DEBT-0010/DEBT-0036/DEBT-0043 were narrowed again. + `pp_assets` now owns RGBA8 JPEG encode/decode plus GPano XMP APP1 injection, + `pp_paint_renderer` exports equirectangular JPEG+XMP bytes from the pure + document-frame projection, and the live desktop `.jpg`/`.jpeg` + equirectangular export bridge writes that payload before retained fallback. + Web handoff, incomplete-readback snapshots, progress/threading parity, exact + GPU filtering/goldens, depth render/readback, and video remain open. ## Open Debt @@ -571,7 +579,7 @@ agent or engineer to remove them without reconstructing context from chat. | DEBT-0007 | Open | Modernization | `vcpkg.json` and `windows-msvc-vcpkg-headless` are validated for the headless Windows component matrix, and root CMake now exposes a focused `panopainter_platform_build_vcpkg_ui_core` target for the vcpkg-backed `pp_ui_core`/tinyxml2 boundary, but app targets still use vendored libraries and Android/Apple triplets are not proven | Dependency migration must stay incremental while SDK/patched/vendor dependencies remain in use | `cmake --preset windows-msvc-vcpkg-headless`; `ctest --preset desktop-fast-vcpkg --build-config Debug`; `cmake --build --preset windows-msvc-default --config Debug --target panopainter_platform_build_vcpkg_ui_core` | Component targets consume vcpkg packages where reliable and desktop app, Android, and Apple triplets are validated or explicitly documented as permanent vendor exceptions | | DEBT-0008 | Open | Modernization | `windows-msvc-default` and `windows-msvc-vcpkg-headless` explicitly select Visual Studio 18 2026 for local validation, but non-VS2026 CMake executables on PATH may not know that generator | The local machine has VS 2026, but using an older CMake can still default to Ninja or reject the VS 2026 generator | `cmake --preset windows-msvc-default`; `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter`; `ctest --preset desktop-fast --build-config Debug` | The repo automation invokes or locates a CMake executable that supports `Visual Studio 18 2026`, and VS 2026 generator validation is the normal Windows path without manual tool selection | | DEBT-0009 | Open | Modernization | Android root CMake validation currently builds headless targets only, while retained standard/Quest/Focus package CMake paths now have a refreshed CMake 3.10/C++23 baseline outside root CMake; automation queries `sdkmanager`, installs newer or missing SDK Manager NDK/CMake packages, selects the resulting pair before configure, and reports update decisions; root CMake exposes non-default platform-build and retained native package validation targets | Platform app entrypoints still live in legacy Gradle/CMake projects and need Phase 6 alignment | `powershell -ExecutionPolicy Bypass -File scripts\automation\platform-build.ps1 -Presets android-arm64`; `cmake --build --preset android-x64`; `cmake --build --preset android-quest-arm64`; `cmake --build --preset android-focus-arm64`; `cmake --build --preset windows-msvc-default --config Debug --target panopainter_platform_build_android_assets`; `powershell -ExecutionPolicy Bypass -File scripts\automation\android-legacy-package-build.ps1 -Packages standard`; `powershell -ExecutionPolicy Bypass -File scripts\automation\android-legacy-package-build.ps1 -Packages quest,focus -ConfigureOnly`; `powershell -ExecutionPolicy Bypass -File scripts\automation\package-smoke.ps1 -ReadinessOnly -AndroidNativeChecks -PackageKinds android-standard-apk,android-quest-apk,android-focus-apk`; `cmake --build --preset windows-msvc-default --config Debug --target panopainter_android_native_package_smoke` | Android standard, Quest, and Focus/Wave package targets consume shared component targets and have package smoke commands | -| DEBT-0010 | Open | Modernization | `pp_document` is a pure layer/frame/document/undo-history model with alpha-lock metadata, snapshot construction, per-layer frame metadata, renderer-free RGBA8 face payload storage, snapshot-embedded face-payload validation, renderer-free alpha8 selection-mask storage, PPI import/export helpers, stroke-script-to-face-payload CLI automation, `pp_paint_renderer` document face/frame compositors, renderer-neutral six-face texture upload, pure six-face PNG export, pure equirectangular PNG export, pure layer/animation-frame PNG collection export, shared document-frame export readiness reporting, depth export render-plan reporting, OpenGL command-planner validation through CLI render automation, live Canvas snapshot projection through `pp_app_core`/`legacy_document_canvas_services`, captured RGBA8 payload attachment to `pp_document`, live Save/Save As/Save Version/save-before-workflow snapshot-readiness reporting before retained save execution, pure app-core PPI export for payload-complete canvas snapshots, payload-complete canvas-snapshot renderer-upload plus face-PNG export automation, live cube-face face-PNG writer execution using app-core face target planning and write/publish service dispatch with retained fallback, live PNG equirectangular writer execution using the paint-renderer equirectangular PNG export with retained fallback, live payload-complete layer/animation-frame collection writer execution using paint-renderer PNG sequences and app-core collection write/publish dispatch with retained fallback, and live equirectangular/layer/animation-frame/depth/cube-face export snapshot/render/export-readiness reporting through the shared readiness helper plus the depth render plan, but action-command adoption, live save-writer replacement, JPEG/XMP metadata parity, Web and incomplete-readback collection handoff, progress/threading parity, broader renderer-owned export execution, depth render/readback replacement, and renderer-owned cube-face readback ownership are not yet wired | Keep extraction incremental while preserving app behavior | `ctest --preset desktop-fast --build-config Debug`; `pano_cli create-document --width 64 --height 32 --layers 2`; `pano_cli load-project --path tests\data\projects\minimal-project.ppi`; `pano_cli simulate-document-render --width 64 --height 32`; `pano_cli plan-canvas-document-snapshot --width 64 --height 32`; `pano_cli plan-canvas-document-snapshot --captured-face-payloads-per-layer 1`; `pp_document_tests`; `pp_document_ppi_import_tests`; `pp_document_ppi_export_tests`; `pp_paint_renderer_compositor_tests`; `pp_app_core_document_canvas_tests`; `pano_cli_simulate_document_edits_smoke`; `pano_cli_simulate_document_export_smoke`; `pano_cli_simulate_document_render_smoke`; `pano_cli_plan_canvas_document_snapshot_smoke`; `pano_cli_plan_canvas_document_snapshot_payload_smoke`; `pano_cli_save_document_project_roundtrip_smoke`; `pano_cli_apply_stroke_script_roundtrip_smoke`; `pano_cli_apply_stroke_script_rejects_tiny_canvas` | Legacy document behavior is represented by `pp_document`/`pp_paint_renderer` tests and the app consumes it through a boundary/facade | +| DEBT-0010 | Open | Modernization | `pp_document` is a pure layer/frame/document/undo-history model with alpha-lock metadata, snapshot construction, per-layer frame metadata, renderer-free RGBA8 face payload storage, snapshot-embedded face-payload validation, renderer-free alpha8 selection-mask storage, PPI import/export helpers, stroke-script-to-face-payload CLI automation, `pp_paint_renderer` document face/frame compositors, renderer-neutral six-face texture upload, pure six-face PNG export, pure equirectangular PNG export, pure equirectangular JPEG+XMP export, pure layer/animation-frame PNG collection export, shared document-frame export readiness reporting, depth export render-plan reporting, OpenGL command-planner validation through CLI render automation, live Canvas snapshot projection through `pp_app_core`/`legacy_document_canvas_services`, captured RGBA8 payload attachment to `pp_document`, live Save/Save As/Save Version/save-before-workflow snapshot-readiness reporting before retained save execution, pure app-core PPI export for payload-complete canvas snapshots, payload-complete canvas-snapshot renderer-upload plus face-PNG export automation, live cube-face face-PNG writer execution using app-core face target planning and write/publish service dispatch with retained fallback, live PNG/JPEG equirectangular writer execution using the paint-renderer equirectangular exports with retained fallback, live payload-complete layer/animation-frame collection writer execution using paint-renderer PNG sequences and app-core collection write/publish dispatch with retained fallback, and live equirectangular/layer/animation-frame/depth/cube-face export snapshot/render/export-readiness reporting through the shared readiness helper plus the depth render plan, but action-command adoption, live save-writer replacement, Web and incomplete-readback collection handoff, progress/threading parity, broader renderer-owned export execution, exact GPU/golden parity, depth render/readback replacement, and renderer-owned cube-face readback ownership are not yet wired | Keep extraction incremental while preserving app behavior | `ctest --preset desktop-fast --build-config Debug`; `pano_cli create-document --width 64 --height 32 --layers 2`; `pano_cli load-project --path tests\data\projects\minimal-project.ppi`; `pano_cli simulate-document-render --width 64 --height 32`; `pano_cli plan-canvas-document-snapshot --width 64 --height 32`; `pano_cli plan-canvas-document-snapshot --captured-face-payloads-per-layer 1`; `pp_document_tests`; `pp_document_ppi_import_tests`; `pp_document_ppi_export_tests`; `pp_paint_renderer_compositor_tests`; `pp_app_core_document_canvas_tests`; `pano_cli_simulate_document_edits_smoke`; `pano_cli_simulate_document_export_smoke`; `pano_cli_simulate_document_render_smoke`; `pano_cli_plan_canvas_document_snapshot_smoke`; `pano_cli_plan_canvas_document_snapshot_payload_smoke`; `pano_cli_save_document_project_roundtrip_smoke`; `pano_cli_apply_stroke_script_roundtrip_smoke`; `pano_cli_apply_stroke_script_rejects_tiny_canvas` | Legacy document behavior is represented by `pp_document`/`pp_paint_renderer` tests and the app consumes it through a boundary/facade | | DEBT-0011 | Open | Modernization | `package-smoke` validates the Windows CMake app artifact and launch-folder DLL payload, and reports a structured package readiness matrix for Windows AppX, Android standard/Quest/Focus APKs, Apple bundles, Linux app output, and WebGL output; the Windows app smoke passes the configure-time CMake executable so VS 2026 generator validation does not depend on `cmake` from PATH, retained Android package native CMake paths, and retained Linux/WebGL CMake baseline metadata are reachable from package validation and root CMake package-readiness targets, but Windows AppX/APK/Linux/Apple/WebGL package outputs are still `blocked` because root CMake package targets do not exist yet | Platform package targets are not migrated to root CMake yet | `powershell -ExecutionPolicy Bypass -File scripts\automation\package-smoke.ps1 -Preset windows-msvc-default -Configuration Debug`; `cmake --build --preset windows-msvc-default --config Debug --target panopainter_windows_app_package_smoke`; `powershell -ExecutionPolicy Bypass -File scripts\automation\package-smoke.ps1 -ReadinessOnly -AndroidNativeChecks -PackageKinds android-standard-apk,android-quest-apk,android-focus-apk`; `cmake --build --preset windows-msvc-default --config Debug --target panopainter_android_native_package_smoke`; `cmake --build --preset windows-msvc-default --config Debug --target panopainter_linux_webgl_package_readiness`; `python scripts/dev/check_package_smoke_readiness.py`; `bash -n scripts/automation/package-smoke.sh` | Package-smoke builds and validates Windows AppX, Android APK variants, Linux app, Apple bundles, and WebGL output where local toolchains are present | | DEBT-0012 | Open | Modernization | `pp_ui_core` uses vcpkg tinyxml2 on `windows-msvc-vcpkg-headless`, but retains `pp_vendor_tinyxml2` for default and unproven platform presets | Mobile/AppX/Apple triplets and app packaging still need validation before removing the vendored fallback | `ctest --preset desktop-fast-vcpkg --build-config Debug`; `ctest --preset desktop-fast --build-config Debug`; `powershell -ExecutionPolicy Bypass -File scripts\automation\platform-build.ps1 -Presets android-arm64` | All supported presets consume vcpkg tinyxml2 or document a permanent vendored exception | | DEBT-0013 | Open | Modernization | `pp_assets`, `pp_document`, `pano_cli inspect-project`, `pano_cli load-project`, and `pano_cli save-project` validate the fixed PPI header, thumbnail/body byte layout, generated multi-layer/multi-frame PPI writing with explicit layer opacity/blend/alpha-lock/visibility metadata, per-layer frame durations, metadata-only and targeted dirty-face-payload save/load round-trips, layer/frame index, dirty-face descriptors, dirty-face PNG payload metadata, asset-level RGBA PNG payload decoding, pure document-to-PPI export, CLI document export automation, file-writing document export automation, stroke-script-generated document payload export, decoded pixel attachment to `pp_document`, live save-path snapshot-readiness reporting, and app-core canvas-snapshot-to-PPI export automation, but full legacy PPI round-trip parity and pure live save writer replacement are not yet extracted | Full PPI save parity requires staged extraction of legacy `Canvas` serialization and image/layer payload handling | `ctest --preset desktop-fast --build-config Debug`; `pp_assets_image_pixels_tests`; `pp_assets_ppi_header_tests`; `pp_document_ppi_import_tests`; `pp_document_ppi_export_tests`; `pano_cli_inspect_project_layout_smoke`; `pano_cli_load_project_metadata_smoke`; `pano_cli_save_project_roundtrip_smoke`; `pano_cli_save_project_payload_roundtrip_smoke`; `pano_cli_simulate_document_export_smoke`; `pano_cli_save_document_project_roundtrip_smoke`; `pano_cli_apply_stroke_script_roundtrip_smoke`; `pano_cli_apply_stroke_script_rejects_tiny_canvas` | Full PPI load/save fixtures cover thumbnails, decoded layer face payloads attached to documents, frames, corrupt payloads, dirty-face payload saving, arbitrary legacy canvas payload/layout combinations, and legacy app round-trip compatibility | @@ -596,14 +604,14 @@ agent or engineer to remove them without reconstructing context from chat. | DEBT-0033 | Open | Modernization | Tools menu planning and direct command execution dispatch now consume pure `pp_app_core` through `App::init_menu_tools`, `pano_cli plan-tools-menu`, `pano_cli plan-tools-panel`, `pano_cli plan-canvas-camera-reset`, `pano_cli plan-canvas-view-density`, `pano_cli plan-canvas-view-cursor-mode`, and the `ToolsMenuServices` boundary, direct command execution is centralized in `src/legacy_app_shell_services.*`, SonarPen availability/startup now routes through `PlatformServices`, and reset-camera, viewport-density, and cursor-mode execution now share `src/legacy_canvas_view_services.*`, but live adapters still construct legacy `NodePanelFloating` panels, mutate legacy panel nodes, clear `CanvasModeGrid`, open legacy shortcuts UI, mutate retained `Canvas` camera/density/cursor state, write retained `Settings`, and rely on the legacy platform adapter for the retained iOS SonarPen bridge | Preserve current Tools menu and canvas-view behavior while UI shell actions move toward app/UI/platform/canvas services | `pp_app_core_tools_menu_tests`; `pp_app_core_canvas_view_tests`; `pp_platform_api_tests`; `pano_cli plan-tools-menu --command shortcuts`; `pano_cli plan-tools-panel --panel layers`; `pano_cli plan-tools-panel --panel animation --already-visible`; `pano_cli plan-canvas-camera-reset`; `pano_cli plan-canvas-view-density --density 1.5`; `pano_cli plan-canvas-view-cursor-mode --mode 3`; `ctest --preset desktop-fast --build-config Debug` | Tools panel creation, submenu routing, grid clear, camera reset, viewport density, cursor mode, shortcuts dialog, and SonarPen dispatch are owned by injected app/UI/platform/canvas services with `App::init_menu_tools` and options callbacks acting only as UI adapters and no legacy Tools/canvas-view adapter | | DEBT-0034 | Open | Modernization | About menu command planning and execution dispatch now consume pure `pp_app_core` through `App::init_menu_about`, `pano_cli plan-about-menu`, and the `AboutMenuServices` boundary, and live execution is centralized in `src/legacy_app_shell_services.*`, but the bridge still opens legacy About/manual/what's-new dialogs, invokes the injected crash hook, and runs the legacy Canvas stroke performance test directly | Preserve About menu behavior while dialogs and diagnostics move toward app/UI/platform services | `pp_app_core_about_menu_tests`; `pano_cli plan-about-menu --command news --version-major 2 --version-minor 5 --version-fix 7`; `pano_cli plan-about-menu --command performance --no-canvas`; `ctest --preset desktop-fast --build-config Debug` | About/manual/what's-new dialog dispatch, crash-test dispatch, and performance-test execution are owned by injected app/UI/platform services with `App::init_menu_about` acting only as a UI adapter and no legacy About adapter | | DEBT-0035 | Open | Modernization | Main toolbar/status command planning and execution dispatch now consume pure `pp_app_core` through `App::init_toolbar_main`, `pano_cli plan-main-toolbar`, and the `MainToolbarServices` boundary; toolbar test-message dialog metadata now lives in `pp_app_core` through `plan_main_toolbar_message_dialog`, retained message-box creation routes through `src/legacy_app_dialog_services.*`, history/canvas commands now hand off through `HistoryUiServices` and `DocumentCanvasClearServices`, and live execution is centralized in `src/legacy_app_shell_services.*`, but the bridge still opens legacy open/save/settings dialogs, stores raw compatibility pointers, and delegates to legacy history/canvas adapters | Preserve reachable toolbar/status behavior while app shell commands move toward app/document/UI services | `pp_app_core_main_toolbar_tests`; `pano_cli plan-main-toolbar --command undo --undo-count 2`; `pano_cli plan-main-toolbar --command message-box`; `pano_cli plan-main-toolbar --command clear-canvas --no-canvas`; `ctest --preset desktop-fast --build-config Debug` | Open/save/settings/message-box routing, undo/redo/clear-history execution, and canvas-clear execution are owned by injected app/document/UI services with `App::init_toolbar_main` acting only as a UI adapter and no legacy toolbar adapter | -| DEBT-0036 | Open | Modernization | `pp_renderer_api`, `pp_paint_renderer`, `pano_cli plan-paint-feedback`, and `pano_cli plan-stroke-composite` can choose backend-neutral complex paint feedback strategies for fixed-function blending, framebuffer-fetch-capable renderers, or ping-pong render targets. OpenGL extension detection now stores `pp::renderer::RenderDeviceFeatures` through `ShaderManager`, using `pp_renderer_gl::query_opengl_capability_detection`, `detect_opengl_feature_state`, and `render_device_features` as the backend conversion point; that feature snapshot now includes float32-linear filtering, so canvas stroke texture format selection, renderer diagnostics, grid lightmap render planning, and grid bake target selection no longer read `ShaderManager::ext_*` flags directly. `pp_paint_renderer::plan_canvas_blend_gate` owns the compatibility mapping from persisted layer/brush blend indices to the extracted stroke-composite planner, and live `Canvas::draw_merge` plus `NodeCanvas` panorama rendering both call it with the stored renderer-neutral feature set for their existing shader-blend gates and destination-copy versus framebuffer-fetch decisions. `pp_paint_renderer::plan_canvas_stroke_feedback` also owns the current destination-feedback decision, and live `Canvas::stroke_draw`, thumbnail layer blending, and `NodeStrokePreview` brush-preview rendering use it for framebuffer-fetch versus destination-copy decisions. Pure document-frame compositing, renderer-neutral six-face texture upload, recorded upload-command reporting, pure six-face PNG encoding, pure equirectangular PNG encoding, and pure layer/animation-frame collection PNG encoding are now covered by `simulate-document-render`, payload-complete `plan-canvas-document-snapshot` automation, and the shared `pp_paint_renderer::prepare_document_frame_export_readiness` helper consumed by live export before retained writer fallback. The retained `copy_framebuffer_to_texture_2d` utility bridge now routes 2D framebuffer-to-texture copies through tested `pp_renderer_gl` dispatch, retained `RTT::create`/`RTT::destroy` render-target texture parameter setup, optional depth renderbuffer allocation, framebuffer allocation/attachment/status checks, binding restore, and resource deletion now route through tested `pp_renderer_gl` dispatch, retained RTT clear, masked clear with color-write-mask restore, texture bind/unbind, and RGBA8 dirty-region texture writes now route through tested `pp_renderer_gl` dispatch, retained Canvas, NodeCanvas, and NodeStrokePreview texture-unit switches now route through tested active-texture dispatch, retained Canvas, NodeCanvas, NodeStrokePreview, and desktop HMD viewport/scissor/capability execution now route through tested `pp_renderer_gl` dispatch adapters, retained NodeCanvas, CanvasMode, and NodePanelGrid capability-state snapshots now route through tested `pp_renderer_gl` query dispatch, CanvasLayer cube/equirect generation plus frame clears now share `legacy_ui_gl_dispatch` for active-texture selection, cube texture binding, viewport execution, blend capability execution, clear-color query/restore, and color-buffer clear adapter endpoints backed by tested `pp_renderer_gl` dispatch helpers, while the cube-face framebuffer-to-texture copy now uses the shared retained `copy_framebuffer_to_texture_target` utility bridge backed by tested `pp_renderer_gl` dispatch and remains tracked by DEBT-0036 until renderer services own copy execution, `NodePanelGrid` live heightmap draw and bake setup now route depth/blend state, depth clears, color-write-mask toggles, active texture selection, bake viewport execution, sun-overlay viewport query, and desktop texture-resize readback through tested `pp_renderer_gl` dispatch adapters; its active-texture, depth/blend capability query/apply, viewport query/execution, depth-clear, and color-write-mask adapter endpoints now share `legacy_ui_gl_dispatch`, retained CanvasMode overlay/mask/transform paths now route active texture, depth/blend state, transform/cut viewport execution, paint-mode blend/depth state snapshots, and canvas-tip pick framebuffer readback through tested `pp_renderer_gl` dispatch adapters; their active-texture, capability query/apply, viewport, read-framebuffer query, and RGBA8 pixel-readback adapter endpoints now share `legacy_ui_gl_dispatch`, retained simple UI draw paths now share `legacy_ui_gl_dispatch` for blend-state execution, fallback 2D texture unbinds, `NodeViewport` viewport query/restore, color-buffer clears, and clear-color restore, retained `NodeCanvas` plus `NodeStrokePreview` draw-state paths now share `legacy_ui_gl_dispatch` for active-texture selection, fallback texture unbind, viewport/scissor execution, viewport and clear-color queries, color-buffer clears, clear-color restore, and capability query/apply adapter endpoints backed by tested `pp_renderer_gl` dispatch helpers, retained `Canvas` stroke/object/thumbnail/export/frame-clear state endpoints now share `legacy_ui_gl_dispatch` for active-texture selection, fallback texture unbind, viewport/scissor execution, viewport and clear-color query, clear-color restore, and capability query/apply adapter endpoints, retained Canvas and RTT depth renderbuffer allocation/attachment/delete now share `legacy_gl_renderbuffer_dispatch` while renderer-resource ownership remains retained, retained `Texture2D`, `TextureCube`, and RTT texture allocation/delete/bind/parameter/update/mipmap dispatch now share `legacy_gl_texture_dispatch` while renderer-resource ownership remains retained, retained `Texture2D` readback plus RTT framebuffer allocation/delete/bind/restore/blit/readback and PBO readback dispatch now share `legacy_gl_framebuffer_dispatch` while renderer-resource ownership remains retained, retained Sampler create/parameter/border/bind dispatch shares `legacy_gl_sampler_dispatch` and retained PBO allocation/readback/map/unmap/delete dispatch shares `legacy_gl_pixel_buffer_dispatch` while renderer-resource ownership remains retained, retained `Shape`, `TextMesh`, and `NodeColorWheel` mesh buffer/VAO creation/upload/draw/delete dispatch now share `legacy_gl_mesh_dispatch` while renderer-resource ownership remains retained, retained shader source compilation/deletion, program attach/link/use/delete, attribute rebinding/location lookup, active-uniform enumeration, uniform-location discovery, and uniform writes now share `legacy_gl_shader_dispatch` while shader-program ownership remains retained, retained `gl_state` save/restore and `copy_framebuffer_to_texture_target` now reuse shared retained UI/framebuffer/shader/sampler bridge callbacks while renderer state and framebuffer-copy execution remain retained, retained app startup, app clear, app UI viewport/scissor, command-convert renderer state, and desktop VR draw-state endpoints now share `legacy_ui_gl_dispatch` while app/VR renderer execution remains retained, retained RTT clear and masked-clear endpoints now share `legacy_ui_gl_dispatch` while RTT render-target execution remains retained, retained app startup logging, Windows early context logging/window-title detection, and shader capability detection now share `legacy_gl_runtime_dispatch` while runtime/capability probing remains retained, and retained `CanvasLayer` frame-clear draw-state paths route saved clear-color query and restore through the same tested helpers, but actual live stroke rasterization, dual-brush compositing, pattern feedback math, thumbnail layer compositing, brush-preview compositing, grid lightmap/heightmap mesh rendering, JPEG/XMP equirectangular metadata export, Web/incomplete-readback collection handoff, depth export writer execution, progress/threading parity, exact GPU filtering parity, and the retained `ShaderManager::ext_*` compatibility fields still use legacy OpenGL canvas/UI execution | Preserve current painting behavior while the renderer boundary matures for OpenGL parity and later Vulkan/Metal experiments | `pp_renderer_api_tests`; `pp_renderer_gl_capabilities_tests`; `pp_paint_renderer_compositor_tests`; `pano_cli plan-paint-feedback --framebuffer-fetch --explicit-transitions --render-only`; `pano_cli plan-paint-feedback --texture-copy`; `pano_cli plan-stroke-composite --stroke-blend 10 --framebuffer-fetch --explicit-transitions --render-only`; `pano_cli plan-stroke-composite --layer-blend 4 --dual-blend --texture-copy`; `pano_cli plan-canvas-document-snapshot --captured-face-payloads-per-layer 1`; `ctest --preset desktop-fast --build-config Debug`; `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter` | Live stroke/layer/export compositing chooses its feedback path through `pp_paint_renderer` and renderer services, with OpenGL golden parity and Vulkan/Metal lab tests covering framebuffer-fetch and ping-pong behavior | +| DEBT-0036 | Open | Modernization | `pp_renderer_api`, `pp_paint_renderer`, `pano_cli plan-paint-feedback`, and `pano_cli plan-stroke-composite` can choose backend-neutral complex paint feedback strategies for fixed-function blending, framebuffer-fetch-capable renderers, or ping-pong render targets. OpenGL extension detection now stores `pp::renderer::RenderDeviceFeatures` through `ShaderManager`, using `pp_renderer_gl::query_opengl_capability_detection`, `detect_opengl_feature_state`, and `render_device_features` as the backend conversion point; that feature snapshot now includes float32-linear filtering, so canvas stroke texture format selection, renderer diagnostics, grid lightmap render planning, and grid bake target selection no longer read `ShaderManager::ext_*` flags directly. `pp_paint_renderer::plan_canvas_blend_gate` owns the compatibility mapping from persisted layer/brush blend indices to the extracted stroke-composite planner, and live `Canvas::draw_merge` plus `NodeCanvas` panorama rendering both call it with the stored renderer-neutral feature set for their existing shader-blend gates and destination-copy versus framebuffer-fetch decisions. `pp_paint_renderer::plan_canvas_stroke_feedback` also owns the current destination-feedback decision, and live `Canvas::stroke_draw`, thumbnail layer blending, and `NodeStrokePreview` brush-preview rendering use it for framebuffer-fetch versus destination-copy decisions. Pure document-frame compositing, renderer-neutral six-face texture upload, recorded upload-command reporting, pure six-face PNG encoding, pure equirectangular PNG/JPEG+XMP encoding, and pure layer/animation-frame collection PNG encoding are now covered by `simulate-document-render`, payload-complete `plan-canvas-document-snapshot` automation, and the shared `pp_paint_renderer::prepare_document_frame_export_readiness` helper consumed by live export before retained writer fallback. The retained `copy_framebuffer_to_texture_2d` utility bridge now routes 2D framebuffer-to-texture copies through tested `pp_renderer_gl` dispatch, retained `RTT::create`/`RTT::destroy` render-target texture parameter setup, optional depth renderbuffer allocation, framebuffer allocation/attachment/status checks, binding restore, and resource deletion now route through tested `pp_renderer_gl` dispatch, retained RTT clear, masked clear with color-write-mask restore, texture bind/unbind, and RGBA8 dirty-region texture writes now route through tested `pp_renderer_gl` dispatch, retained Canvas, NodeCanvas, and NodeStrokePreview texture-unit switches now route through tested active-texture dispatch, retained Canvas, NodeCanvas, NodeStrokePreview, and desktop HMD viewport/scissor/capability execution now route through tested `pp_renderer_gl` dispatch adapters, retained NodeCanvas, CanvasMode, and NodePanelGrid capability-state snapshots now route through tested `pp_renderer_gl` query dispatch, CanvasLayer cube/equirect generation plus frame clears now share `legacy_ui_gl_dispatch` for active-texture selection, cube texture binding, viewport execution, blend capability execution, clear-color query/restore, and color-buffer clear adapter endpoints backed by tested `pp_renderer_gl` dispatch helpers, while the cube-face framebuffer-to-texture copy now uses the shared retained `copy_framebuffer_to_texture_target` utility bridge backed by tested `pp_renderer_gl` dispatch and remains tracked by DEBT-0036 until renderer services own copy execution, `NodePanelGrid` live heightmap draw and bake setup now route depth/blend state, depth clears, color-write-mask toggles, active texture selection, bake viewport execution, sun-overlay viewport query, and desktop texture-resize readback through tested `pp_renderer_gl` dispatch adapters; its active-texture, depth/blend capability query/apply, viewport query/execution, depth-clear, and color-write-mask adapter endpoints now share `legacy_ui_gl_dispatch`, retained CanvasMode overlay/mask/transform paths now route active texture, depth/blend state, transform/cut viewport execution, paint-mode blend/depth state snapshots, and canvas-tip pick framebuffer readback through tested `pp_renderer_gl` dispatch adapters; their active-texture, capability query/apply, viewport, read-framebuffer query, and RGBA8 pixel-readback adapter endpoints now share `legacy_ui_gl_dispatch`, retained simple UI draw paths now share `legacy_ui_gl_dispatch` for blend-state execution, fallback 2D texture unbinds, `NodeViewport` viewport query/restore, color-buffer clears, and clear-color restore, retained `NodeCanvas` plus `NodeStrokePreview` draw-state paths now share `legacy_ui_gl_dispatch` for active-texture selection, fallback texture unbind, viewport/scissor execution, viewport and clear-color queries, color-buffer clears, clear-color restore, and capability query/apply adapter endpoints backed by tested `pp_renderer_gl` dispatch helpers, retained `Canvas` stroke/object/thumbnail/export/frame-clear state endpoints now share `legacy_ui_gl_dispatch` for active-texture selection, fallback texture unbind, viewport/scissor execution, viewport and clear-color query, clear-color restore, and capability query/apply adapter endpoints, retained Canvas and RTT depth renderbuffer allocation/attachment/delete now share `legacy_gl_renderbuffer_dispatch` while renderer-resource ownership remains retained, retained `Texture2D`, `TextureCube`, and RTT texture allocation/delete/bind/parameter/update/mipmap dispatch now share `legacy_gl_texture_dispatch` while renderer-resource ownership remains retained, retained `Texture2D` readback plus RTT framebuffer allocation/delete/bind/restore/blit/readback and PBO readback dispatch now share `legacy_gl_framebuffer_dispatch` while renderer-resource ownership remains retained, retained Sampler create/parameter/border/bind dispatch shares `legacy_gl_sampler_dispatch` and retained PBO allocation/readback/map/unmap/delete dispatch shares `legacy_gl_pixel_buffer_dispatch` while renderer-resource ownership remains retained, retained `Shape`, `TextMesh`, and `NodeColorWheel` mesh buffer/VAO creation/upload/draw/delete dispatch now share `legacy_gl_mesh_dispatch` while renderer-resource ownership remains retained, retained shader source compilation/deletion, program attach/link/use/delete, attribute rebinding/location lookup, active-uniform enumeration, uniform-location discovery, and uniform writes now share `legacy_gl_shader_dispatch` while shader-program ownership remains retained, retained `gl_state` save/restore and `copy_framebuffer_to_texture_target` now reuse shared retained UI/framebuffer/shader/sampler bridge callbacks while renderer state and framebuffer-copy execution remain retained, retained app startup, app clear, app UI viewport/scissor, command-convert renderer state, and desktop VR draw-state endpoints now share `legacy_ui_gl_dispatch` while app/VR renderer execution remains retained, retained RTT clear and masked-clear endpoints now share `legacy_ui_gl_dispatch` while RTT render-target execution remains retained, retained app startup logging, Windows early context logging/window-title detection, and shader capability detection now share `legacy_gl_runtime_dispatch` while runtime/capability probing remains retained, and retained `CanvasLayer` frame-clear draw-state paths route saved clear-color query and restore through the same tested helpers, but actual live stroke rasterization, dual-brush compositing, pattern feedback math, thumbnail layer compositing, brush-preview compositing, grid lightmap/heightmap mesh rendering, Web/incomplete-readback collection handoff, depth export writer execution, progress/threading parity, exact GPU filtering parity, and the retained `ShaderManager::ext_*` compatibility fields still use legacy OpenGL canvas/UI execution | Preserve current painting behavior while the renderer boundary matures for OpenGL parity and later Vulkan/Metal experiments | `pp_renderer_api_tests`; `pp_renderer_gl_capabilities_tests`; `pp_paint_renderer_compositor_tests`; `pano_cli plan-paint-feedback --framebuffer-fetch --explicit-transitions --render-only`; `pano_cli plan-paint-feedback --texture-copy`; `pano_cli plan-stroke-composite --stroke-blend 10 --framebuffer-fetch --explicit-transitions --render-only`; `pano_cli plan-stroke-composite --layer-blend 4 --dual-blend --texture-copy`; `pano_cli plan-canvas-document-snapshot --captured-face-payloads-per-layer 1`; `ctest --preset desktop-fast --build-config Debug`; `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter` | Live stroke/layer/export compositing chooses its feedback path through `pp_paint_renderer` and renderer services, with OpenGL golden parity and Vulkan/Metal lab tests covering framebuffer-fetch and ping-pong behavior | | DEBT-0037 | Open | Modernization | Recording lifecycle/export planning, export progress-dialog metadata, and execution dispatch now consume pure `pp_app_core` through `App::rec_start`, `App::rec_stop`, `App::rec_clear`, `App::rec_export`, `pano_cli plan-recording-session`, and the `RecordingServices` boundary; live execution is centralized in `src/legacy_recording_services.*`, retained MP4 export progress bar creation routes through `src/legacy_app_dialog_services.*`, and retained `PBO` allocation/readback/map/unmap/delete operations now route through tested `pp_renderer_gl` dispatch, but the bridge still owns legacy recording thread startup/shutdown, platform recorded-file cleanup, progress lifetime, retained `App::rec_loop` readback call sites, and `MP4Encoder::write_mp4` execution | Preserve current timelapse/MP4 behavior while recording moves toward app/document/renderer/video services | `pp_app_core_document_recording_tests`; `pp_renderer_gl_capabilities_tests`; `pano_cli plan-recording-session --running --frame-count 12`; `pano_cli plan-recording-session --platform-deletes-recorded-files`; `ctest --preset desktop-fast --build-config Debug` | Recording thread lifecycle, frame readback scheduling, platform cleanup, progress reporting, and MP4 writing are owned by injected app/renderer/video services with `App` methods acting only as adapters | | DEBT-0038 | Open | Modernization | Cloud upload/browse/bulk planning, cloud prompt/progress metadata, and execution dispatch now consume pure `pp_app_core` through `App::cloud_upload`, `App::cloud_upload_all`, `App::cloud_browse`, `pano_cli plan-cloud-upload`, `pano_cli plan-cloud-upload-all`, `pano_cli plan-cloud-browse`, `pano_cli plan-cloud-transfer`, and the `CloudServices` boundary; live execution is centralized in `src/legacy_cloud_services.*`, the app-owned `upload`/`download` CURL helpers now consume `pp_app_core` cloud transfer request/progress planning and the platform TLS-verification bypass policy before retained CURL setup, upload warning/publish/success prompts, upload/bulk progress dialog titles, download-progress prompt metadata, and formatted download progress text come from tested app-core plans, retained cloud prompt/progress creation routes through `src/legacy_app_dialog_services.*` via `App::message_box`/`App::show_progress` or direct bridge calls, and retained `Asset::open_url`, `LogRemote::net_init`, and `NodeDialogCloud::load_thumbs_thread` curl sites consume the `pp_platform_api` default TLS policy helper instead of spelling Android branches locally, but the bridge still uses legacy save-before-upload, app-owned curl helpers instead of an injected network service, upload form construction, response/error handling, retained prompt/progress lifetime, OpenGL context guarding, `NodeDialogCloud`, `Canvas` project open, layer refresh, and `ActionManager` reset | Preserve current cloud behavior while cloud/network/document import flows move toward app/document/platform services | `pp_app_core_document_cloud_tests`; `pp_platform_api_tests`; `pano_cli plan-cloud-upload --new-document --unsaved`; `pano_cli plan-cloud-browse --selected-file demo.ppi`; `pano_cli plan-cloud-upload-all --file-count 3`; `pano_cli plan-cloud-transfer --direction download --progress --disable-tls-verification`; `ctest --preset desktop-fast --build-config Debug` | Cloud upload/download, TLS policy, save-before-upload, progress reporting, cloud browse dialog, downloaded project opening, layer refresh, OpenGL context ownership, and action-history reset are owned by injected app/document/network/platform/renderer services with `App` methods acting only as adapters | | DEBT-0039 | Open | Modernization | Document-open planning and execution dispatch now consume pure `pp_app_core` through `App::open_document`, `pano_cli plan-open-route`, `DocumentOpenServices`, and `src/legacy_document_open_services.*`, but the bridge still opens ABR/PPBR import prompts before delegating import execution to `src/legacy_brush_package_import_services.*`, applies unsaved-project discard prompts, calls legacy project-open execution, refreshes layer UI, updates the app title, and clears legacy history directly | Preserve current file-open/import behavior while document loading and brush import move toward app/document/asset/UI services | `pp_app_core_document_route_tests`; `pp_app_core_document_session_tests`; `pano_cli plan-open-route --path D:/Paint/Scenes/demo.ppi --unsaved`; `pano_cli plan-open-route --path D:/Paint/Brushes/clouds.ABR --unsaved`; `ctest --preset desktop-fast --build-config Debug` | Brush import prompting, project-open execution, unsaved-project discard prompting, layer refresh, title updates, and history clearing are owned by injected app/document/asset/UI services with `App::open_document` acting only as an adapter | | DEBT-0040 | Open | Modernization | Close request, document save, save-before-workflow planning/execution dispatch, and close/save-before/save-error prompt metadata now consume pure `pp_app_core` through `App::request_close`, `App::save_document`, `App::continue_document_workflow_after_optional_save`, `pano_cli simulate-app-session`, `pano_cli plan-document-session-prompt`, `DocumentSaveServices`, `CloseRequestServices`, `DocumentWorkflowServices`, and `src/legacy_document_session_services.*`; close/save-before prompt creation now uses `src/legacy_app_dialog_services.*`, Save dialog working-directory picker visibility/path formatting now dispatches through `PlatformServices`, and existing-project save/save-before-workflow execution prepares a payload-bearing canvas snapshot report before retained saving, but the bridge still opens retained save dialogs, wires prompt callbacks directly, delegates actual writing to `Canvas::project_save`, mutates the unsaved flag on close confirmation, invokes native app close, and routes save-version through the retained legacy dialog | Preserve current close/save/dirty-workflow behavior while document session execution moves toward app/document/UI/platform services | `pp_app_core_document_session_tests`; `pp_platform_api_tests`; `pano_cli plan-document-session-prompt --kind close-unsaved`; `pano_cli plan-document-session-prompt --kind save-before-workflow`; `pano_cli simulate-app-session --unsaved --save-intent save-dirty-version`; `pano_cli simulate-app-session --no-canvas`; `pano_cli plan-document-file --work-dir D:/Paint --name demo --target-exists`; `pano_cli plan-document-version --directory D:/Paint --doc-name demo.01 --existing-path D:/Paint/demo.02.ppi`; `ctest --preset desktop-fast --build-config Debug` | Close prompt execution, native close requests, dirty-workflow save prompts, existing-project saves, save dialogs, save-version execution, and unsaved-flag mutation are owned by injected app/document/UI/platform services with `App` methods acting only as adapters | | DEBT-0041 | Open | Modernization | Accepted new-document planning/execution dispatch and new-document overwrite prompt metadata now consume pure `pp_app_core` through `App::dialog_newdoc`, `pano_cli plan-new-document`, `pano_cli plan-document-session-prompt`, `NewDocumentServices`, and `src/legacy_document_session_services.*`; new-document overwrite prompt creation now uses `src/legacy_app_dialog_services.*`, and New Document dialog working-directory picker visibility/path formatting now dispatches through `PlatformServices`, but the bridge still mutates legacy app document fields, clears legacy layer UI, resizes legacy `Canvas`, clears legacy history, creates the default layer through legacy UI, mutates unsaved/new-document flags, updates the title, wires overwrite callbacks directly, and handles keyboard/dialog cleanup directly | Preserve current New Document dialog behavior while document creation moves toward app/document/UI services | `pp_app_core_document_session_tests`; `pp_platform_api_tests`; `pano_cli plan-new-document --work-dir D:/Paint --name demo --resolution-index 3`; `pano_cli plan-new-document --work-dir D:/Paint --name demo --resolution-index 3 --target-exists`; `pano_cli plan-document-session-prompt --kind new-document-overwrite`; `pano_cli simulate-app-session --save-intent save`; `ctest --preset desktop-fast --build-config Debug` | New document creation, overwrite confirmation, canvas/document allocation, default layer creation, history clearing, title updates, dirty/new-document state, and keyboard/dialog cleanup are owned by injected app/document/UI services with `App::dialog_newdoc` acting only as a UI adapter | | DEBT-0042 | Open | Modernization | Accepted Save As and Save Version planning/execution dispatch plus Save As overwrite prompt metadata now consumes pure `pp_app_core` through `App::dialog_save`, `App::dialog_save_ver`, `pano_cli plan-document-file`, `pano_cli plan-document-version`, `pano_cli plan-document-session-prompt`, `DocumentFileSaveServices`, `DocumentVersionSaveServices`, and `src/legacy_document_session_services.*`; Save As overwrite prompt creation now uses `src/legacy_app_dialog_services.*`, and accepted Save As/Save Version execution prepares a payload-bearing canvas snapshot report before retained saving, but the bridge still wires overwrite callbacks directly, delegates actual writing to legacy `Canvas::project_save`, mutates app document name/path/directory fields, marks version saves dirty before saving, updates the title, and handles keyboard/dialog cleanup directly | Preserve current Save As and Save Version behavior while document persistence moves toward app/document/storage/UI services | `pp_app_core_document_session_tests`; `pano_cli plan-document-file --work-dir D:/Paint --name demo --target-exists`; `pano_cli plan-document-session-prompt --kind file-overwrite --name demo`; `pano_cli plan-document-version --directory D:/Paint --doc-name demo.01 --existing-path D:/Paint/demo.02.ppi`; `pano_cli simulate-app-session --save-intent save-as`; `pano_cli simulate-app-session --save-intent save-version`; `ctest --preset desktop-fast --build-config Debug` | Save As overwrite prompting, project-save execution, app document metadata updates, title updates, version-save dirty-state handling, and keyboard/dialog cleanup are owned by injected app/document/storage/UI services with `App::dialog_save` and `App::dialog_save_ver` acting only as UI adapters | -| DEBT-0043 | Open | Modernization | Equirectangular, layer, animation-frame, depth, and cube-face export planning/execution dispatch now consumes pure `pp_app_core` through `App::dialog_export`, `App::dialog_export_layers`, `App::dialog_export_anim_frames`, `App::dialog_export_depth`, `App::dialog_export_cube_faces`, `pano_cli plan-export-*`, `DocumentExportServices`, and `src/legacy_document_export_services.*`; layer/frame dialogs also consume `plan_document_export_collection_target` plus `PlatformServices::uses_work_directory_document_export_collections()` instead of spelling local iOS branches, export success/failure/license dialog metadata plus execution log labels now come from `pp_app_core`, equirectangular/layer/animation-frame/depth/cube-face execution prepares a payload-bearing document snapshot plus the shared `pp_paint_renderer::prepare_document_frame_export_readiness` report, depth export target naming and two-payload write order are covered by tested `pp_app_core` helpers, cube-face export writes the pure face PNG bytes to `pp_app_core` planned work-directory face paths through `execute_document_cube_face_export_write` before falling back to retained Canvas execution on failure, PNG equirectangular export writes the pure `pp_paint_renderer` equirectangular PNG before retained fallback, and payload-complete layer/animation-frame collections write pure `pp_paint_renderer` PNG sequences through `execute_document_export_collection_write` before retained fallback, but the bridge still adapts retained filesystem writes/exported-image publishing locally, still calls legacy `Canvas` export methods for JPEG/XMP equirectangular export, Web/incomplete-readback collection exports, and depth rendering, creates export directories, handles picker-selected stems, performs Web prepared-file handoff directly, and leaves depth render/readback plus the legacy `.png`/JPEG payload mismatch on the retained path | Preserve current image/collection/depth/cube export behavior while export execution moves toward document/renderer/platform/storage services | `pp_app_core_document_export_tests`; `pp_platform_api_tests`; `pano_cli plan-export-start --requires-license --demo`; `pano_cli plan-export-menu --kind layers`; `pano_cli plan-export-target --kind collection --work-dir D:/Paint --doc-name demo --suffix _layers`; `pano_cli plan-export-target --kind cube-faces --work-dir D:/Paint --doc-name demo`; `pano_cli plan-export-message --kind equirectangular --destination work --detail D:/Paint`; `pano_cli plan-export-report --kind license-disabled`; `pano_cli simulate-document-export`; `ctest --preset desktop-fast --build-config Debug` | File, collection, stem, depth, and remaining retained export execution, export-directory creation, Web file handoff, picker-selected stem handling, and legacy canvas export calls are owned by injected document/renderer/platform/storage services with export dialogs acting only as UI adapters | +| DEBT-0043 | Open | Modernization | Equirectangular, layer, animation-frame, depth, and cube-face export planning/execution dispatch now consumes pure `pp_app_core` through `App::dialog_export`, `App::dialog_export_layers`, `App::dialog_export_anim_frames`, `App::dialog_export_depth`, `App::dialog_export_cube_faces`, `pano_cli plan-export-*`, `DocumentExportServices`, and `src/legacy_document_export_services.*`; layer/frame dialogs also consume `plan_document_export_collection_target` plus `PlatformServices::uses_work_directory_document_export_collections()` instead of spelling local iOS branches, export success/failure/license dialog metadata plus execution log labels now come from `pp_app_core`, equirectangular/layer/animation-frame/depth/cube-face execution prepares a payload-bearing document snapshot plus the shared `pp_paint_renderer::prepare_document_frame_export_readiness` report, depth export target naming and two-payload write order are covered by tested `pp_app_core` helpers, cube-face export writes the pure face PNG bytes to `pp_app_core` planned work-directory face paths through `execute_document_cube_face_export_write` before falling back to retained Canvas execution on failure, PNG/JPEG equirectangular export writes the pure `pp_paint_renderer` equirectangular payload before retained fallback, and payload-complete layer/animation-frame collections write pure `pp_paint_renderer` PNG sequences through `execute_document_export_collection_write` before retained fallback, but the bridge still adapts retained filesystem writes/exported-image publishing locally, still calls legacy `Canvas` export methods for Web/incomplete-readback collection exports and depth rendering, creates export directories, handles picker-selected stems, performs Web prepared-file handoff directly, and leaves depth render/readback plus the legacy `.png`/JPEG payload mismatch on the retained path | Preserve current image/collection/depth/cube export behavior while export execution moves toward document/renderer/platform/storage services | `pp_app_core_document_export_tests`; `pp_platform_api_tests`; `pano_cli plan-export-start --requires-license --demo`; `pano_cli plan-export-menu --kind layers`; `pano_cli plan-export-target --kind collection --work-dir D:/Paint --doc-name demo --suffix _layers`; `pano_cli plan-export-target --kind cube-faces --work-dir D:/Paint --doc-name demo`; `pano_cli plan-export-message --kind equirectangular --destination work --detail D:/Paint`; `pano_cli plan-export-report --kind license-disabled`; `pano_cli simulate-document-export`; `ctest --preset desktop-fast --build-config Debug` | File, collection, stem, depth, and remaining retained export execution, export-directory creation, Web file handoff, picker-selected stem handling, and legacy canvas export calls are owned by injected document/renderer/platform/storage services with export dialogs acting only as UI adapters | | DEBT-0044 | Open | Modernization | Timelapse and animation MP4 export execution dispatch now consumes pure `pp_app_core` through `App::dialog_timelapse_export`, `App::dialog_export_mp4`, `pano_cli plan-export-menu`, `pano_cli plan-export-target --kind name`, `pano_cli plan-export-message`, `pano_cli plan-export-report`, `DocumentVideoExportServices`, and `src/legacy_document_export_services.*`, and success/failure/license dialog metadata plus execution log labels now come from `pp_app_core`, but the bridge still launches legacy desktop timelapse worker threads, calls `App::rec_export`, calls `Canvas::export_anim_mp4`, and owns mobile/Web save callbacks | Preserve current MP4/timelapse export behavior while video export moves toward app/document/renderer/video/platform/storage services | `pp_app_core_document_export_tests`; `pano_cli plan-export-menu --kind animation-mp4`; `pano_cli plan-export-menu --kind timelapse`; `pano_cli plan-export-target --kind name --doc-name demo --suffix -animation`; `pano_cli plan-export-target --kind name --doc-name demo --suffix -timelapse`; `pano_cli plan-export-message --kind timelapse --destination success`; `pano_cli plan-export-report --kind animation-mp4 --message "video export path must not be empty"`; `ctest --preset desktop-fast --build-config Debug` | Timelapse and animation MP4 execution, desktop worker threading, frame readback/video encoding handoff, and mobile/Web save callbacks are owned by injected app/document/renderer/video/platform/storage services with export dialogs acting only as UI adapters | | DEBT-0045 | Open | Modernization | Options-menu preference execution now consumes pure `pp_app_core` through UI scale, viewport scale, RTL direction, VR mode, VR-controller, auto-timelapse, and canvas cursor-mode callbacks plus `AppPreferenceServices` and `src/legacy_app_preference_services.*`; viewport-density and cursor-mode execution now delegate to `src/legacy_canvas_view_services.*`, but the bridges still call legacy `App::set_ui_scale`, `App::set_ui_rtl`, `App::rec_start`, `App::rec_stop`, retained canvas view mutation, and `Settings::save` directly; VR mode callbacks now call `App` VR wrappers that dispatch to `PlatformServices`, whose desktop runtime policy prefers OpenXR while the actual Windows OpenVR SDK bridge still lives in `WindowsPlatformServices` under DEBT-0061 | Preserve current options-menu behavior while preferences move toward app/UI/platform/storage services | `pp_app_core_app_preferences_tests`; `pp_app_core_canvas_view_tests`; `pano_cli plan-app-preferences --ui-scale 1.5 --display-density 2 --current-scale 1.6 --scale-option 1 --scale-option 1.5 --rtl`; `pano_cli plan-canvas-view-density --density 1.5`; `pano_cli plan-canvas-view-cursor-mode --mode 3`; `ctest --preset desktop-fast --build-config Debug`; `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter` | Preference persistence, UI/layout direction, viewport density, cursor mode, VR mode start/stop/failure handling, VR-controller state, and auto-timelapse recording side effects are owned by injected app/UI/platform/storage services with options-menu callbacks acting only as UI adapters | | DEBT-0046 | Open | Modernization | Startup preference/runtime execution and startup resource sequencing now consume pure `pp_app_core` through `App::init`, `pano_cli plan-app-startup`, `pano_cli plan-app-startup-resources`, `AppStartupServices`, `AppStartupResourceServices`, and `src/legacy_app_startup_services.*`, but the bridge still calls legacy `Settings::set`, `Settings::save`, `App::rec_start`, app VR-controller state mutation, message-box license warning execution, shader loading, asset initialization, layout creation, title updates, and UI render-target creation directly | Preserve current startup behavior while app startup moves toward app/preferences/storage/recording/UI/renderer services | `pp_app_core_app_startup_tests`; `pano_cli plan-app-startup --run-counter 7 --vr-controllers-disabled --license-invalid`; `pano_cli plan-app-startup --run-counter -1`; `pano_cli plan-app-startup-resources --width 1280 --height 720`; `pano_cli plan-app-startup-resources --bad-size`; `ctest --preset desktop-fast --build-config Debug`; `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter` | Startup preference persistence, auto-timelapse startup, stored VR-controller state, license validation/warning, startup resource initialization, title updates, and UI render-target allocation are owned by injected app/preferences/storage/recording/UI/renderer services with `App::init` acting only as orchestration | diff --git a/docs/modernization/roadmap.md b/docs/modernization/roadmap.md index 85e8922..fc6641d 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -699,9 +699,11 @@ PNG equirectangular export now uses the same document/composite payload to generate an equirectangular PNG through `pp_paint_renderer` before the retained fallback. Payload-complete layer and animation-frame PNG collections now use pure `pp_paint_renderer` equirectangular PNG generation plus app-core -collection write/publish execution before retained fallback. JPEG/XMP -equirectangular export, Web handoff, video, and incomplete-readback collection -cases still delegate to retained `Canvas` writers after readiness reporting. +collection write/publish execution before retained fallback. Payload-complete +desktop JPEG equirectangular export now uses the same projection through +`pp_paint_renderer`, `pp_assets` JPEG encoding, and GPano XMP injection before +retained fallback. Web handoff, video, and incomplete-readback collection cases +still delegate to retained `Canvas` writers after readiness reporting. Depth export now also plans the retained image/depth file targets in `pp_app_core` and logs a `pp_paint_renderer` document depth render plan for the legacy 1024x1024 perspective render plus per-layer depth pass before falling @@ -2557,9 +2559,11 @@ Results: collection write/publish executor before retained fallback. Depth export now prepares the same document/canvas snapshot, logs the shared renderer-upload readiness report, and records a tested paint-renderer depth render plan before - retained `Canvas` execution. JPEG/XMP, Web prepared-file handoff, video, and - incomplete-readback collection cases remain on their prior retained writer - paths. Actual broader writer replacement remains tracked under export debt. + retained `Canvas` execution. JPEG equirectangular export now writes a + pure `pp_paint_renderer`/`pp_assets` JPEG with GPano XMP metadata before + retained fallback. Web prepared-file handoff, video, and incomplete-readback + collection cases remain on their prior retained writer paths. Actual broader + writer replacement remains tracked under export debt. - Snapshot creation now rejects invalid embedded RGBA8 face payloads before document export or history can persist malformed state. - Package-smoke wrappers validate the Windows CMake app executable/runtime diff --git a/src/assets/image_pixels.cpp b/src/assets/image_pixels.cpp index a10e42b..5835e53 100644 --- a/src/assets/image_pixels.cpp +++ b/src/assets/image_pixels.cpp @@ -48,6 +48,37 @@ void append_png_bytes(void* context, void* data, int size) bytes->insert(bytes->end(), begin, begin + size); } +void append_encoded_bytes(void* context, void* data, int size) +{ + append_png_bytes(context, data, size); +} + +[[nodiscard]] bool has_jpeg_soi(std::span bytes) noexcept +{ + return bytes.size() >= 2U + && bytes[0] == std::byte { 0xff } + && bytes[1] == std::byte { 0xd8 }; +} + +constexpr char gpano_xmp[] = + "http://ns.adobe.com/xap/1.0/\0" + R"( + + + + equirectangular + True + 0 + 0 + 0 + 0 + 0 + PanoPainter + + + +)"; + } pp::foundation::Result decode_png_rgba8(std::span bytes) @@ -106,6 +137,64 @@ pp::foundation::Result decode_png_rgba8(std::span b return pp::foundation::Result::success(std::move(image)); } +pp::foundation::Result decode_jpeg_rgba8(std::span bytes) +{ + if (!has_jpeg_soi(bytes)) { + return pp::foundation::Result::failure( + pp::foundation::Status::invalid_argument("JPEG signature is invalid")); + } + + if (bytes.size() > static_cast(std::numeric_limits::max())) { + return pp::foundation::Result::failure( + pp::foundation::Status::out_of_range("JPEG payload is too large for the decoder")); + } + + int width = 0; + int height = 0; + int source_components = 0; + auto* decoded = stbi_load_from_memory( + reinterpret_cast(bytes.data()), + static_cast(bytes.size()), + &width, + &height, + &source_components, + 4); + if (decoded == nullptr) { + return pp::foundation::Result::failure( + pp::foundation::Status::invalid_argument("JPEG payload could not be decoded")); + } + + const auto cleanup = [decoded]() noexcept { + stbi_image_free(decoded); + }; + + if (width <= 0 || height <= 0 + || static_cast(width) > max_image_dimension + || static_cast(height) > max_image_dimension) { + cleanup(); + return pp::foundation::Result::failure( + pp::foundation::Status::out_of_range("decoded JPEG dimensions are outside the configured range")); + } + + const auto byte_count = rgba_byte_size( + static_cast(width), + static_cast(height)); + if (!byte_count) { + cleanup(); + return pp::foundation::Result::failure(byte_count.status()); + } + + Rgba8Image image { + .width = static_cast(width), + .height = static_cast(height), + .pixels = {}, + }; + image.pixels.assign(decoded, decoded + byte_count.value()); + cleanup(); + + return pp::foundation::Result::success(std::move(image)); +} + pp::foundation::Result> encode_png_rgba8( std::uint32_t width, std::uint32_t height, @@ -156,4 +245,79 @@ pp::foundation::Result> encode_png_rgba8( return pp::foundation::Result>::success(std::move(encoded)); } +pp::foundation::Result> encode_jpeg_rgba8( + std::uint32_t width, + std::uint32_t height, + std::span pixels, + int quality) +{ + if (width == 0 || height == 0) { + return pp::foundation::Result>::failure( + pp::foundation::Status::invalid_argument("JPEG dimensions must be greater than zero")); + } + + if (width > static_cast(std::numeric_limits::max()) + || height > static_cast(std::numeric_limits::max())) { + return pp::foundation::Result>::failure( + pp::foundation::Status::out_of_range("JPEG dimensions exceed encoder limits")); + } + + if (quality < 1 || quality > 100) { + return pp::foundation::Result>::failure( + pp::foundation::Status::out_of_range("JPEG quality must be within 1..100")); + } + + const auto byte_count = rgba_byte_size(width, height); + if (!byte_count) { + return pp::foundation::Result>::failure(byte_count.status()); + } + + if (pixels.size() != byte_count.value()) { + return pp::foundation::Result>::failure( + pp::foundation::Status::invalid_argument("RGBA pixel payload size does not match dimensions")); + } + + std::vector encoded; + const auto result = stbi_write_jpg_to_func( + append_encoded_bytes, + &encoded, + static_cast(width), + static_cast(height), + 4, + pixels.data(), + quality); + + if (result == 0 || encoded.empty()) { + return pp::foundation::Result>::failure( + pp::foundation::Status::invalid_argument("RGBA pixels could not be encoded as JPEG")); + } + + return pp::foundation::Result>::success(std::move(encoded)); +} + +pp::foundation::Result> inject_gpano_xmp_into_jpeg(std::span jpeg) +{ + if (!has_jpeg_soi(jpeg)) { + return pp::foundation::Result>::failure( + pp::foundation::Status::invalid_argument("JPEG signature is invalid")); + } + + constexpr auto xmp_size = sizeof(gpano_xmp); + static_assert(xmp_size + 2U <= 0xffffU); + const auto segment_length = static_cast(xmp_size + 2U); + + std::vector encoded; + encoded.reserve(jpeg.size() + xmp_size + 4U); + encoded.insert(encoded.end(), jpeg.begin(), jpeg.begin() + 2); + encoded.push_back(std::byte { 0xff }); + encoded.push_back(std::byte { 0xe1 }); + encoded.push_back(static_cast((segment_length >> 8U) & 0xffU)); + encoded.push_back(static_cast(segment_length & 0xffU)); + const auto* xmp_begin = reinterpret_cast(gpano_xmp); + encoded.insert(encoded.end(), xmp_begin, xmp_begin + xmp_size); + encoded.insert(encoded.end(), jpeg.begin() + 2, jpeg.end()); + + return pp::foundation::Result>::success(std::move(encoded)); +} + } diff --git a/src/assets/image_pixels.h b/src/assets/image_pixels.h index cdd3aa0..aaf1c1c 100644 --- a/src/assets/image_pixels.h +++ b/src/assets/image_pixels.h @@ -18,9 +18,21 @@ struct Rgba8Image { [[nodiscard]] pp::foundation::Result decode_png_rgba8( std::span bytes); +[[nodiscard]] pp::foundation::Result decode_jpeg_rgba8( + std::span bytes); + [[nodiscard]] pp::foundation::Result> encode_png_rgba8( std::uint32_t width, std::uint32_t height, std::span pixels); +[[nodiscard]] pp::foundation::Result> encode_jpeg_rgba8( + std::uint32_t width, + std::uint32_t height, + std::span pixels, + int quality); + +[[nodiscard]] pp::foundation::Result> inject_gpano_xmp_into_jpeg( + std::span jpeg); + } diff --git a/src/legacy_document_export_services.cpp b/src/legacy_document_export_services.cpp index f79bb18..8bc01f6 100644 --- a/src/legacy_document_export_services.cpp +++ b/src/legacy_document_export_services.cpp @@ -38,6 +38,40 @@ bool is_png_export_target(std::string_view path) noexcept && (extension[3] == 'g' || extension[3] == 'G'); } +bool ascii_iequals(std::string_view left, std::string_view right) noexcept +{ + if (left.size() != right.size()) { + return false; + } + + for (std::size_t i = 0; i < left.size(); ++i) { + auto lhs = left[i]; + if (lhs >= 'A' && lhs <= 'Z') { + lhs = static_cast(lhs - 'A' + 'a'); + } + auto rhs = right[i]; + if (rhs >= 'A' && rhs <= 'Z') { + rhs = static_cast(rhs - 'A' + 'a'); + } + if (lhs != rhs) { + return false; + } + } + + return true; +} + +bool has_extension(std::string_view path, std::string_view extension) noexcept +{ + return path.size() >= extension.size() + && ascii_iequals(path.substr(path.size() - extension.size()), extension); +} + +bool is_jpeg_export_target(std::string_view path) noexcept +{ + return has_extension(path, ".jpg") || has_extension(path, ".jpeg"); +} + struct LegacyDocumentExportSnapshotReports { pp::app::DocumentCanvasSnapshotResult snapshot; pp::paint_renderer::DocumentFrameFacePngExportResult face_pngs; @@ -270,32 +304,52 @@ pp::foundation::Status export_animation_frames_from_document_snapshot( return pp::app::execute_document_export_collection_write(target, payloads, services); } -pp::foundation::Status export_equirectangular_png_from_document_snapshot( +pp::foundation::Status export_equirectangular_from_document_snapshot( App& app, const pp::app::DocumentExportFileTarget& target, const LegacyDocumentExportSnapshotReports& reports) { - if (!is_png_export_target(target.path)) { + std::span bytes; + pp::paint_renderer::DocumentFrameEquirectangularPngExportResult png_export; + pp::paint_renderer::DocumentFrameEquirectangularJpegExportResult jpeg_export; + + if (is_png_export_target(target.path)) { + auto exported = pp::paint_renderer::export_document_frame_equirectangular_png(reports.face_pngs.composite); + if (!exported) { + return exported.status(); + } + + png_export = std::move(exported.value()); + LOG( + "export-equirectangular document export PNG writer: %ux%u bytes=%llu facePayloads=%zu compositedLayerFaces=%zu", + png_export.equirectangular_extent.width, + png_export.equirectangular_extent.height, + static_cast(png_export.encoded_bytes), + png_export.face_payload_count, + png_export.composited_layer_face_count); + bytes = std::span(png_export.png.data(), png_export.png.size()); + } else if (is_jpeg_export_target(target.path)) { + auto exported = pp::paint_renderer::export_document_frame_equirectangular_jpeg(reports.face_pngs.composite); + if (!exported) { + return exported.status(); + } + + jpeg_export = std::move(exported.value()); + LOG( + "export-equirectangular document export JPEG writer: %ux%u bytes=%llu facePayloads=%zu compositedLayerFaces=%zu xmp=%s", + jpeg_export.equirectangular_extent.width, + jpeg_export.equirectangular_extent.height, + static_cast(jpeg_export.encoded_bytes), + jpeg_export.face_payload_count, + jpeg_export.composited_layer_face_count, + jpeg_export.xmp_injected ? "true" : "false"); + bytes = std::span(jpeg_export.jpeg.data(), jpeg_export.jpeg.size()); + } else { return pp::foundation::Status::invalid_argument( - "document snapshot equirectangular export currently supports PNG targets only"); + "document snapshot equirectangular export currently supports PNG and JPEG targets only"); } - auto exported = pp::paint_renderer::export_document_frame_equirectangular_png(reports.face_pngs.composite); - if (!exported) { - return exported.status(); - } - - auto exported_value = std::move(exported.value()); - LOG( - "export-equirectangular document export PNG writer: %ux%u bytes=%llu facePayloads=%zu compositedLayerFaces=%zu", - exported_value.equirectangular_extent.width, - exported_value.equirectangular_extent.height, - static_cast(exported_value.encoded_bytes), - exported_value.face_payload_count, - exported_value.composited_layer_face_count); - const auto write_status = write_export_binary_file( - target.path, - std::span(exported_value.png.data(), exported_value.png.size())); + const auto write_status = write_export_binary_file(target.path, bytes); if (!write_status.ok()) { return write_status; } @@ -320,10 +374,10 @@ public: { auto* app = &app_; #if !__WEB__ - if (is_png_export_target(target.path)) { + if (is_png_export_target(target.path) || is_jpeg_export_target(target.path)) { const auto prepared = prepare_legacy_document_export_snapshot(app_, "export-equirectangular"); if (prepared) { - const auto exported = export_equirectangular_png_from_document_snapshot(app_, target, prepared.value()); + const auto exported = export_equirectangular_from_document_snapshot(app_, target, prepared.value()); if (exported.ok()) { show_export_success_dialog( app_, diff --git a/src/paint_renderer/compositor.cpp b/src/paint_renderer/compositor.cpp index d1e07ac..48db1b1 100644 --- a/src/paint_renderer/compositor.cpp +++ b/src/paint_renderer/compositor.cpp @@ -271,6 +271,75 @@ void append_rgba8_bytes(std::vector& bytes, std::span pixels; + std::size_t face_payload_count = 0; + std::size_t composited_layer_face_count = 0; +}; + +pp::foundation::Result project_document_frame_equirectangular( + const DocumentFrameCompositeResult& composite) +{ + const auto face_pixel_count = expected_pixel_count(composite.extent); + if (!face_pixel_count) { + return pp::foundation::Result::failure(face_pixel_count.status()); + } + + for (const auto& face : composite.faces) { + if (face.extent.width != composite.extent.width || face.extent.height != composite.extent.height + || face.pixels.size() != face_pixel_count.value()) { + return pp::foundation::Result::failure( + pp::foundation::Status::invalid_argument("document equirectangular export requires complete cube faces")); + } + } + + const auto output_width = static_cast(composite.extent.width) * 4U; + const auto output_height = static_cast(composite.extent.height) * 2U; + if (output_width > std::numeric_limits::max() + || output_height > std::numeric_limits::max()) { + return pp::foundation::Result::failure( + pp::foundation::Status::out_of_range("document equirectangular extent exceeds uint32")); + } + + EquirectangularProjectionResult result; + result.face_extent = composite.extent; + result.equirectangular_extent = pp::renderer::Extent2D { + .width = static_cast(output_width), + .height = static_cast(output_height), + }; + result.face_payload_count = composite.face_payload_count; + result.composited_layer_face_count = composite.composited_layer_face_count; + + const auto output_pixel_count = expected_pixel_count(result.equirectangular_extent); + if (!output_pixel_count) { + return pp::foundation::Result::failure(output_pixel_count.status()); + } + + constexpr auto pi = 3.14159265358979323846F; + constexpr auto two_pi = 6.28318530717958647692F; + result.pixels.assign(output_pixel_count.value(), pp::paint::Rgba {}); + for (std::uint32_t y = 0; y < result.equirectangular_extent.height; ++y) { + const auto v = (static_cast(y) + 0.5F) / static_cast(result.equirectangular_extent.height); + const auto angle_y = (1.0F - v) * pi; + const auto sin_y = std::sin(angle_y); + const auto cos_y = std::cos(angle_y); + for (std::uint32_t x = 0; x < result.equirectangular_extent.width; ++x) { + const auto u = (static_cast(x) + 0.5F) / static_cast(result.equirectangular_extent.width); + const auto angle_x = (1.25F - u) * two_pi; + const auto sample = panopainter_cube_face_sample( + sin_y * std::cos(angle_x), + cos_y, + sin_y * std::sin(angle_x)); + result.pixels[static_cast(y) * result.equirectangular_extent.width + x] = + sample_face_nearest(composite.faces[sample.face_index], sample.s, sample.t); + } + } + + return pp::foundation::Result::success(std::move(result)); +} + } pp::foundation::Status composite_layer( @@ -602,63 +671,19 @@ pp::foundation::Result export_document_frame_f pp::foundation::Result export_document_frame_equirectangular_png(const DocumentFrameCompositeResult& composite) { - const auto face_pixel_count = expected_pixel_count(composite.extent); - if (!face_pixel_count) { - return pp::foundation::Result::failure(face_pixel_count.status()); - } - - for (const auto& face : composite.faces) { - if (face.extent.width != composite.extent.width || face.extent.height != composite.extent.height - || face.pixels.size() != face_pixel_count.value()) { - return pp::foundation::Result::failure( - pp::foundation::Status::invalid_argument("document equirectangular export requires complete cube faces")); - } - } - - const auto output_width = static_cast(composite.extent.width) * 4U; - const auto output_height = static_cast(composite.extent.height) * 2U; - if (output_width > std::numeric_limits::max() - || output_height > std::numeric_limits::max()) { - return pp::foundation::Result::failure( - pp::foundation::Status::out_of_range("document equirectangular extent exceeds uint32")); + auto projection = project_document_frame_equirectangular(composite); + if (!projection) { + return pp::foundation::Result::failure(projection.status()); } DocumentFrameEquirectangularPngExportResult result; - result.face_extent = composite.extent; - result.equirectangular_extent = pp::renderer::Extent2D { - .width = static_cast(output_width), - .height = static_cast(output_height), - }; - result.face_payload_count = composite.face_payload_count; - result.composited_layer_face_count = composite.composited_layer_face_count; - - const auto output_pixel_count = expected_pixel_count(result.equirectangular_extent); - if (!output_pixel_count) { - return pp::foundation::Result::failure(output_pixel_count.status()); - } - - constexpr auto pi = 3.14159265358979323846F; - constexpr auto two_pi = 6.28318530717958647692F; - std::vector output(output_pixel_count.value()); - for (std::uint32_t y = 0; y < result.equirectangular_extent.height; ++y) { - const auto v = (static_cast(y) + 0.5F) / static_cast(result.equirectangular_extent.height); - const auto angle_y = (1.0F - v) * pi; - const auto sin_y = std::sin(angle_y); - const auto cos_y = std::cos(angle_y); - for (std::uint32_t x = 0; x < result.equirectangular_extent.width; ++x) { - const auto u = (static_cast(x) + 0.5F) / static_cast(result.equirectangular_extent.width); - const auto angle_x = (1.25F - u) * two_pi; - const auto sample = panopainter_cube_face_sample( - sin_y * std::cos(angle_x), - cos_y, - sin_y * std::sin(angle_x)); - output[static_cast(y) * result.equirectangular_extent.width + x] = - sample_face_nearest(composite.faces[sample.face_index], sample.s, sample.t); - } - } + result.face_extent = projection.value().face_extent; + result.equirectangular_extent = projection.value().equirectangular_extent; + result.face_payload_count = projection.value().face_payload_count; + result.composited_layer_face_count = projection.value().composited_layer_face_count; std::vector rgba8; - append_rgba8_bytes(rgba8, output); + append_rgba8_bytes(rgba8, projection.value().pixels); auto encoded = pp::assets::encode_png_rgba8( result.equirectangular_extent.width, result.equirectangular_extent.height, @@ -683,6 +708,53 @@ export_document_frame_equirectangular_png(DocumentFrameCompositeRequest request) return export_document_frame_equirectangular_png(composite.value()); } +pp::foundation::Result +export_document_frame_equirectangular_jpeg(const DocumentFrameCompositeResult& composite, int quality) +{ + auto projection = project_document_frame_equirectangular(composite); + if (!projection) { + return pp::foundation::Result::failure(projection.status()); + } + + DocumentFrameEquirectangularJpegExportResult result; + result.face_extent = projection.value().face_extent; + result.equirectangular_extent = projection.value().equirectangular_extent; + result.face_payload_count = projection.value().face_payload_count; + result.composited_layer_face_count = projection.value().composited_layer_face_count; + + std::vector rgba8; + append_rgba8_bytes(rgba8, projection.value().pixels); + auto encoded = pp::assets::encode_jpeg_rgba8( + result.equirectangular_extent.width, + result.equirectangular_extent.height, + rgba8, + quality); + if (!encoded) { + return pp::foundation::Result::failure(encoded.status()); + } + + auto with_xmp = pp::assets::inject_gpano_xmp_into_jpeg(encoded.value()); + if (!with_xmp) { + return pp::foundation::Result::failure(with_xmp.status()); + } + + result.encoded_bytes = static_cast(with_xmp.value().size()); + result.jpeg = std::move(with_xmp.value()); + result.xmp_injected = true; + return pp::foundation::Result::success(std::move(result)); +} + +pp::foundation::Result +export_document_frame_equirectangular_jpeg(DocumentFrameCompositeRequest request, int quality) +{ + auto composite = composite_document_frame(request); + if (!composite) { + return pp::foundation::Result::failure(composite.status()); + } + + return export_document_frame_equirectangular_jpeg(composite.value(), quality); +} + pp::foundation::Result plan_document_depth_export_render( DocumentDepthExportRenderPlanRequest request) noexcept { diff --git a/src/paint_renderer/compositor.h b/src/paint_renderer/compositor.h index 9fb9f88..6e067aa 100644 --- a/src/paint_renderer/compositor.h +++ b/src/paint_renderer/compositor.h @@ -156,6 +156,16 @@ struct DocumentFrameEquirectangularPngExportResult { std::size_t composited_layer_face_count = 0; }; +struct DocumentFrameEquirectangularJpegExportResult { + pp::renderer::Extent2D face_extent {}; + pp::renderer::Extent2D equirectangular_extent {}; + std::vector jpeg; + std::uint64_t encoded_bytes = 0; + std::size_t face_payload_count = 0; + std::size_t composited_layer_face_count = 0; + bool xmp_injected = false; +}; + struct DocumentDepthExportRenderPlanRequest { const pp::document::CanvasDocument* document = nullptr; std::size_t frame_index = 0; @@ -255,6 +265,16 @@ export_document_frame_equirectangular_png(const DocumentFrameCompositeResult& co [[nodiscard]] pp::foundation::Result export_document_frame_equirectangular_png(DocumentFrameCompositeRequest request); +[[nodiscard]] pp::foundation::Result +export_document_frame_equirectangular_jpeg( + const DocumentFrameCompositeResult& composite, + int quality = 100); + +[[nodiscard]] pp::foundation::Result +export_document_frame_equirectangular_jpeg( + DocumentFrameCompositeRequest request, + int quality = 100); + [[nodiscard]] pp::foundation::Result plan_document_depth_export_render( DocumentDepthExportRenderPlanRequest request) noexcept; diff --git a/tests/assets/image_pixels_tests.cpp b/tests/assets/image_pixels_tests.cpp index e181204..0ff8427 100644 --- a/tests/assets/image_pixels_tests.cpp +++ b/tests/assets/image_pixels_tests.cpp @@ -5,10 +5,14 @@ #include #include #include +#include #include using pp::assets::decode_png_rgba8; +using pp::assets::decode_jpeg_rgba8; +using pp::assets::encode_jpeg_rgba8; using pp::assets::encode_png_rgba8; +using pp::assets::inject_gpano_xmp_into_jpeg; using pp::foundation::StatusCode; namespace { @@ -75,6 +79,66 @@ void encodes_rgba8_pixels_to_decodable_png(pp::tests::Harness& h) PP_EXPECT(h, decoded.value().pixels == pixels); } +void encodes_rgba8_pixels_to_decodable_jpeg(pp::tests::Harness& h) +{ + const std::vector pixels { + 255, 0, 0, 255, + 0, 255, 0, 255, + 0, 0, 255, 255, + 255, 255, 255, 255, + }; + + const auto encoded = encode_jpeg_rgba8(2, 2, pixels, 95); + + PP_EXPECT(h, encoded.ok()); + PP_EXPECT(h, encoded.value().size() > 4U); + PP_EXPECT(h, encoded.value()[0] == std::byte { 0xff }); + PP_EXPECT(h, encoded.value()[1] == std::byte { 0xd8 }); + const auto decoded = decode_jpeg_rgba8(encoded.value()); + PP_EXPECT(h, decoded.ok()); + PP_EXPECT(h, decoded.value().width == 2U); + PP_EXPECT(h, decoded.value().height == 2U); + PP_EXPECT(h, decoded.value().pixels.size() == pixels.size()); +} + +void injects_gpano_xmp_into_jpeg(pp::tests::Harness& h) +{ + const std::vector pixels { + 10, 20, 30, 255, + 40, 50, 60, 255, + }; + const auto encoded = encode_jpeg_rgba8(2, 1, pixels, 90); + PP_EXPECT(h, encoded); + if (!encoded) { + return; + } + + const auto with_xmp = inject_gpano_xmp_into_jpeg(encoded.value()); + PP_EXPECT(h, with_xmp); + if (!with_xmp) { + return; + } + + PP_EXPECT(h, with_xmp.value().size() > encoded.value().size()); + PP_EXPECT(h, with_xmp.value()[0] == std::byte { 0xff }); + PP_EXPECT(h, with_xmp.value()[1] == std::byte { 0xd8 }); + PP_EXPECT(h, with_xmp.value()[2] == std::byte { 0xff }); + PP_EXPECT(h, with_xmp.value()[3] == std::byte { 0xe1 }); + + const std::string_view text( + reinterpret_cast(with_xmp.value().data()), + with_xmp.value().size()); + PP_EXPECT(h, text.find("GPano:ProjectionType") != std::string_view::npos); + PP_EXPECT(h, text.find("equirectangular") != std::string_view::npos); + + const auto decoded = decode_jpeg_rgba8(with_xmp.value()); + PP_EXPECT(h, decoded); + if (decoded) { + PP_EXPECT(h, decoded.value().width == 2U); + PP_EXPECT(h, decoded.value().height == 1U); + } +} + void rejects_invalid_png_encode_inputs(pp::tests::Harness& h) { const std::vector pixels { 0, 0, 0, 0 }; @@ -88,6 +152,29 @@ void rejects_invalid_png_encode_inputs(pp::tests::Harness& h) PP_EXPECT(h, wrong_payload_size.status().code == StatusCode::invalid_argument); } +void rejects_invalid_jpeg_inputs(pp::tests::Harness& h) +{ + const std::vector pixels { 0, 0, 0, 255 }; + const std::byte corrupt[] { std::byte { 0x00 }, std::byte { 0x01 } }; + + const auto no_size = encode_jpeg_rgba8(0, 1, pixels, 90); + const auto bad_quality = encode_jpeg_rgba8(1, 1, pixels, 0); + const auto wrong_payload_size = encode_jpeg_rgba8(2, 1, pixels, 90); + const auto corrupt_decode = decode_jpeg_rgba8(corrupt); + const auto corrupt_xmp = inject_gpano_xmp_into_jpeg(corrupt); + + PP_EXPECT(h, !no_size.ok()); + PP_EXPECT(h, no_size.status().code == StatusCode::invalid_argument); + PP_EXPECT(h, !bad_quality.ok()); + PP_EXPECT(h, bad_quality.status().code == StatusCode::out_of_range); + PP_EXPECT(h, !wrong_payload_size.ok()); + PP_EXPECT(h, wrong_payload_size.status().code == StatusCode::invalid_argument); + PP_EXPECT(h, !corrupt_decode.ok()); + PP_EXPECT(h, corrupt_decode.status().code == StatusCode::invalid_argument); + PP_EXPECT(h, !corrupt_xmp.ok()); + PP_EXPECT(h, corrupt_xmp.status().code == StatusCode::invalid_argument); +} + } int main() @@ -96,6 +183,9 @@ int main() harness.run("decodes_png_to_rgba8_pixels", decodes_png_to_rgba8_pixels); harness.run("rejects_corrupt_png_payload", rejects_corrupt_png_payload); harness.run("encodes_rgba8_pixels_to_decodable_png", encodes_rgba8_pixels_to_decodable_png); + harness.run("encodes_rgba8_pixels_to_decodable_jpeg", encodes_rgba8_pixels_to_decodable_jpeg); + harness.run("injects_gpano_xmp_into_jpeg", injects_gpano_xmp_into_jpeg); harness.run("rejects_invalid_png_encode_inputs", rejects_invalid_png_encode_inputs); + harness.run("rejects_invalid_jpeg_inputs", rejects_invalid_jpeg_inputs); return harness.finish(); } diff --git a/tests/paint_renderer/compositor_tests.cpp b/tests/paint_renderer/compositor_tests.cpp index 04806a6..592f207 100644 --- a/tests/paint_renderer/compositor_tests.cpp +++ b/tests/paint_renderer/compositor_tests.cpp @@ -903,6 +903,71 @@ void exports_document_frame_as_equirectangular_png(pp::tests::Harness& h) PP_EXPECT(h, decoded.value().pixels[bottom + 2U] == 255U); } +void exports_document_frame_as_equirectangular_jpeg_with_xmp(pp::tests::Harness& h) +{ + const AnimationFrame root_frames[] { + { .duration_ms = 100, .face_pixels = {} }, + }; + const AnimationFrame layer_frames[] { + { + .duration_ms = 100, + .face_pixels = solid_cube_faces(1, 4, 25, 125, 225, 255), + }, + }; + const DocumentLayerConfig layers[] { + { + .name = "Paint", + .frames = std::span(layer_frames, 1), + }, + }; + const auto document = CanvasDocument::create_from_snapshot(DocumentSnapshotConfig { + .width = 1, + .height = 4, + .layers = std::span(layers, 1), + .frames = std::span(root_frames, 1), + .selection_masks = {}, + }); + PP_EXPECT(h, document); + if (!document) { + return; + } + + const auto exported = pp::paint_renderer::export_document_frame_equirectangular_jpeg( + DocumentFrameCompositeRequest { + .document = &document.value(), + .frame_index = 0, + }, + 90); + + PP_EXPECT(h, exported); + if (!exported) { + return; + } + + PP_EXPECT(h, exported.value().face_extent.width == 1U); + PP_EXPECT(h, exported.value().face_extent.height == 4U); + PP_EXPECT(h, exported.value().equirectangular_extent.width == 4U); + PP_EXPECT(h, exported.value().equirectangular_extent.height == 8U); + PP_EXPECT(h, exported.value().face_payload_count == pp::document::cube_face_count); + PP_EXPECT(h, exported.value().encoded_bytes == exported.value().jpeg.size()); + PP_EXPECT(h, exported.value().xmp_injected); + + const std::string_view text( + reinterpret_cast(exported.value().jpeg.data()), + exported.value().jpeg.size()); + PP_EXPECT(h, text.find("GPano:ProjectionType") != std::string_view::npos); + PP_EXPECT(h, text.find("equirectangular") != std::string_view::npos); + + const auto decoded = pp::assets::decode_jpeg_rgba8(exported.value().jpeg); + PP_EXPECT(h, decoded); + if (!decoded) { + return; + } + + PP_EXPECT(h, decoded.value().width == 4U); + PP_EXPECT(h, decoded.value().height == 8U); +} + void exports_document_layers_as_equirectangular_pngs(pp::tests::Harness& h) { const AnimationFrame root_frames[] { @@ -1121,6 +1186,8 @@ void document_frame_upload_rejects_invalid_requests(pp::tests::Harness& h) DocumentFrameCompositeRequest {}); const auto no_document_equirect = pp::paint_renderer::export_document_frame_equirectangular_png( DocumentFrameCompositeRequest {}); + const auto no_document_jpeg = pp::paint_renderer::export_document_frame_equirectangular_jpeg( + DocumentFrameCompositeRequest {}); const auto no_document_layers = pp::paint_renderer::export_document_layers_equirectangular_pngs( pp::paint_renderer::DocumentLayerEquirectangularPngExportRequest {}); const auto no_document_frames = pp::paint_renderer::export_document_animation_frames_equirectangular_pngs( @@ -1165,6 +1232,12 @@ void document_frame_upload_rejects_invalid_requests(pp::tests::Harness& h) .frame_index = 0, .output_extent = Extent2D {}, }); + const auto bad_jpeg_quality = pp::paint_renderer::export_document_frame_equirectangular_jpeg( + DocumentFrameCompositeRequest { + .document = &document.value(), + .frame_index = 0, + }, + 0); PP_EXPECT(h, !no_document.ok()); PP_EXPECT(h, no_document.status().code == StatusCode::invalid_argument); @@ -1172,6 +1245,8 @@ void document_frame_upload_rejects_invalid_requests(pp::tests::Harness& h) PP_EXPECT(h, no_document_readiness.status().code == StatusCode::invalid_argument); PP_EXPECT(h, !no_document_equirect.ok()); PP_EXPECT(h, no_document_equirect.status().code == StatusCode::invalid_argument); + PP_EXPECT(h, !no_document_jpeg.ok()); + PP_EXPECT(h, no_document_jpeg.status().code == StatusCode::invalid_argument); PP_EXPECT(h, !no_document_layers.ok()); PP_EXPECT(h, no_document_layers.status().code == StatusCode::invalid_argument); PP_EXPECT(h, !no_document_frames.ok()); @@ -1186,6 +1261,8 @@ void document_frame_upload_rejects_invalid_requests(pp::tests::Harness& h) PP_EXPECT(h, bad_frame_depth.status().code == StatusCode::out_of_range); PP_EXPECT(h, !bad_extent_depth.ok()); PP_EXPECT(h, bad_extent_depth.status().code == StatusCode::invalid_argument); + PP_EXPECT(h, !bad_jpeg_quality.ok()); + PP_EXPECT(h, bad_jpeg_quality.status().code == StatusCode::out_of_range); PP_EXPECT(h, device.commands().empty()); } @@ -1538,6 +1615,9 @@ int main() harness.run("exports_document_frame_faces_as_pngs", exports_document_frame_faces_as_pngs); harness.run("prepares_document_frame_export_readiness_report", prepares_document_frame_export_readiness_report); harness.run("exports_document_frame_as_equirectangular_png", exports_document_frame_as_equirectangular_png); + harness.run( + "exports_document_frame_as_equirectangular_jpeg_with_xmp", + exports_document_frame_as_equirectangular_jpeg_with_xmp); harness.run("exports_document_layers_as_equirectangular_pngs", exports_document_layers_as_equirectangular_pngs); harness.run( "exports_document_animation_frames_as_equirectangular_pngs",