diff --git a/CMakeLists.txt b/CMakeLists.txt index 625b42a..78041eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,8 +221,38 @@ endif() if(PP_BUILD_APP) if(WIN32) + add_library(pp_legacy_renderer_gl OBJECT + ${PP_LEGACY_RENDERER_GL_SOURCES}) + target_link_libraries(pp_legacy_renderer_gl + PUBLIC + pp_project_options + PRIVATE + pp_renderer_api + pp_project_warnings) + if(TARGET pp_renderer_gl) + target_link_libraries(pp_legacy_renderer_gl PRIVATE pp_renderer_gl) + endif() + target_include_directories(pp_legacy_renderer_gl + PUBLIC + ${PP_LEGACY_INCLUDE_DIRS}) + target_compile_definitions(pp_legacy_renderer_gl + PUBLIC + ENUM_BITFIELDS_NOT_SUPPORTED + UNICODE + _UNICODE + _CRT_SECURE_NO_WARNINGS + _SCL_SECURE_NO_WARNINGS + _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING + _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING + _CONSOLE + WITH_CURL=1) + set_target_properties(pp_legacy_renderer_gl PROPERTIES + VS_GLOBAL_CharacterSet "Unicode") + target_precompile_headers(pp_legacy_renderer_gl PRIVATE src/pch.h) + add_library(pp_legacy_engine STATIC ${PP_LEGACY_ENGINE_SOURCES} + $ ${PP_VENDOR_SOURCES}) target_link_libraries(pp_legacy_engine diff --git a/cmake/PanoPainterSources.cmake b/cmake/PanoPainterSources.cmake index 59d19f6..4ffa297 100644 --- a/cmake/PanoPainterSources.cmake +++ b/cmake/PanoPainterSources.cmake @@ -9,19 +9,22 @@ set(PP_LEGACY_ENGINE_SOURCES src/canvas_actions.cpp src/canvas_layer.cpp src/event.cpp - src/font.cpp src/hmd.cpp src/image.cpp src/log.cpp src/mp4enc.cpp - src/rtt.cpp src/serializer.cpp src/settings.cpp + src/util.cpp + src/wacom.cpp +) + +set(PP_LEGACY_RENDERER_GL_SOURCES + src/font.cpp + src/rtt.cpp src/shader.cpp src/shape.cpp src/texture.cpp - src/util.cpp - src/wacom.cpp ) set(PP_LEGACY_APP_SOURCES diff --git a/docs/modernization/build-inventory.md b/docs/modernization/build-inventory.md index 3be6b46..9f829c9 100644 --- a/docs/modernization/build-inventory.md +++ b/docs/modernization/build-inventory.md @@ -10,7 +10,7 @@ Keep it updated as platform paths move to shared CMake targets. | Platform/Target | Current Entrypoint | Notes | | --- | --- | --- | -| Windows desktop | Root `CMakeLists.txt`, preset `windows-msvc-default`; target preset `windows-vs2026-x64` retained for VS 2026 | Raw `.sln/.vcxproj` files removed on 2026-05-31; local machine currently uses Visual Studio 17 2022; `PanoPainter` now links through `pp_platform_windows` and `panopainter_app`, with Windows/vendor link dependencies owned by the platform shell, runtime payload deployment in `cmake/PanoPainterRuntime.cmake`, legacy rendering/canvas/asset/runtime sources contained by `pp_legacy_engine`, app orchestration/version metadata owned by `panopainter_app`, and app-specific modal/dialog/panel/canvas workflow nodes owned by `pp_panopainter_ui` | +| Windows desktop | Root `CMakeLists.txt`, preset `windows-msvc-default`; target preset `windows-vs2026-x64` retained for VS 2026 | Raw `.sln/.vcxproj` files removed on 2026-05-31; local machine currently uses Visual Studio 17 2022; `PanoPainter` now links through `pp_platform_windows` and `panopainter_app`, with Windows/vendor link dependencies owned by the platform shell, runtime payload deployment in `cmake/PanoPainterRuntime.cmake`, retained OpenGL runtime sources contained by `pp_legacy_renderer_gl` and folded into `pp_legacy_engine`, legacy canvas/asset/runtime sources contained by `pp_legacy_engine`, app orchestration/version metadata owned by `panopainter_app`, and app-specific modal/dialog/panel/canvas workflow nodes owned by `pp_panopainter_ui` | | Windows AppX | `PanoPainterPackage/Package.appxmanifest`, `.wapproj` referenced by solution | Distribution packaging | | macOS | `PanoPainter-OSX/` project files and `Info.plist` | Uses `NSOpenGLView` today | | iOS | `PanoPainter/Info.plist`, related Apple sources | Uses OpenGL ES today | @@ -402,6 +402,10 @@ Known warnings after the current CMake app build: runtime sources for now, so it concentrates existing JPEG, SQLite, Yoga, poly2tri, Wacom, GLM/base64, and legacy canvas/render warnings until those dependencies move to cleaner component or vcpkg ownership. +- `pp_legacy_renderer_gl` is an object-library containment boundary because + the retained OpenGL runtime classes still include legacy app/engine headers + and are still consumed directly by canvas and UI classes. It should become a + normal backend library once those call sites depend on `pp_renderer_api`. - `pp_panopainter_ui` currently surfaces existing legacy `Node`/`Serializer` header and static-analysis warnings while it still depends on `pp_legacy_app`; these should be reduced as the UI core/app UI boundary is diff --git a/docs/modernization/roadmap.md b/docs/modernization/roadmap.md index 379d54b..659aff7 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -147,9 +147,13 @@ option targets exist. The Windows desktop app builds through CMake as `PanoPainter` is only the executable/resource wrapper; Windows and vendor link dependencies now belong to the platform shell target, and Windows runtime payload deployment lives behind `cmake/PanoPainterRuntime.cmake`. -`pp_legacy_engine` now contains the retained legacy rendering, canvas, -asset/file, brush, tablet, video, serialization, and low-level runtime sources -as an interim containment boundary while pure replacement components take over. +`pp_legacy_engine` now contains the retained legacy canvas, asset/file, brush, +tablet, video, serialization, and low-level runtime sources as an interim +containment boundary while pure replacement components take over. +`pp_legacy_renderer_gl` now owns the retained OpenGL runtime implementations +for `Font`, `RTT`, `Shader`, `Shape`, `Texture2D`, `TextureCube`, `Sampler`, +and `TextureManager` as an object-library boundary folded into the retained +engine until the renderer API inversion is complete. `panopainter_app` is now a real static target that owns app orchestration sources, app version metadata, and version-header generation. `pp_panopainter_ui` now owns app-specific modal, dialog, panel, canvas,