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

improving actions history

Browse Source
This commit is contained in:
omigamedev
2019-06-14 18:46:11 +02:00
parent ac47915658
commit c48a6da8a6
14 changed files with 388 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PanoPainter.vcxproj
View File

@@ -314,6 +314,8 @@
<ClCompile Include="src\binary_stream.cpp" /> <ClCompile Include="src\binary_stream.cpp" />
<ClCompile Include="src\brush.cpp" /> <ClCompile Include="src\brush.cpp" />
<ClCompile Include="src\canvas.cpp" /> <ClCompile Include="src\canvas.cpp" />
<ClCompile Include="src\canvas_actions.cpp" />
<ClCompile Include="src\canvas_layer.cpp" />
<ClCompile Include="src\canvas_modes.cpp" /> <ClCompile Include="src\canvas_modes.cpp" />
<ClCompile Include="src\event.cpp" /> <ClCompile Include="src\event.cpp" />
<ClCompile Include="src\font.cpp" /> <ClCompile Include="src\font.cpp" />
@@ -437,6 +439,8 @@
<ClInclude Include="src\binary_stream.h" /> <ClInclude Include="src\binary_stream.h" />
<ClInclude Include="src\brush.h" /> <ClInclude Include="src\brush.h" />
<ClInclude Include="src\canvas.h" /> <ClInclude Include="src\canvas.h" />
<ClInclude Include="src\canvas_actions.h" />
<ClInclude Include="src\canvas_layer.h" />
<ClInclude Include="src\canvas_modes.h" /> <ClInclude Include="src\canvas_modes.h" />
<ClInclude Include="src\event.h" /> <ClInclude Include="src\event.h" />
<ClInclude Include="src\font.h" /> <ClInclude Include="src\font.h" />

12
PanoPainter.vcxproj.filters
View File

@@ -348,6 +348,12 @@
<ClCompile Include="src\settings.cpp"> <ClCompile Include="src\settings.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\canvas_actions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\canvas_layer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\app.h"> <ClInclude Include="src\app.h">
@@ -581,6 +587,12 @@
<ClInclude Include="resource.h"> <ClInclude Include="resource.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\canvas_actions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\canvas_layer.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="PanoPainter.rc"> <ResourceCompile Include="PanoPainter.rc">

2
src/app.cpp
View File

@@ -57,7 +57,7 @@ void App::open_document(std::string path)
title_update(); title_update();
for (auto& i : canvas->m_canvas->m_order) for (auto& i : canvas->m_canvas->m_order)
{ {
auto l = layers->add_layer(canvas->m_canvas->m_layers[i]->m_name.c_str()); auto l = layers->add_layer(canvas->m_canvas->m_layers[i]->m_name.c_str(), false);
l->m_visibility->set_value(canvas->m_canvas->m_layers[i]->m_visible); l->m_visibility->set_value(canvas->m_canvas->m_layers[i]->m_visible);
} }
async_end(); async_end();

2
src/app_cloud.cpp
View File

@@ -170,7 +170,7 @@ void App::cloud_browse()
doc_name = dialog->selected_name; doc_name = dialog->selected_name;
title_update(); title_update();
for (auto& i : canvas->m_canvas->m_order) for (auto& i : canvas->m_canvas->m_order)
layers->add_layer(canvas->m_canvas->m_layers[i]->m_name.c_str()); layers->add_layer(canvas->m_canvas->m_layers[i]->m_name.c_str(), false);
ActionManager::clear(); ActionManager::clear();
m->destroy(); m->destroy();
async_redraw(); async_redraw();

3
src/app_dialogs.cpp
View File

@@ -119,8 +119,7 @@ void App::dialog_newdoc()
canvas->reset_camera(); canvas->reset_camera();
ActionManager::clear(); ActionManager::clear();
canvas->m_canvas->layer_add("Default"); layers->add_layer("Default", false);
layers->add_layer("Default");
canvas->m_canvas->m_unsaved = true; canvas->m_canvas->m_unsaved = true;
canvas->m_canvas->m_newdoc = false; canvas->m_canvas->m_newdoc = false;

9
src/app_layout.cpp
View File

@@ -166,8 +166,8 @@ void App::init_sidebar()
brush_update(); brush_update();
}; };
layers->on_layer_add = [this](Node*) { layers->on_layer_add = [this](Node*, std::unique_ptr<class Layer> layer, int index) {
canvas->m_canvas->layer_add(layers->m_layers.back()->m_label_text.c_str()); canvas->m_canvas->layer_add(layers->m_layers.back()->m_label_text.c_str(), std::move(layer), index);
canvas->m_canvas->m_unsaved = true; canvas->m_canvas->m_unsaved = true;
title_update(); title_update();
}; };
@@ -1162,7 +1162,7 @@ void App::init_menu_layer()
canvas->m_canvas->layer_remove(current_idx_order); canvas->m_canvas->layer_remove(current_idx_order);
layers->clear(); layers->clear();
for (auto& i : canvas->m_canvas->m_order) for (auto& i : canvas->m_canvas->m_order)
layers->add_layer(canvas->m_canvas->m_layers[i]->m_name.c_str()); layers->add_layer(canvas->m_canvas->m_layers[i]->m_name.c_str(), false);
layers->m_current_layer->m_selected = false; layers->m_current_layer->m_selected = false;
layers->m_current_layer = layers->m_layers[current_idx_order - 1]; layers->m_current_layer = layers->m_layers[current_idx_order - 1];
layers->m_current_layer->m_selected = true; layers->m_current_layer->m_selected = true;
@@ -1219,8 +1219,7 @@ void App::initLayout()
init_sidebar(); init_sidebar();
canvas->m_canvas->layer_add("Default"); layers->add_layer("Default", false);
layers->add_layer("Default");
init_toolbar_draw(); init_toolbar_draw();
init_toolbar_main(); init_toolbar_main();

111
src/canvas.cpp
View File

@@ -1223,21 +1223,30 @@ void Canvas::stroke_start(glm::vec3 point, float pressure)
} }
m_show_tmp = true; m_show_tmp = true;
} }
void Canvas::layer_add(std::string name) void Canvas::layer_add(std::string name, std::unique_ptr<Layer> layer /*= nullptr*/, int index /*= 0*/)
{ {
LOG("canvas layer_add %s", name.c_str());
int idx = (int)m_layers.size(); int idx = (int)m_layers.size();
m_layers.push_back(std::make_unique<Layer>()); if (layer)
m_layers.back()->create(m_width, m_height, name); {
m_layers.push_back(std::move(layer));
}
else
{
m_layers.push_back(std::make_unique<Layer>());
m_layers.back()->create(m_width, m_height, name);
}
m_order.push_back(idx); m_order.push_back(idx);
m_current_layer_idx = idx; m_current_layer_idx = idx;
} }
void Canvas::layer_remove(int idx) // m_order index void Canvas::layer_remove(int idx) // m_order index
{ {
LOG("canvas layer_remove %d", idx);
int n = m_order[idx]; int n = m_order[idx];
for (auto& i : m_order) for (auto& i : m_order)
if (i > n) if (i > n)
i--; i--;
m_layers[n]->destroy(); //m_layers[n]->destroy();
m_layers.erase(m_layers.begin() + n); m_layers.erase(m_layers.begin() + n);
m_order.erase(m_order.begin() + idx); m_order.erase(m_order.begin() + idx);
m_current_layer_idx = m_order[std::min<int>((int)m_layers.size() - 1, idx)]; m_current_layer_idx = m_order[std::min<int>((int)m_layers.size() - 1, idx)];
@@ -3158,97 +3167,3 @@ void Layer::resize(int width, int height)
//m_dirty_face[i] = true; //m_dirty_face[i] = true;
} }
} }
///////////////////////////////////////////////////////////////////////////////
void ActionStroke::undo()
{
if (clear_layer)
m_canvas->m_layers[m_layer_idx]->clear({ 0, 0, 0, 0 });
for (int i = 0; i < 6; i++)
{
// empty data
if (!m_image[i])
continue;
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_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];
glm::vec2 box_sz = zw(m_box[i]) - xy(m_box[i]);
if (box_sz.x > 0 && box_sz.y > 0 && box_sz.x <= m_canvas->m_layers[m_layer_idx]->w && box_sz.y <= m_canvas->m_layers[m_layer_idx]->h)
{
m_canvas->m_layers[m_layer_idx]->m_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();
}
else
{
LOG("undo invalid box size (%d, %d)", (int)box_sz.x, (int)box_sz.y);
}
}
m_canvas->draw_merge();
}
size_t ActionStroke::memory()
{
size_t mem = 0;
for (int i = 0; i < 6; i++)
{
glm::ivec2 sz = zw(m_box[i]) - xy(m_box[i]);
mem += sz.x * sz.y * 4 + sizeof(*this);
}
return mem;
}
Action* ActionStroke::get_redo()
{
auto action = new ActionStroke;
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])
continue; // no stroke on this face, skip it
layer->m_rtt[i].bindFramebuffer();
auto box = clear_layer ? glm::ivec4(layer->m_dirty_box[i]) : m_box[i];
// save image before commit
glm::vec2 box_or = xy(box);
glm::vec2 box_sz = zw(box) - xy(box);
if (box_sz.x > 0 && box_sz.y > 0 && box_sz.x <= layer->w && box_sz.y <= layer->h)
{
action->m_image[i] = std::make_unique<uint8_t[]>(box_sz.x * box_sz.y * 4);
glReadPixels(box_or.x, box_or.y, box_sz.x, box_sz.y, GL_RGBA, GL_UNSIGNED_BYTE, action->m_image[i].get());
}
else
{
LOG("create_action invalid box size (%d, %d)", (int)box_sz.x, (int)box_sz.y);
}
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];
layer->m_rtt[i].unbindFramebuffer();
}
// save history
action->m_layer_idx = m_layer_idx;
action->m_canvas = m_canvas;
//action->m_stroke = std::move(m_stroke);
action->clear_layer = false;
return action;
}

102
src/canvas.h
View File

@@ -4,90 +4,13 @@
#include "shader.h" #include "shader.h"
#include "shape.h" #include "shape.h"
#include "brush.h" #include "brush.h"
#include "action.h" #include "canvas_layer.h"
#include "canvas_actions.h"
#include "canvas_modes.h" #include "canvas_modes.h"
#include <stack> #include <stack>
#define CANVAS_RES 1536 #define CANVAS_RES 1536
class LayerFrame
{
};
class Layer
{
public:
Layer() = default;
Layer(const Layer&) = delete;
RTT m_rtt[6];
glm::vec4 m_dirty_box[6] = SIXPLETTE(glm::vec4(0));
bool m_dirty_face[6] = SIXPLETTE(false);
bool m_visible = true;
bool m_alpha_locked = false;
float m_opacity = 1.f;
bool m_hightlight = false;
int m_blend_mode = 0;
std::string m_name;
int w = 0;
int h = 0;
struct Snapshot
{
std::unique_ptr<uint8_t[]> image[6] = SIXPLETTE(0);
glm::vec4 m_dirty_box[6] = SIXPLETTE(glm::vec4(0));
bool m_dirty_face[6] = SIXPLETTE(false);
int width = 0;
int height = 0;
void create(int w, int h)
{
for (int i = 0; i < 6; i++)
{
image[i] = std::make_unique<uint8_t[]>(w*h*4);
std::fill_n(image[i].get(), w*h*4, 0);
}
}
void clear()
{
for (int i = 0; i < 6; i++)
{
m_dirty_face[i] = false;
m_dirty_box[i] = glm::vec4(0);
std::fill_n(image[i].get(), width*height*4, 0);
}
}
void optimize()
{
for (int i = 0; i < 6; i++)
{
if (!m_dirty_face[i] || !image[i])
continue;
auto data = reinterpret_cast<glm::u8vec4*>(image[i].get());
glm::ivec2 bbmin(width, height);
glm::ivec2 bbmax(0);
for (int y = 0; y < height; y++)
{
for (int x = 0; x < width; x++)
{
if (data[x + y * width].a > 0)
{
bbmin = glm::min(bbmin, { x, y });
bbmax = glm::max(bbmax, { x + 1, y + 1 });
}
}
}
//glm::vec2 bbsz = bbmax - bbmin;
}
}
};
void resize(int width, int height);
bool create(int width, int height, std::string name);
void clear(const glm::vec4& c);
Snapshot snapshot();
void restore(const Snapshot& snap);
void destroy();
void optimize();
};
struct PPIThumb struct PPIThumb
{ {
int width = 128; int width = 128;
@@ -241,7 +164,7 @@ public:
bool create(int width, int height); bool create(int width, int height);
void resize(int width, int height); void resize(int width, int height);
void layer_remove(int idx); void layer_remove(int idx);
void layer_add(std::string name); void layer_add(std::string name, std::unique_ptr<Layer> layer = nullptr, int index = 0);
void layer_order(int idx, int pos); void layer_order(int idx, int pos);
void layer_merge(int source_idx, int dest_idx); void layer_merge(int source_idx, int dest_idx);
void stroke_start(glm::vec3 point, float pressure); void stroke_start(glm::vec3 point, float pressure);
@@ -302,22 +225,3 @@ public:
CameraData get_camera(); CameraData get_camera();
void set_camera(const CameraData& c); void set_camera(const CameraData& c);
}; };
class ActionStroke : public Action
{
public:
//std::unique_ptr<Stroke> m_stroke;
std::unique_ptr<uint8_t[]> m_image[6] = SIXPLETTE(nullptr);
glm::ivec4 m_old_box[6] = SIXPLETTE(glm::ivec4(0));
bool m_old_dirty[6] = SIXPLETTE(false);
glm::ivec4 m_box[6] = SIXPLETTE(glm::ivec4(0));
bool clear_layer = false;
int m_layer_idx = 0;
Canvas* m_canvas;
ActionStroke() = default;
virtual ~ActionStroke() = default;
virtual void run() override { }
virtual Action* get_redo() override;
virtual void undo() override;
virtual size_t memory() override;
};

98
src/canvas_actions.cpp Normal file
View File

@@ -0,0 +1,98 @@
#include "pch.h"
#include "log.h"
#include "app.h"
#include "canvas.h"
#include "canvas_actions.h"
#include "node_panel_layer.h"
void ActionStroke::undo()
{
if (clear_layer)
m_canvas->m_layers[m_layer_idx]->clear({ 0, 0, 0, 0 });
for (int i = 0; i < 6; i++)
{
// empty data
if (!m_image[i])
continue;
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_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];
glm::vec2 box_sz = zw(m_box[i]) - xy(m_box[i]);
if (box_sz.x > 0 && box_sz.y > 0 && box_sz.x <= m_canvas->m_layers[m_layer_idx]->w && box_sz.y <= m_canvas->m_layers[m_layer_idx]->h)
{
m_canvas->m_layers[m_layer_idx]->m_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();
}
else
{
LOG("undo invalid box size (%d, %d)", (int)box_sz.x, (int)box_sz.y);
}
}
m_canvas->draw_merge();
}
size_t ActionStroke::memory()
{
size_t mem = 0;
for (int i = 0; i < 6; i++)
{
glm::ivec2 sz = zw(m_box[i]) - xy(m_box[i]);
mem += sz.x * sz.y * 4 + sizeof(*this);
}
return mem;
}
Action* ActionStroke::get_redo()
{
auto action = new ActionStroke;
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])
continue; // no stroke on this face, skip it
layer->m_rtt[i].bindFramebuffer();
auto box = clear_layer ? glm::ivec4(layer->m_dirty_box[i]) : m_box[i];
// save image before commit
glm::vec2 box_or = xy(box);
glm::vec2 box_sz = zw(box) - xy(box);
if (box_sz.x > 0 && box_sz.y > 0 && box_sz.x <= layer->w && box_sz.y <= layer->h)
{
action->m_image[i] = std::make_unique<uint8_t[]>(box_sz.x * box_sz.y * 4);
glReadPixels(box_or.x, box_or.y, box_sz.x, box_sz.y, GL_RGBA, GL_UNSIGNED_BYTE, action->m_image[i].get());
}
else
{
LOG("create_action invalid box size (%d, %d)", (int)box_sz.x, (int)box_sz.y);
}
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];
layer->m_rtt[i].unbindFramebuffer();
}
// save history
action->m_layer_idx = m_layer_idx;
action->m_canvas = m_canvas;
//action->m_stroke = std::move(m_stroke);
action->clear_layer = false;
return action;
}

20
src/canvas_actions.h Normal file
View File

@@ -0,0 +1,20 @@
#pragma once
#include "action.h"
class ActionStroke : public Action
{
public:
//std::unique_ptr<Stroke> m_stroke;
std::unique_ptr<uint8_t[]> m_image[6] = SIXPLETTE(nullptr);
glm::ivec4 m_old_box[6] = SIXPLETTE(glm::ivec4(0));
bool m_old_dirty[6] = SIXPLETTE(false);
glm::ivec4 m_box[6] = SIXPLETTE(glm::ivec4(0));
bool clear_layer = false;
int m_layer_idx = 0;
class Canvas* m_canvas;
virtual ~ActionStroke() = default;
virtual void run() override { }
virtual Action* get_redo() override;
virtual void undo() override;
virtual size_t memory() override;
};

45
src/canvas_layer.cpp Normal file
View File

@@ -0,0 +1,45 @@
#include "pch.h"
#include "canvas_layer.h"
void Layer::Snapshot::create(int w, int h)
{
for (int i = 0; i < 6; i++)
{
image[i] = std::make_unique<uint8_t[]>(w * h * 4);
std::fill_n(image[i].get(), w * h * 4, 0);
}
}
void Layer::Snapshot::clear()
{
for (int i = 0; i < 6; i++)
{
m_dirty_face[i] = false;
m_dirty_box[i] = glm::vec4(0);
std::fill_n(image[i].get(), width * height * 4, 0);
}
}
void Layer::Snapshot::optimize()
{
for (int i = 0; i < 6; i++)
{
if (!m_dirty_face[i] || !image[i])
continue;
auto data = reinterpret_cast<glm::u8vec4*>(image[i].get());
glm::ivec2 bbmin(width, height);
glm::ivec2 bbmax(0);
for (int y = 0; y < height; y++)
{
for (int x = 0; x < width; x++)
{
if (data[x + y * width].a > 0)
{
bbmin = glm::min(bbmin, { x, y });
bbmax = glm::max(bbmax, { x + 1, y + 1 });
}
}
}
//glm::vec2 bbsz = bbmax - bbmin;
}
}

45
src/canvas_layer.h Normal file
View File

@@ -0,0 +1,45 @@
#pragma once
#include "rtt.h"
#include "log.h"
class LayerFrame
{
};
class Layer
{
public:
Layer() = default;
Layer(const Layer&) = delete;
~Layer() { LOG("LAYER AUTO DESTROY"); destroy(); }
RTT m_rtt[6];
glm::vec4 m_dirty_box[6] = SIXPLETTE(glm::vec4(0));
bool m_dirty_face[6] = SIXPLETTE(false);
bool m_visible = true;
bool m_alpha_locked = false;
float m_opacity = 1.f;
bool m_hightlight = false;
int m_blend_mode = 0;
std::string m_name;
int w = 0;
int h = 0;
struct Snapshot
{
std::unique_ptr<uint8_t[]> image[6] = SIXPLETTE(0);
glm::vec4 m_dirty_box[6] = SIXPLETTE(glm::vec4(0));
bool m_dirty_face[6] = SIXPLETTE(false);
int width = 0;
int height = 0;
void create(int w, int h);
void clear();
void optimize();
};
void resize(int width, int height);
bool create(int width, int height, std::string name);
void clear(const glm::vec4& c);
Snapshot snapshot();
void restore(const Snapshot& snap);
void destroy();
void optimize();
};

105
src/node_panel_layer.cpp
View File

@@ -3,6 +3,7 @@
#include "node_panel_layer.h" #include "node_panel_layer.h"
#include "canvas.h" #include "canvas.h"
#include "node_combobox.h" #include "node_combobox.h"
#include "app.h"
Node* NodeLayer::clone_instantiate() const Node* NodeLayer::clone_instantiate() const
{ {
@@ -140,7 +141,7 @@ void NodePanelLayer::init()
btn_add->on_click = [this](Node*) { btn_add->on_click = [this](Node*) {
add_layer(); add_layer();
if (on_layer_add) if (on_layer_add)
on_layer_add(this); on_layer_add(this, nullptr, 0);
if (on_layer_change) if (on_layer_change)
on_layer_change(this, -1, m_layers_container->get_child_index(m_current_layer)); on_layer_change(this, -1, m_layers_container->get_child_index(m_current_layer));
update_attributes(); update_attributes();
@@ -182,10 +183,13 @@ void NodePanelLayer::init()
}; };
} }
NodeLayer* NodePanelLayer::add_layer(const char* name) NodeLayer* NodePanelLayer::add_layer(const char* name, bool add_history /*= true*/, std::unique_ptr<class Layer> layer /*= nullptr*/, int index /*= 0*/)
{ {
NodeLayer* l = new NodeLayer; NodeLayer* l = new NodeLayer;
m_layers_container->add_child(l); if (layer)
m_layers_container->add_child(l, index);
else
m_layers_container->add_child(l);
l->init(); l->init();
l->create(); l->create();
l->loaded(); l->loaded();
@@ -199,7 +203,25 @@ NodeLayer* NodePanelLayer::add_layer(const char* name)
m_current_layer = l; m_current_layer = l;
m_current_layer->m_selected = true; m_current_layer->m_selected = true;
m_layers.push_back(l); m_layers.push_back(l);
update_attributes();
if (add_history)
{
auto a = new ActionLayerAdd;
a->m_panel = this;
a->m_layer_node = l->shared_from_this();
a->m_layer_order = m_layers_container->get_child_index(l);
ActionManager::add(a);
update_attributes();
}
else
{
if (on_layer_add)
on_layer_add(this, std::move(layer), index);
if (on_layer_change)
on_layer_change(this, -1, m_layers_container->get_child_index(m_current_layer));
update_attributes();
}
return l; return l;
} }
@@ -215,16 +237,28 @@ NodeLayer* NodePanelLayer::get_layer_at(int index)
return static_cast<NodeLayer*>(m_layers_container->get_child_at(index)); return static_cast<NodeLayer*>(m_layers_container->get_child_at(index));
} }
void NodePanelLayer::remove_layer(NodeLayer* layer) void NodePanelLayer::remove_layer(NodeLayer* layer, bool add_history /*= true*/)
{ {
auto it = std::find(m_layers.begin(), m_layers.end(), m_current_layer); auto it = std::find(m_layers.begin(), m_layers.end(), m_current_layer);
auto i = m_layers_container->get_child_index(m_current_layer); auto i = m_layers_container->get_child_index(m_current_layer);
int old_idx = i;// (int)std::distance(m_layers.begin(), it); int old_idx = i;// (int)std::distance(m_layers.begin(), it);
auto copy = (*it)->shared_from_this();
m_layers_container->remove_child(m_current_layer); m_layers_container->remove_child(m_current_layer);
m_layers.erase(it); m_layers.erase(it);
i = std::min<int>(i, (int)m_layers.size() - 1); i = std::min<int>(i, (int)m_layers.size() - 1);
m_current_layer = (NodeLayer*)m_layers_container->get_child_at(i); m_current_layer = (NodeLayer*)m_layers_container->get_child_at(i);
m_current_layer->m_selected = true; m_current_layer->m_selected = true;
if (add_history)
{
auto a = new ActionLayerRemove;
a->m_panel = this;
a->m_layer_node = copy;
a->m_layer = std::move(Canvas::I->m_layers[Canvas::I->m_order[old_idx]]);
a->m_layer_order = old_idx;
ActionManager::add(a);
}
if (on_layer_delete) if (on_layer_delete)
on_layer_delete(this, old_idx); on_layer_delete(this, old_idx);
if (on_layer_change) if (on_layer_change)
@@ -307,3 +341,64 @@ kEventResult NodePanelLayer::handle_event(Event* e)
} }
return kEventResult::Available; return kEventResult::Available;
} }
///////////////////////////////////////////////////////////////////////////////
Action* ActionLayerAdd::get_redo()
{
auto a = new ActionLayerRemove;
a->m_panel = m_panel;
a->m_layer_node = m_layer_node;
a->m_layer = std::move(Canvas::I->m_layers[Canvas::I->m_order[m_layer_order]]);
a->m_layer_order = m_layer_order;
return a;
}
void ActionLayerAdd::undo()
{
m_panel->remove_layer((NodeLayer*)m_layer_node.get(), false);
}
size_t ActionLayerAdd::memory()
{
return 0;
}
///////////////////////////////////////////////////////////////////////////////
Action* ActionLayerRemove::get_redo()
{
auto a = new ActionLayerAdd;
a->m_panel = m_panel;
a->m_layer_node = m_layer_node;
a->m_layer_order = m_layer_order;
return a;
}
void ActionLayerRemove::undo()
{
std::string name = m_layer->m_name;
m_panel->add_layer(name.c_str(), false, std::move(m_layer), m_layer_order);
}
size_t ActionLayerRemove::memory()
{
return 0;
}
///////////////////////////////////////////////////////////////////////////////
Action* ActionLayerMove::get_redo()
{
return nullptr;
}
void ActionLayerMove::undo()
{
}
size_t ActionLayerMove::memory()
{
return 0;
}

44
src/node_panel_layer.h
View File

@@ -6,6 +6,7 @@
#include "node_button_custom.h" #include "node_button_custom.h"
#include "node_combobox.h" #include "node_combobox.h"
#include "node_scroll.h" #include "node_scroll.h"
#include "action.h"
class NodeLayer : public NodeBorder class NodeLayer : public NodeBorder
{ {
@@ -49,7 +50,7 @@ public:
std::function<void(Node* target, int idx, int mode)> on_layer_blend_mode_changed; std::function<void(Node* target, int idx, int mode)> on_layer_blend_mode_changed;
std::function<void(Node* target, int index)> on_layer_delete; std::function<void(Node* target, int index)> on_layer_delete;
std::function<void(Node* target, int index)> on_layer_duplicate; std::function<void(Node* target, int index)> on_layer_duplicate;
std::function<void(Node* target)> on_layer_add; std::function<void(Node* target, std::unique_ptr<class Layer> layer, int index)> on_layer_add;
std::function<void(Node* target, int old_idx, int new_idx)> on_layer_order; std::function<void(Node* target, int old_idx, int new_idx)> on_layer_order;
NodeLayer* m_current_layer = nullptr; NodeLayer* m_current_layer = nullptr;
std::vector<NodeLayer*> m_layers; std::vector<NodeLayer*> m_layers;
@@ -61,9 +62,9 @@ public:
virtual void init() override; virtual void init() override;
virtual kEventResult handle_event(Event* e) override; virtual kEventResult handle_event(Event* e) override;
void add_layer(); void add_layer();
NodeLayer* add_layer(const char* name); NodeLayer* add_layer(const char* name, bool add_history = true, std::unique_ptr<class Layer> layer = nullptr, int index = 0);
NodeLayer* get_layer_at(int index); NodeLayer* get_layer_at(int index);
void remove_layer(NodeLayer* layer); void remove_layer(NodeLayer* layer, bool add_history = true);
void handle_layer_opacity(NodeLayer* target, float value); void handle_layer_opacity(NodeLayer* target, float value);
void handle_layer_visibility(NodeLayer* target, bool visible); void handle_layer_visibility(NodeLayer* target, bool visible);
void handle_layer_alpha_lock(NodeLayer* target, bool locked); void handle_layer_alpha_lock(NodeLayer* target, bool locked);
@@ -73,3 +74,40 @@ public:
void clear(); void clear();
void update_attributes(); void update_attributes();
}; };
class ActionLayerAdd : public Action
{
public:
NodePanelLayer* m_panel;
std::shared_ptr<Node> m_layer_node;
int m_layer_order;
virtual void run() override { }
virtual Action* get_redo() override;
virtual void undo() override;
virtual size_t memory() override;
};
class ActionLayerRemove : public Action
{
public:
NodePanelLayer* m_panel;
std::shared_ptr<Node> m_layer_node;
std::unique_ptr<class Layer> m_layer;
int m_layer_order;
virtual void run() override { }
virtual Action* get_redo() override;
virtual void undo() override;
virtual size_t memory() override;
};
class ActionLayerMove : public Action
{
public:
int m_index_old;
int m_index_new;
virtual void run() override { }
virtual Action* get_redo() override;
virtual void undo() override;
virtual size_t memory() override;
};