From cdbe2d37b78e47ec25e3c00376de59bd881044ca Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Thu, 10 May 2018 16:34:43 +0200
Subject: [PATCH 1/2] fix merge layers with layer opacity

---
 engine/canvas.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/canvas.cpp b/engine/canvas.cpp
index 742f558..6437d55 100644
--- a/engine/canvas.cpp
+++ b/engine/canvas.cpp
@@ -684,7 +684,7 @@ void ui::Canvas::layer_merge(int source_idx, int dest_idx) // m_layer index
             ui::ShaderManager::use(kShader::CompDraw);
             ui::ShaderManager::u_int(kShaderUniform::Tex, 0); // dest
             ui::ShaderManager::u_int(kShaderUniform::TexStroke, 1); // source
-            ui::ShaderManager::u_float(kShaderUniform::Alpha, 1);
+            ui::ShaderManager::u_float(kShaderUniform::Alpha, m_layers[source_idx].m_opacity);
             ui::ShaderManager::u_int(kShaderUniform::Lock, false);
             ui::ShaderManager::u_int(kShaderUniform::BlendMode, 0); // TODO: defaulted to normal, change to layer blend mode when implemented
             ui::ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-.5f, .5f, -.5f, .5f, -1.f, 1.f));

From 4f55b477da4dfafbbc598358c9111b89cf603d0f Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Thu, 10 May 2018 22:32:34 +0200
Subject: [PATCH 2/2] implement action redo

---
 data/layout.xml       |  1 +
 engine/action.cpp     | 20 ++++++++++++++++++++
 engine/action.h       |  3 +++
 engine/app_layout.cpp |  9 +++++++--
 engine/canvas.cpp     | 29 +++++++++++++++++++++++++++++
 engine/canvas.h       |  6 ++++++
 6 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/data/layout.xml b/data/layout.xml
index c79d017..b9e121c 100644
--- a/data/layout.xml
+++ b/data/layout.xml
@@ -709,6 +709,7 @@
           </button-custom>
         </node>
         <button id="btn-undo" width="50" height="100%" margin="0 5 0 0" text="Undo"/>
+        <button id="btn-redo" width="50" height="100%" margin="0 5 0 0" text="Redo"/>
         <!--
         <button-custom id="btn-layer" width="50" height="100%" margin="0 5 0 0" thickness="1" border-color="0 0 0 1" pad="6" align="center" justify="center">
           <icon width="100%" height="100%" icon="disk"/>
diff --git a/engine/action.cpp b/engine/action.cpp
index bce3942..2461e8d 100644
--- a/engine/action.cpp
+++ b/engine/action.cpp
@@ -7,6 +7,7 @@ ActionManager ActionManager::I;
 
 void ActionManager::add(Action *action)
 {
+    I.m_redos = std::stack<std::unique_ptr<Action>>();
     I.m_actions.emplace(action);
     I.m_memory += action->memory();
     //LOG("History: %.2f KB", I.m_memory / 1024.f);
@@ -15,6 +16,11 @@ void ActionManager::add(Action *action)
 
 void ActionManager::undo()
 {
+    if (I.m_actions.empty())
+        return;
+
+    I.m_redos.emplace(I.m_actions.top()->get_redo());
+
     I.m_actions.top()->undo();
     I.m_memory -= I.m_actions.top()->memory();
     I.m_actions.pop();
@@ -22,6 +28,20 @@ void ActionManager::undo()
     App::I.update_memory_usage(I.m_memory);
 }
 
+void ActionManager::redo()
+{
+    if (I.m_redos.empty())
+        return;
+
+    I.m_actions.emplace(I.m_redos.top()->get_redo());
+    I.m_memory += I.m_actions.top()->memory();
+
+    I.m_redos.top()->undo();
+    I.m_redos.pop();
+    //LOG("History: %.2f KB", I.m_memory / 1024.f);
+    App::I.update_memory_usage(I.m_memory);
+}
+
 void ActionManager::clear()
 {
     while (!I.m_actions.empty())
diff --git a/engine/action.h b/engine/action.h
index b707a72..4057834 100644
--- a/engine/action.h
+++ b/engine/action.h
@@ -5,6 +5,7 @@ class Action
 public:
     virtual void run() = 0;
     virtual void undo() = 0;
+    virtual Action* get_redo() = 0;
     virtual size_t memory() = 0;
     virtual ~Action(){};
 };
@@ -14,9 +15,11 @@ class ActionManager
 public:
     static ActionManager I;
     std::stack<std::unique_ptr<Action>> m_actions;
+    std::stack<std::unique_ptr<Action>> m_redos;
     size_t m_memory = 0;
     static void add(Action* action);
     static void undo();
+    static void redo();
     static void clear();
     static bool empty()
     {
diff --git a/engine/app_layout.cpp b/engine/app_layout.cpp
index 687da64..c569ce5 100644
--- a/engine/app_layout.cpp
+++ b/engine/app_layout.cpp
@@ -55,8 +55,13 @@ void App::init_toolbar_main()
     if (auto* button = layout[main_id]->find<NodeButton>("btn-undo"))
     {
         button->on_click = [this, button](Node*) {
-            if (!ActionManager::empty())
-                ActionManager::undo();
+            ActionManager::undo();
+        };
+    }
+    if (auto* button = layout[main_id]->find<NodeButton>("btn-redo"))
+    {
+        button->on_click = [this, button](Node*) {
+            ActionManager::redo();
         };
     }
     if (auto* button = layout[main_id]->find<NodeButtonCustom>("btn-clean-memory"))
diff --git a/engine/canvas.cpp b/engine/canvas.cpp
index 6437d55..a9447ef 100644
--- a/engine/canvas.cpp
+++ b/engine/canvas.cpp
@@ -160,6 +160,35 @@ void ui::Canvas::snap_history(const std::vector<int>& planes)
     action->clear_layer = true;
     ActionManager::add(action);
 }
+ui::ActionStroke* ui::Canvas::create_action(int layer)
+{
+    auto action = new ActionStroke;
+    for (int i = 0; i < 6; i++)
+    {
+        if (!m_layers[layer].m_dirty_face[i])
+            continue; // no stroke on this face, skip it
+
+        m_layers[layer].m_rtt[i].bindFramebuffer();
+
+        // save image before commit
+        glm::vec2 box_or = xy(m_layers[layer].m_dirty_box[i]);
+        glm::vec2 box_sz = zw(m_layers[layer].m_dirty_box[i]) - xy(m_layers[layer].m_dirty_box[i]);
+        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());
+
+        action->m_box[i] = m_layers[layer].m_dirty_box[i];
+        action->m_old_box[i] = m_layers[layer].m_dirty_box[i];
+        action->m_old_dirty[i] = m_layers[layer].m_dirty_face[i];
+
+        m_layers[layer].m_rtt[i].unbindFramebuffer();
+    }
+    // save history
+    action->m_layer_idx = layer;
+    action->m_canvas = this;
+    action->m_stroke = std::move(m_current_stroke);
+    action->clear_layer = true;
+    return action;
+}
 void ui::Canvas::stroke_end()
 {
     if (!m_current_stroke)
diff --git a/engine/canvas.h b/engine/canvas.h
index 081c25b..b113006 100644
--- a/engine/canvas.h
+++ b/engine/canvas.h
@@ -131,6 +131,7 @@ public:
     void snapshot_save(std::string data_path);
     void snapshot_restore();
     void snap_history(const std::vector<int>& planes);
+    class ActionStroke* create_action(int layer);
     void clear_context();
     void import_equirectangular(std::string file_path);
     void import_equirectangular_thread(std::string file_path);
@@ -174,6 +175,11 @@ public:
     virtual void run() override
     {
         
+    }
+    virtual Action* get_redo()
+    {
+        auto redo = m_canvas->create_action(m_layer_idx);
+        return redo;
     }
     virtual void undo() override
     {