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

fix stroke preview zoom, implement dest pick on ppbr export

Browse Source
This commit is contained in:
omigamedev
2019-09-23 22:31:28 +02:00
parent cfdf428a9b
commit 4806a3e8f6
8 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/node_stroke_preview.cpp
View File

@@ -192,7 +192,7 @@ glm::vec4 NodeStrokePreview::stroke_draw_samples(std::array<vertex_t, 4>& P, Tex
return glm::vec4(tex_pos, tex_pos + tex_sz);
}
std::vector<NodeStrokePreview::StrokeFrame> NodeStrokePreview::stroke_draw_compute(Stroke& stroke) const
std::vector<NodeStrokePreview::StrokeFrame> NodeStrokePreview::stroke_draw_compute(Stroke& stroke, float zoom) const
{
std::vector<StrokeFrame> ret;
StrokeSample prev = stroke.m_prev_sample;
@@ -232,11 +232,11 @@ std::vector<NodeStrokePreview::StrokeFrame> NodeStrokePreview::stroke_draw_compu
glm::vec2 mixer_bb_max(0, 0);
for (int j = 0; j < 4; j++)
{
auto p = (xy(prev.pos) + App::I->zoom * s.scale * off_mix[j] * glm::orientate2(-s.angle));
auto p = (xy(prev.pos) + zoom * s.scale * off_mix[j] * glm::orientate2(-s.angle));
mixer_bb_min = glm::max({ 0, 0 }, glm::min(mixer_bb_min, p));
mixer_bb_max = glm::min(mixer_sz, glm::max(mixer_bb_max, p));
B[j].pos = glm::vec4(xy(s.pos) + App::I->zoom * s.scale * off[j] * glm::orientate2(-s.angle) - glm::vec2(0, 1), 1, 1);
B[j].pos = glm::vec4(xy(s.pos) + zoom * s.scale * off[j] * glm::orientate2(-s.angle) - glm::vec2(0, 1), 1, 1);
B[j].uvs2 = p / mixer_sz;
}
@@ -260,6 +260,8 @@ void NodeStrokePreview::draw_stroke_immediate()
GLfloat cc[4];
glGetIntegerv(GL_VIEWPORT, vp);
glGetFloatv(GL_COLOR_CLEAR_VALUE, cc);
float zoom = root()->m_zoom;
glm::vec2 size = { m_rtt.getWidth(), m_rtt.getHeight() };
glm::mat4 ortho_proj = glm::ortho<float>(0, size.x, 0, size.y, -1, 1);
@@ -315,13 +317,13 @@ void NodeStrokePreview::draw_stroke_immediate()
{
float min_pad = size.x * 0.05f;
float pad = (5.f + glm::max(glm::min(m_stroke.m_max_size, m_brush->m_tip_size) / 2.f, min_pad)) * App::I->zoom;
float pad = (5.f + glm::max(glm::min(m_stroke.m_max_size, m_brush->m_tip_size) / 2.f, min_pad)) * zoom;
if (b->m_tip_size_pressure)
pad = min_pad * App::I->zoom;
pad = min_pad * zoom;
if (!glm::isnan(m_pad_override))
pad = m_pad_override;
float w = m_size.x * App::I->zoom;
float h = m_size.y * App::I->zoom;
float w = m_size.x * zoom;
float h = m_size.y * zoom;
std::vector<glm::vec2> kp = {
{ pad, h / 2.f },
{ w / 2.f, 0 },
@@ -374,7 +376,7 @@ void NodeStrokePreview::draw_stroke_immediate()
dual_brush->m_tip_texture ?
dual_brush->m_tip_texture->bind() :
glBindTexture(GL_TEXTURE_2D, 0);
auto frames_dual = stroke_draw_compute(m_dual_stroke);
auto frames_dual = stroke_draw_compute(m_dual_stroke, zoom);
for (auto& f : frames_dual)
{
ShaderManager::u_vec4(kShaderUniform::Col, { 0, 0, 0, 1 });
@@ -407,7 +409,7 @@ void NodeStrokePreview::draw_stroke_immediate()
glBindTexture(GL_TEXTURE_2D, 0);
glActiveTexture(GL_TEXTURE3);
m_rtt_mixer.bindTexture();
auto frames = stroke_draw_compute(m_stroke);
auto frames = stroke_draw_compute(m_stroke, zoom);
m_rtt.clear();
for (auto& f : frames)
{