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

Lock stroke mix shell coverage

Browse Source
This commit is contained in:
omigamedev
2026-06-13 19:43:23 +02:00
parent ecc3b3edad
commit 2887d02484
4 changed files with 86 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/canvas.cpp
View File

@@ -386,63 +386,43 @@ void Canvas::stroke_cancel()
m_current_stroke = nullptr;
m_show_tmp = false;
}
static void execute_canvas_stroke_mix_pass(
Canvas& canvas,
const glm::vec2& bb_min,
const glm::vec2& bb_sz,
const std::array<glm::mat4, 6>& plane_transform,
const std::vector<std::shared_ptr<Layer>>& layers,
std::size_t layer_index,
const Stroke* current_stroke)
void Canvas::stroke_draw_mix(const glm::vec2& bb_min, const glm::vec2& bb_sz)
{
auto& current_layer = *layers[layer_index];
gl_state gl;
gl.save();
const auto layer_index = m_current_layer_idx;
auto& current_layer = *m_layers[layer_index];
std::array<glm::mat4, 6> plane_transform {};
std::copy(std::begin(m_plane_transform), std::end(m_plane_transform), plane_transform.begin());
const auto mix_planes = pp::panopainter::plan_legacy_canvas_stroke_mix_pass_planes(
current_layer.m_visible,
current_layer.m_opacity,
glm::scale(glm::vec3(1, -1, 1)) * canvas.m_proj * canvas.m_mv,
glm::scale(glm::vec3(1, -1, 1)) * m_proj * m_mv,
plane_transform,
[&](int plane_index) {
return current_layer.face(plane_index);
});
const auto& b = current_stroke->m_brush;
const auto mix_shell = pp::panopainter::make_legacy_canvas_stroke_mix_pass_shell(
[&] {
canvas.m_mixer.bindFramebuffer();
canvas.apply_canvas_viewport(0, 0, canvas.m_mixer.getWidth(), canvas.m_mixer.getHeight());
canvas.apply_canvas_capability(canvas.depth_test_state(), false);
canvas.apply_canvas_capability(canvas.scissor_test_state(), true);
canvas.apply_canvas_capability(canvas.blend_state(), false);
canvas.apply_canvas_scissor(
m_mixer.bindFramebuffer();
apply_canvas_viewport(0, 0, m_mixer.getWidth(), m_mixer.getHeight());
apply_canvas_capability(depth_test_state(), false);
apply_canvas_capability(scissor_test_state(), true);
apply_canvas_capability(blend_state(), false);
apply_canvas_scissor(
static_cast<std::int32_t>(bb_min.x),
static_cast<std::int32_t>(bb_min.y),
static_cast<std::int32_t>(bb_sz.x),
static_cast<std::int32_t>(bb_sz.y));
},
[&] {
canvas.m_mixer.unbindFramebuffer();
m_mixer.unbindFramebuffer();
});
[[maybe_unused]] const auto mix_result = pp::panopainter::execute_legacy_canvas_stroke_mix_pass_shell(
mix_shell.setup.begin,
mix_shell.setup.end,
mix_shell.request);
(void)mix_planes;
(void)b;
}
void Canvas::stroke_draw_mix(const glm::vec2& bb_min, const glm::vec2& bb_sz)
{
gl_state gl;
gl.save();
std::array<glm::mat4, 6> plane_transform {};
std::copy(std::begin(m_plane_transform), std::end(m_plane_transform), plane_transform.begin());
execute_canvas_stroke_mix_pass(
*this,
bb_min,
bb_sz,
plane_transform,
m_layers,
m_current_layer_idx,
m_current_stroke);
gl.restore();
}