feat(text), rework(stack), feat(keeping)

Text Input, display string on the video.

Only one stack instead of Input/Transformation.

Can keep last frame of an Input if asked to.

Author: anpawo

README.md

@@ -19,14 +19,14 @@ x = 700
 y = 10
 
 # text: Video-Code
-t = text("Video-Code", 3).apply(translate(x, y), repeat(40))
-t[:20].apply(fadeIn())
+t = text("Video-Code", 3).apply(translate(x, y), repeat(24 * 4))
+t[: 24 * 3].apply(fadeIn(LEFT))
 t.add()
 t.keep()
 
 # text: Made by
-t = text("made by", 3).apply(translate(x, y + 80), repeat(40))
-t[:20].apply(fadeIn())
+t = text("made by", 3).apply(translate(x, y + 80), repeat(24 * 4))
+t[: 24 * 3].apply(fadeIn(LEFT))
 t.add()
 t.keep()
 

docs/readme/02_code.md

@@ -6,14 +6,14 @@ x = 700
 y = 10
 
 # text: Video-Code
-t = text("Video-Code", 3).apply(translate(x, y), repeat(40))
-t[:20].apply(fadeIn())
+t = text("Video-Code", 3).apply(translate(x, y), repeat(24 * 4))
+t[: 24 * 3].apply(fadeIn(LEFT))
 t.add()
 t.keep()
 
 # text: Made by
-t = text("made by", 3).apply(translate(x, y + 80), repeat(40))
-t[:20].apply(fadeIn())
+t = text("made by", 3).apply(translate(x, y + 80), repeat(24 * 4))
+t[: 24 * 3].apply(fadeIn(LEFT))
 t.add()
 t.keep()
 

docs/readme/example.gif

@@ -24,6 +24,7 @@ class IInput
     ///< Iteration
     virtual std::vector<Frame>::iterator begin() = 0;
     virtual std::vector<Frame>::iterator end() = 0;
+    virtual Frame& back() = 0;
 
     ///< Repeat
     virtual void repeat(size_t n) = 0;

include/input/IInput.hpp

@@ -24,6 +24,7 @@ class Slice final : public ABCCompositeInput
     ///< Iteration
     std::vector<Frame>::iterator begin();
     std::vector<Frame>::iterator end();
+    Frame& back();
 
     ///< Repeat
     void repeat(size_t n);

include/input/composite/Slice.hpp

@@ -26,6 +26,7 @@ class ABCConcreteInput : public IInput
     ///< Iteration
     std::vector<Frame>::iterator begin() final;
     std::vector<Frame>::iterator end() final;
+    Frame& back() final;
 
     ///< Repeat
     void repeat(size_t n) final;

include/input/concrete/ABCConcreteInput.hpp

@@ -18,4 +18,8 @@ class Text final : public ABCConcreteInput
 
     Text(const std::string &text, double fontSize, int fontThickness, const std::vector<int> &color, int font = cv::FONT_HERSHEY_SIMPLEX);
     ~Text() = default;
+
+private:
+
+    const std::string _text;
 };

include/input/concrete/text/Text.hpp

@@ -29,23 +29,20 @@ class Register
     Register() = default;
     ~Register() = default;
 
-    ///< Update instructions
-    void updateInstructions(json::array_t &&newInstructions);
-
-    ///< Run the first instruction not done
-    void runNextInstruction();
+    ///< Create a new `Input`
+    void newInput(const std::string &type, const json::object_t &args);
 
     ///< Access _inputs at `index`
     std::shared_ptr<IInput> operator[](size_t index);
 
+    ///< Remove old `Inputs`
+    void clear();
+
 private:
 
     ///< Variables representing the Inputs currently used in the program
     std::vector<std::shared_ptr<IInput>> _inputs{};
 
-    ///< Instructions to create new Inputs: [[instructionName, {instructionArgs}]]
-    json::array_t _instructions{};
-
     ///< Each instruction
     const std::map<std::string, std::function<void(const json::object_t &)>> _inputFactory{
         {"Image", [this](const json::object_t &args) { _inputs.push_back(std::make_shared<Image>(args.at("filepath"))); }},

include/vm/Register.hpp

@@ -51,7 +51,7 @@ class VideoCode
     void removeLabel(const std::string &index);
 
     ///< Add a frame to the timeline
-    void addFrame(const cv::Mat &mat, const Metadata &meta);
+    void addFrame(const Frame &frame);
     void addFrames(const std::shared_ptr<IInput> input);
 
     ///< Events >///
@@ -111,7 +111,7 @@ class VideoCode
     // clang-format on
 
     ///< Timeline paused
-    bool _paused{true};
+    bool _paused{false};
 
     ///< Timeline running
     bool _running{true};
@@ -120,11 +120,14 @@ class VideoCode
     Register _register{};
 
     ///< Stack containing the transformations to apply to the Inputs
-    json::array_t _actionStack{};
+    json::array_t _stack{};
 
     ///< Window to modify the video in real time
     std::unique_ptr<AppWindow> _app{nullptr};
 
     ///< Output File for the generation
     std::string _outputFile;
+
+    ///< Kept Entities (Prevent them from disappearing)
+    std::vector<int> _keptInputs;
 };

include/vm/VideoCode.hpp

@@ -7,6 +7,7 @@
 
 #include "input/composite/Slice.hpp"
 
+#include <iterator>
 #include <memory>
 
 #include "input/IInput.hpp"
@@ -38,6 +39,12 @@ std::vector<Frame>::iterator Slice::end()
     return _endIt;
 }
 
+Frame& Slice::back()
+{
+    ///< TODO: not sure
+    return *std::prev(_endIt);
+}
+
 void Slice::repeat([[maybe_unused]] size_t n)
 {
     /// TODO: maybe add std::vector<Frame&> instead of iterators so we can duplicate the ref