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

Route canvas mode and preview texture setup through helpers

Browse Source
This commit is contained in:
omigamedev
2026-06-13 05:38:58 +02:00
parent e82bcb6d56
commit 1ae623000a
4 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/canvas_modes.cpp
View File

@@ -8,6 +8,7 @@
#include "canvas.h"
#include "shader.h"
#include "node_canvas.h"
#include "legacy_canvas_draw_merge_services.h"
#include "legacy_canvas_stroke_composite_services.h"
#include "legacy_ui_overlay_services.h"
#include "legacy_ui_gl_dispatch.h"
@@ -1526,9 +1527,10 @@ void CanvasModeTransform::on_Draw(const glm::mat4& ortho, const glm::mat4& proj,
ShaderManager::u_vec4(kShaderUniform::Col, { 0, 1, 1, .1 });
m_shape[i].draw_fill();
ShaderManager::use(kShader::Texture);
ShaderManager::u_int(kShaderUniform::Tex, 0);
ShaderManager::u_mat4(kShaderUniform::MVP, proj * camera * m_xform * m_xform_local);
pp::panopainter::setup_legacy_canvas_draw_merge_texture_shader({
.mvp = proj * camera * m_xform * m_xform_local,
.texture_slot = 0,
});
set_canvas_mode_active_texture_unit(0);
m_tex[i].bind();
Canvas::I->m_sampler_linear.bind(0);
@@ -1754,15 +1756,14 @@ void CanvasModeFloodFill::on_Draw(const glm::mat4& ortho, const glm::mat4& proj,
{
if (m_draw_tip)
{
ShaderManager::use(kShader::Texture);
ShaderManager::u_mat4(kShaderUniform::MVP,
glm::scale(glm::vec3(1, -1, 1))
* ortho
* glm::translate(glm::vec3(Canvas::I->m_cur_pos, 0.f))
* glm::scale(glm::vec3(32, 32, 1))
* glm::translate(glm::vec3(0.5f, -0.5f, 0))
);
ShaderManager::u_int(kShaderUniform::Tex, 0);
pp::panopainter::setup_legacy_canvas_draw_merge_texture_shader({
.mvp = glm::scale(glm::vec3(1, -1, 1))
* ortho
* glm::translate(glm::vec3(Canvas::I->m_cur_pos, 0.f))
* glm::scale(glm::vec3(32, 32, 1))
* glm::translate(glm::vec3(0.5f, -0.5f, 0)),
.texture_slot = 0,
});
auto& t = TextureManager::get(m_cursor_id);

8
src/node_stroke_preview.cpp
View File

@@ -775,9 +775,11 @@ void NodeStrokePreview::draw_stroke()
void NodeStrokePreview::draw()
{
ShaderManager::use(kShader::Texture);
ShaderManager::u_mat4(kShaderUniform::MVP, m_mvp);
ShaderManager::u_int(kShaderUniform::Tex, 0);
pp::panopainter::setup_legacy_canvas_draw_merge_texture_shader(
pp::panopainter::LegacyCanvasDrawMergeTextureUniforms {
.mvp = m_mvp,
.texture_slot = 0,
});
m_tex_preview.bind();
m_sampler_linear.bind(0);
m_plane.draw_fill();