omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract Canvas draw_merge final plane composite helper

Browse Source
This commit is contained in:
omigamedev
2026-06-13 11:33:56 +02:00
parent 3ec4f25889
commit 67c594129d
5 changed files with 89 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/canvas.cpp
View File

@@ -1581,37 +1581,45 @@ void Canvas::draw_merge(bool draw_checkerboard, std::array<bool, 6> faces /*= SI
}
}
set_active_texture_unit(2);
m_merge_tex.bind();
copy_framebuffer_to_texture_2d(0, 0, 0, 0, m_width, m_height);
// draw the grid behind the layers using a temporary copy
if (use_blend)
{
apply_canvas_capability(blend_state(), true);
//draw the grid
if (draw_checkerboard)
{
pp::panopainter::setup_legacy_canvas_draw_merge_checkerboard_shader(
pp::panopainter::LegacyCanvasDrawMergeCheckerboardUniforms {
pp::panopainter::execute_legacy_canvas_draw_merge_final_plane_composite(
pp::panopainter::LegacyCanvasDrawMergeFinalPlaneCompositeUniforms {
.checkerboard = {
.mvp = ortho,
.colorize = false,
});
m_plane.draw_fill();
}
// draw the layers
m_sampler.bind(0);
set_active_texture_unit(0);
m_merge_tex.bind();
pp::panopainter::setup_legacy_canvas_draw_merge_texture_shader(
pp::panopainter::LegacyCanvasDrawMergeTextureUniforms {
.mvp = ortho,
.texture_slot = 0,
},
.texture = {
.mvp = ortho,
.texture_slot = 0,
},
.draw_checkerboard = draw_checkerboard,
},
pp::panopainter::LegacyCanvasDrawMergeFinalPlaneCompositeExecution {
.bind_merged_texture_copy_target = [&] {
set_active_texture_unit(2);
m_merge_tex.bind();
},
.copy_merged_framebuffer = [&] {
copy_framebuffer_to_texture_2d(0, 0, 0, 0, m_width, m_height);
},
.enable_blend = [&] {
apply_canvas_capability(blend_state(), true);
},
.draw = [&] {
m_plane.draw_fill();
},
.bind_sampler = [&] {
m_sampler.bind(0);
},
.bind_merged_texture = [&] {
set_active_texture_unit(0);
m_merge_tex.bind();
},
.unbind_merged_texture = [&] {
m_merge_tex.unbind();
},
});
m_plane.draw_fill();
m_merge_tex.unbind();
}
m_layers_merge.rtt(plane_index).unbindFramebuffer();

37
src/legacy_canvas_draw_merge_services.h
View File

@@ -80,6 +80,22 @@ struct LegacyCanvasDrawMergeLayerBlendExecution {
std::function<void()> unbind_merge_texture;
};
struct LegacyCanvasDrawMergeFinalPlaneCompositeUniforms {
LegacyCanvasDrawMergeCheckerboardUniforms checkerboard;
LegacyCanvasDrawMergeTextureUniforms texture;
bool draw_checkerboard = false;
};
struct LegacyCanvasDrawMergeFinalPlaneCompositeExecution {
std::function<void()> bind_merged_texture_copy_target;
std::function<void()> copy_merged_framebuffer;
std::function<void()> enable_blend;
std::function<void()> draw;
std::function<void()> bind_sampler;
std::function<void()> bind_merged_texture;
std::function<void()> unbind_merged_texture;
};
[[nodiscard]] inline LegacyCanvasDrawMergeShaderExecution legacy_shader_manager_draw_merge_execution() noexcept
{
return {
@@ -257,4 +273,25 @@ inline void execute_legacy_canvas_draw_merge_layer_blend(
execution.unbind_merge_texture();
}
inline void execute_legacy_canvas_draw_merge_final_plane_composite(
const LegacyCanvasDrawMergeFinalPlaneCompositeUniforms& uniforms,
const LegacyCanvasDrawMergeFinalPlaneCompositeExecution& execution)
{
execution.bind_merged_texture_copy_target();
execution.copy_merged_framebuffer();
execution.enable_blend();
if (uniforms.draw_checkerboard) {
setup_legacy_canvas_draw_merge_checkerboard_shader(uniforms.checkerboard);
execution.draw();
}
execution.bind_sampler();
execution.bind_merged_texture();
setup_legacy_canvas_draw_merge_texture_shader(uniforms.texture);
execution.draw();
execution.unbind_merged_texture();
}
} // namespace pp::panopainter