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

Route NodeCanvas erase setup through helper

Browse Source
This commit is contained in:
omigamedev
2026-06-13 05:17:10 +02:00
parent b46b2c3184
commit a57d9f18f2
4 changed files with 67 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/legacy_canvas_stroke_erase_services.h Normal file
View File

@@ -0,0 +1,49 @@
#pragma once
#include "shader.h"
#include <functional>
namespace pp::panopainter {
struct LegacyStrokeEraseUniforms {
glm::mat4 mvp { 1.0f };
int texture_slot = 0;
int stroke_texture_slot = 1;
int mask_texture_slot = 2;
bool mask_enabled = false;
};
struct LegacyStrokeEraseShaderExecution {
std::function<void(kShader)> use_shader;
std::function<void(kShaderUniform, int)> set_int;
std::function<void(kShaderUniform, const glm::mat4&)> set_mat4;
};
[[nodiscard]] inline LegacyStrokeEraseShaderExecution legacy_shader_manager_stroke_erase_execution() noexcept
{
return {
.use_shader = [](kShader shader) { ShaderManager::use(shader); },
.set_int = [](kShaderUniform uniform, int value) { ShaderManager::u_int(uniform, value); },
.set_mat4 = [](kShaderUniform uniform, const glm::mat4& value) { ShaderManager::u_mat4(uniform, value); },
};
}
inline void setup_legacy_stroke_erase_shader(
const LegacyStrokeEraseUniforms& uniforms,
const LegacyStrokeEraseShaderExecution& execution) noexcept
{
execution.use_shader(kShader::CompErase);
execution.set_int(kShaderUniform::Tex, uniforms.texture_slot);
execution.set_int(kShaderUniform::TexStroke, uniforms.stroke_texture_slot);
execution.set_int(kShaderUniform::TexMask, uniforms.mask_texture_slot);
execution.set_int(kShaderUniform::Mask, uniforms.mask_enabled);
execution.set_mat4(kShaderUniform::MVP, uniforms.mvp);
}
inline void setup_legacy_stroke_erase_shader(const LegacyStrokeEraseUniforms& uniforms)
{
setup_legacy_stroke_erase_shader(uniforms, legacy_shader_manager_stroke_erase_execution());
}
} // namespace pp::panopainter

15
src/node_canvas.cpp
View File

@@ -14,6 +14,7 @@
#include "node_panel_grid.h"
#include "legacy_canvas_draw_merge_services.h"
#include "legacy_canvas_stroke_composite_services.h"
#include "legacy_canvas_stroke_erase_services.h"
#include "legacy_preference_storage.h"
#include "legacy_ui_gl_dispatch.h"
#include "legacy_ui_overlay_services.h"
@@ -485,14 +486,16 @@ void NodeCanvas::draw()
m_sampler.bind(1);
m_sampler.bind(2);
ShaderManager::use(kShader::CompErase);
ShaderManager::u_int(kShaderUniform::Tex, 0);
ShaderManager::u_int(kShaderUniform::TexStroke, 1);
ShaderManager::u_int(kShaderUniform::TexMask, 2);
//ShaderManager::u_vec2(kShaderUniform::Resolution, zw(m_canvas->m_box) / zoom);
//ShaderManager::u_int(kShaderUniform::Lock, m_canvas->m_layers[layer_index]->m_alpha_locked);
ShaderManager::u_int(kShaderUniform::Mask, m_canvas->m_smask_active);
ShaderManager::u_mat4(kShaderUniform::MVP, plane_mvp_z);
pp::panopainter::setup_legacy_stroke_erase_shader(
pp::panopainter::LegacyStrokeEraseUniforms {
.mvp = plane_mvp_z,
.texture_slot = 0,
.stroke_texture_slot = 1,
.mask_texture_slot = 2,
.mask_enabled = m_canvas->m_smask_active,
});
set_active_texture_unit(1);
m_canvas->m_tmp[plane_index].bindTexture();
set_active_texture_unit(2);