diff --git a/docs/modernization/build-inventory.md b/docs/modernization/build-inventory.md index b3b1305..0e10d32 100644 --- a/docs/modernization/build-inventory.md +++ b/docs/modernization/build-inventory.md @@ -426,8 +426,10 @@ Known local toolchain state: through `PlatformServices` while retaining the existing Windows OpenVR bridge shape. Canvas mode overlay, mask, and transform paths also consume backend-owned - blend/depth state, active texture units, 2D texture copy targets, and RGBA8 - readback format tokens. + blend/depth state execution, active texture unit dispatch, transform/cut + viewport execution, 2D texture copy targets, and RGBA8 readback format tokens; + the retained canvas-tip pick readback remains direct legacy OpenGL until the + readback boundary is finished under DEBT-0036. `NodeCanvas` panorama UI rendering also consumes backend-owned sampler defaults, viewport/clear-state queries, blend/depth/scissor state, color clear masks, active texture units, fallback 2D texture unbind targets, copy diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index d5dddeb..13608dd 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -53,7 +53,7 @@ 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`, and the `ToolsMenuServices` boundary, and direct command execution is centralized in `src/legacy_app_shell_services.*`; SonarPen availability/startup now routes through `PlatformServices`, but live adapters still construct legacy `NodePanelFloating` panels, mutate legacy panel nodes, clear `CanvasModeGrid`, reset `NodeCanvas` camera state, open legacy shortcuts UI, and rely on the legacy platform adapter for the retained iOS SonarPen bridge | Preserve current Tools menu behavior while UI shell actions move toward app/UI/platform services | `pp_app_core_tools_menu_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`; `ctest --preset desktop-fast --build-config Debug` | Tools panel creation, submenu routing, grid clear, camera reset, shortcuts dialog, and SonarPen dispatch are owned by injected app/UI/platform services with `App::init_menu_tools` acting only as a UI adapter and no legacy Tools 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, 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/message-box dialogs 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 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. 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, and texture bind/unbind 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, and CanvasLayer cube/equirect generation plus frame clears now route blend state, active texture units, viewport execution, color clears, and cube-face framebuffer-to-texture copies through tested `pp_renderer_gl` dispatch adapters, and `NodePanelGrid` live heightmap draw and bake setup now route depth/blend state, depth clears, color-write-mask toggles, active texture selection, and bake viewport execution through tested `pp_renderer_gl` dispatch adapters, but actual live stroke rasterization, dual-brush compositing, pattern feedback math, thumbnail layer compositing, brush-preview compositing, 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`; `ctest --preset desktop-fast --build-config Debug`; `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter` | Live stroke/layer 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. 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, and texture bind/unbind 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, CanvasLayer cube/equirect generation plus frame clears now route blend state, active texture units, viewport execution, color clears, and cube-face framebuffer-to-texture copies through tested `pp_renderer_gl` dispatch adapters, `NodePanelGrid` live heightmap draw and bake setup now route depth/blend state, depth clears, color-write-mask toggles, active texture selection, and bake viewport execution through tested `pp_renderer_gl` dispatch adapters, and retained CanvasMode overlay/mask/transform paths now route active texture, depth/blend state, and transform/cut viewport execution through tested `pp_renderer_gl` dispatch adapters while the retained canvas-tip pick readback remains direct legacy OpenGL, but actual live stroke rasterization, dual-brush compositing, pattern feedback math, thumbnail layer compositing, brush-preview compositing, 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`; `ctest --preset desktop-fast --build-config Debug`; `cmake --build --preset windows-msvc-default --config Debug --target PanoPainter` | Live stroke/layer 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 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.*`, 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 UI, 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-clears-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 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`, and the `CloudServices` boundary; live execution is centralized in `src/legacy_cloud_services.*`, the app-owned `upload`/`download`/license curl helpers now ask `PlatformServices` for the Android TLS-verification bypass policy, 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, progress/message UI, 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`; `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 | diff --git a/docs/modernization/roadmap.md b/docs/modernization/roadmap.md index f6afd0d..54288b9 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -2020,9 +2020,11 @@ Results: Eye framebuffer viewport execution in the retained HMD path also routes through tested `pp_renderer_gl` viewport dispatch. - Canvas mode overlay, mask, and transform paths now route generic OpenGL - blend/depth state, active texture units, 2D framebuffer-to-texture copy - dispatch, RGBA8 readback formats, and RTT-backed transform history region - readbacks through the renderer GL backend mapping. + blend/depth state execution, active texture unit switches, transform/cut + viewport execution, 2D framebuffer-to-texture copy dispatch, RGBA8 readback + formats, and RTT-backed transform history region readbacks through the + renderer GL backend mapping. The retained canvas-tip pick readback remains + direct legacy OpenGL until the readback boundary is finished under DEBT-0036. - `NodeCanvas` panorama UI rendering now routes sampler defaults, saved viewport/clear/blend/depth/scissor state, color clears, active texture units, fallback 2D texture unbinds, 2D framebuffer-to-texture copy dispatch, and diff --git a/src/canvas_modes.cpp b/src/canvas_modes.cpp index 70075b2..a58c0ff 100644 --- a/src/canvas_modes.cpp +++ b/src/canvas_modes.cpp @@ -16,9 +16,64 @@ NodeCanvas* CanvasMode::node; namespace { -void set_active_texture_unit(std::uint32_t unit_index) +void set_opengl_active_texture(std::uint32_t texture_unit) noexcept { - glActiveTexture(pp::renderer::gl::active_texture_unit(unit_index)); + glActiveTexture(static_cast(texture_unit)); +} + +void enable_opengl_state(std::uint32_t state) noexcept +{ + glEnable(static_cast(state)); +} + +void disable_opengl_state(std::uint32_t state) noexcept +{ + glDisable(static_cast(state)); +} + +void set_opengl_viewport(std::int32_t x, std::int32_t y, std::int32_t width, std::int32_t height) noexcept +{ + glViewport(static_cast(x), static_cast(y), static_cast(width), static_cast(height)); +} + +void set_canvas_mode_active_texture_unit(std::uint32_t unit_index) +{ + const auto status = pp::renderer::gl::activate_opengl_texture_unit( + unit_index, + pp::renderer::gl::OpenGlActiveTextureDispatch { + .active_texture = set_opengl_active_texture, + }); + if (!status.ok()) + LOG("Canvas mode active texture dispatch failed because: %s", status.message); +} + +void apply_canvas_mode_capability(std::uint32_t state, bool enabled) +{ + const auto status = pp::renderer::gl::apply_opengl_capability( + state, + enabled, + pp::renderer::gl::OpenGlCapabilityDispatch { + .enable = enable_opengl_state, + .disable = disable_opengl_state, + }); + if (!status.ok()) + LOG("Canvas mode capability dispatch failed because: %s", status.message); +} + +void apply_canvas_mode_viewport(std::int32_t x, std::int32_t y, std::int32_t width, std::int32_t height) +{ + const auto status = pp::renderer::gl::apply_opengl_viewport( + pp::renderer::gl::OpenGlViewportRect { + .x = x, + .y = y, + .width = width, + .height = height, + }, + pp::renderer::gl::OpenGlViewportDispatch { + .viewport = set_opengl_viewport, + }); + if (!status.ok()) + LOG("Canvas mode viewport dispatch failed because: %s", status.message); } } @@ -312,14 +367,14 @@ void CanvasModePen::on_Draw(const glm::mat4& ortho, const glm::mat4& proj, const glm::scale(glm::vec3(tip_scale, 1)) ); bool blend = glIsEnabled(pp::renderer::gl::blend_state()); - glEnable(pp::renderer::gl::blend_state()); - set_active_texture_unit(0); + apply_canvas_mode_capability(pp::renderer::gl::blend_state(), true); + set_canvas_mode_active_texture_unit(0); auto& tex = *brush->m_tip_texture; tex.bind(); Canvas::I->m_sampler_brush.bind(0); Canvas::I->m_plane.draw_fill(); tex.unbind(); - if (!blend) glDisable(pp::renderer::gl::blend_state()); + if (!blend) apply_canvas_mode_capability(pp::renderer::gl::blend_state(), false); } } @@ -414,14 +469,14 @@ void CanvasModeLine::on_Draw(const glm::mat4& ortho, const glm::mat4& proj, cons glm::scale(glm::vec3(tip_scale, 1)) ); bool blend = glIsEnabled(pp::renderer::gl::blend_state()); - glEnable(pp::renderer::gl::blend_state()); - set_active_texture_unit(0); + apply_canvas_mode_capability(pp::renderer::gl::blend_state(), true); + set_canvas_mode_active_texture_unit(0); auto& tex = *brush->m_tip_texture; tex.bind(); Canvas::I->m_sampler_brush.bind(0); Canvas::I->m_plane.draw_fill(); tex.unbind(); - if (!blend) glDisable(pp::renderer::gl::blend_state()); + if (!blend) apply_canvas_mode_capability(pp::renderer::gl::blend_state(), false); } } @@ -709,7 +764,7 @@ void CanvasModeMaskFree::on_MouseEvent(MouseEvent* me, glm::vec2& loc) //m_points2d = poly_intersect(poly_remove_duplicate(m_points2d), Canvas::I->face_to_shape2D(0)); auto drawer = [this](const glm::mat4& camera, const glm::mat4& proj) { // blending state intentionally left unchanged here. - glDisable(pp::renderer::gl::depth_test_state()); + apply_canvas_mode_capability(pp::renderer::gl::depth_test_state(), false); ShaderManager::use(kShader::Color); ShaderManager::u_mat4(kShaderUniform::MVP, proj * camera); ShaderManager::u_vec4(kShaderUniform::Col, @@ -788,7 +843,7 @@ void CanvasModeMaskFree::on_MouseEvent(MouseEvent* me, glm::vec2& loc) void CanvasModeMaskFree::on_Draw(const glm::mat4& ortho, const glm::mat4& proj, const glm::mat4& camera) { bool depth = glIsEnabled(pp::renderer::gl::depth_test_state()); - glDisable(pp::renderer::gl::depth_test_state()); + apply_canvas_mode_capability(pp::renderer::gl::depth_test_state(), false); if (m_points.size() > 3) { if (m_dragging) @@ -807,7 +862,7 @@ void CanvasModeMaskFree::on_Draw(const glm::mat4& ortho, const glm::mat4& proj, // m_shape.draw_stroke(); //} } - if (depth) glEnable(pp::renderer::gl::depth_test_state()); + if (depth) apply_canvas_mode_capability(pp::renderer::gl::depth_test_state(), true); } @@ -1316,10 +1371,10 @@ void CanvasModeTransform::enter(kCanvasMode prev) App::I->render_task([&] { - glViewport(0, 0, layer->w, layer->h); - glDisable(pp::renderer::gl::depth_test_state()); - glDisable(pp::renderer::gl::blend_state()); - set_active_texture_unit(0); + apply_canvas_mode_viewport(0, 0, layer->w, layer->h); + apply_canvas_mode_capability(pp::renderer::gl::depth_test_state(), false); + apply_canvas_mode_capability(pp::renderer::gl::blend_state(), false); + set_canvas_mode_active_texture_unit(0); ShaderManager::use(kShader::Color); ShaderManager::u_mat4(kShaderUniform::MVP, mvp); ShaderManager::u_vec4(kShaderUniform::Col, { 0, 0, 0, 0 }); @@ -1422,10 +1477,10 @@ void CanvasModeTransform::leave(kCanvasMode next) { layer->rtt(i).bindFramebuffer(); - glDisable(pp::renderer::gl::depth_test_state()); - glDisable(pp::renderer::gl::blend_state()); - set_active_texture_unit(0); - glViewport(0, 0, layer->rtt(i).getWidth(), layer->rtt(i).getHeight()); + apply_canvas_mode_capability(pp::renderer::gl::depth_test_state(), false); + apply_canvas_mode_capability(pp::renderer::gl::blend_state(), false); + set_canvas_mode_active_texture_unit(0); + apply_canvas_mode_viewport(0, 0, layer->rtt(i).getWidth(), layer->rtt(i).getHeight()); // save fb content for history layer->rtt(i).readPixelsRgba8( @@ -1435,7 +1490,7 @@ void CanvasModeTransform::leave(kCanvasMode next) static_cast(bb_sz.y), action->m_image[i].get()); // copy fb content to texture for blending - set_active_texture_unit(0); + set_canvas_mode_active_texture_unit(0); Canvas::I->m_tex2[i].bind(); copy_framebuffer_to_texture_2d( static_cast(bb_min.x), @@ -1445,7 +1500,7 @@ void CanvasModeTransform::leave(kCanvasMode next) static_cast(bb_sz.x), static_cast(bb_sz.y)); // slot for m_tex - set_active_texture_unit(1); + set_canvas_mode_active_texture_unit(1); for (int j = 0; j < 6; j++) { ShaderManager::use(kShader::CompDraw); @@ -1483,9 +1538,9 @@ void CanvasModeTransform::leave(kCanvasMode next) void CanvasModeTransform::on_Draw(const glm::mat4& ortho, const glm::mat4& proj, const glm::mat4& camera) { bool depth = glIsEnabled(pp::renderer::gl::depth_test_state()); - glDisable(pp::renderer::gl::depth_test_state()); + apply_canvas_mode_capability(pp::renderer::gl::depth_test_state(), false); - glEnable(pp::renderer::gl::blend_state()); + apply_canvas_mode_capability(pp::renderer::gl::blend_state(), true); for (int i = 0; i < 6; i++) { ShaderManager::use(kShader::Color); @@ -1496,7 +1551,7 @@ void CanvasModeTransform::on_Draw(const glm::mat4& ortho, const glm::mat4& proj, ShaderManager::use(kShader::Texture); ShaderManager::u_int(kShaderUniform::Tex, 0); ShaderManager::u_mat4(kShaderUniform::MVP, proj * camera * m_xform * m_xform_local); - set_active_texture_unit(0); + set_canvas_mode_active_texture_unit(0); m_tex[i].bind(); Canvas::I->m_sampler_linear.bind(0); m_shape[i].draw_fill(); @@ -1525,7 +1580,7 @@ void CanvasModeTransform::on_Draw(const glm::mat4& ortho, const glm::mat4& proj, m_circle.draw_stroke(); } - if (depth) glEnable(pp::renderer::gl::depth_test_state()); + if (depth) apply_canvas_mode_capability(pp::renderer::gl::depth_test_state(), true); } void CanvasModeTransform::on_MouseEvent(MouseEvent* me, glm::vec2& loc)