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

Extract Canvas draw_merge layer texture helper

Browse Source
This commit is contained in:
omigamedev
2026-06-13 11:49:40 +02:00
parent ed95b084f0
commit 3f8c25d78b
5 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/canvas.cpp
View File

@@ -1518,19 +1518,28 @@ void Canvas::draw_merge(bool draw_checkerboard, std::array<bool, 6> faces /*= SI
}
else
{
m_cam_fov < 20.f ? m_sampler_nearest.bind(0) : m_sampler.bind(0);
pp::panopainter::setup_legacy_canvas_draw_merge_texture_alpha_shader(
pp::panopainter::execute_legacy_canvas_draw_merge_layer_texture(
pp::panopainter::LegacyCanvasDrawMergeTextureAlphaUniforms {
.mvp = ortho,
.texture_slot = 0,
.alpha = m_layers[layer_index]->m_opacity,
.highlight = m_layers[layer_index]->m_hightlight,
},
pp::panopainter::LegacyCanvasDrawMergeLayerTextureExecution {
.bind_sampler = [&] {
m_cam_fov < 20.f ? m_sampler_nearest.bind(0) : m_sampler.bind(0);
},
.bind_layer_texture = [&] {
set_active_texture_unit(0);
m_layers[layer_index]->rtt(plane_index).bindTexture();
},
.draw = [&] {
m_plane.draw_fill();
},
.unbind_layer_texture = [&] {
m_layers[layer_index]->rtt(plane_index).unbindTexture();
},
});
set_active_texture_unit(0);
m_layers[layer_index]->rtt(plane_index).bindTexture();
m_plane.draw_fill();
m_layers[layer_index]->rtt(plane_index).unbindTexture();
}
if (use_blend)

18
src/legacy_canvas_draw_merge_services.h
View File

@@ -80,6 +80,13 @@ struct LegacyCanvasDrawMergeLayerBlendExecution {
std::function<void()> unbind_merge_texture;
};
struct LegacyCanvasDrawMergeLayerTextureExecution {
std::function<void()> bind_sampler;
std::function<void()> bind_layer_texture;
std::function<void()> draw;
std::function<void()> unbind_layer_texture;
};
struct LegacyCanvasDrawMergeFinalPlaneCompositeUniforms {
LegacyCanvasDrawMergeCheckerboardUniforms checkerboard;
LegacyCanvasDrawMergeTextureUniforms texture;
@@ -273,6 +280,17 @@ inline void execute_legacy_canvas_draw_merge_layer_blend(
execution.unbind_merge_texture();
}
inline void execute_legacy_canvas_draw_merge_layer_texture(
const LegacyCanvasDrawMergeTextureAlphaUniforms& uniforms,
const LegacyCanvasDrawMergeLayerTextureExecution& execution)
{
execution.bind_sampler();
setup_legacy_canvas_draw_merge_texture_alpha_shader(uniforms);
execution.bind_layer_texture();
execution.draw();
execution.unbind_layer_texture();
}
inline void execute_legacy_canvas_draw_merge_final_plane_composite(
const LegacyCanvasDrawMergeFinalPlaneCompositeUniforms& uniforms,
const LegacyCanvasDrawMergeFinalPlaneCompositeExecution& execution)