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

remove direct use of rtt and dirty area from the layer

Browse Source
This commit is contained in:
omigamedev
2019-10-15 11:57:39 +02:00
parent 9e93fe48d6
commit 9ccd6ed2f4
12 changed files with 404 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/canvas_actions.cpp
View File

@@ -17,18 +17,18 @@ void ActionStroke::undo()
LOG("undo box %d dirty=%s [%d,%d,%d,%d] to dirty=%s [%d,%d,%d,%d]",
i,
m_canvas->m_layers[m_layer_idx]->m_dirty_face[i] ? "true" : "false",
(int)m_canvas->m_layers[m_layer_idx]->m_dirty_box[i].x,
(int)m_canvas->m_layers[m_layer_idx]->m_dirty_box[i].y,
(int)m_canvas->m_layers[m_layer_idx]->m_dirty_box[i].z,
(int)m_canvas->m_layers[m_layer_idx]->m_dirty_box[i].w,
m_canvas->m_layers[m_layer_idx]->face(i) ? "true" : "false",
(int)m_canvas->m_layers[m_layer_idx]->box(i).x,
(int)m_canvas->m_layers[m_layer_idx]->box(i).y,
(int)m_canvas->m_layers[m_layer_idx]->box(i).z,
(int)m_canvas->m_layers[m_layer_idx]->box(i).w,
m_old_dirty[i] ? "true" : "false",
(int)m_old_box[i].x,
(int)m_old_box[i].y,
(int)m_old_box[i].z,
(int)m_old_box[i].w);
m_canvas->m_layers[m_layer_idx]->m_dirty_box[i] = m_old_box[i];
m_canvas->m_layers[m_layer_idx]->m_dirty_face[i] = m_old_dirty[i];
m_canvas->m_layers[m_layer_idx]->box(i) = m_old_box[i];
m_canvas->m_layers[m_layer_idx]->face(i) = m_old_dirty[i];
glm::vec2 box_sz = zw(m_box[i]) - xy(m_box[i]);
@@ -36,9 +36,9 @@ void ActionStroke::undo()
{
App::I->render_task([&]
{
m_canvas->m_layers[m_layer_idx]->m_rtt[i].bindTexture();
m_canvas->m_layers[m_layer_idx]->rtt(i).bindTexture();
glTexSubImage2D(GL_TEXTURE_2D, 0, (int)m_box[i].x, (int)m_box[i].y, (int)box_sz.x, (int)box_sz.y, GL_RGBA, GL_UNSIGNED_BYTE, m_image[i].get());
m_canvas->m_layers[m_layer_idx]->m_rtt[i].unbindTexture();
m_canvas->m_layers[m_layer_idx]->rtt(i).unbindTexture();
});
}
else
@@ -65,11 +65,11 @@ Action* ActionStroke::get_redo()
auto& layer = m_canvas->m_layers[m_layer_idx];
for (int i = 0; i < 6; i++)
{
if (!layer->m_dirty_face[i] && !m_image[i])
if (!layer->face(i) && !m_image[i])
continue; // no stroke on this face, skip it
auto box = clear_layer ? glm::ivec4(layer->m_dirty_box[i]) : m_box[i];
auto box = clear_layer ? glm::ivec4(layer->box(i)) : m_box[i];
// save image before commit
glm::vec2 box_or = xy(box);
@@ -79,9 +79,9 @@ Action* ActionStroke::get_redo()
action->m_image[i] = std::make_unique<uint8_t[]>(box_sz.x * box_sz.y * 4);
App::I->render_task([&]
{
layer->m_rtt[i].bindFramebuffer();
layer->rtt(i).bindFramebuffer();
glReadPixels(box_or.x, box_or.y, box_sz.x, box_sz.y, GL_RGBA, GL_UNSIGNED_BYTE, action->m_image[i].get());
layer->m_rtt[i].unbindFramebuffer();
layer->rtt(i).unbindFramebuffer();
});
}
else
@@ -90,8 +90,8 @@ Action* ActionStroke::get_redo()
}
action->m_box[i] = box;
action->m_old_box[i] = layer->m_dirty_box[i];
action->m_old_dirty[i] = layer->m_dirty_face[i];
action->m_old_box[i] = layer->box(i);
action->m_old_dirty[i] = layer->face(i);
}
// save history
action->m_layer_idx = m_layer_idx;