Merge pull request #48 from anpawo/feature/text

Feature/text

Author: anpawo

Makefile

@@ -143,12 +143,14 @@ re: fclean
 .PHONY: debug
 debug: fclean
 	$(MAKE) "CXXFLAGS = $(CXXFLAGS) -g3"
+# $(MAKE) "CXXFLAGS = $(CXXFLAGS) -g3" "CPPFLAGS = $(CPPFLAGS) -fsanitize=address" "LDFLAGS = $(LDFLAGS) -fsanitize=address"
 
 
 .PHONY: format
 format:
 	clang-format -i **/*.cpp **/*.hpp
 
-.PHONY: doc
-doc:
+.PHONY: docs
+docs:
+	./vc --generate
 	./docs/readme/generate.sh

README.md

@@ -16,25 +16,26 @@ Below is an example of the last feature added (code) and the result (video).
 from videocode.VideoCode import *
 
 x = 700
-y = 100
+y = 10
 
 # text: Video-Code
-t = text("Video-Code", 3).apply(translate(x, y), repeat(40))
-t[:20].apply(fadeIn())
-t[20:].apply(fadeOut())
+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), repeat(40))
-t[:20].apply(fadeIn())
-t[20:].apply(fadeOut())
+# text: Made by
+t = text("made by", 3).apply(translate(x, y + 80), repeat(24 * 4))
+t[: 24 * 3].apply(fadeIn(LEFT))
 t.add()
+t.keep()
 
 
 # Me
-v = video("video/v.mp4").apply(translate(x, y + 100))
-v[0:20].apply(fadeIn()).add()
-v[20:40].apply(fadeOut()).add()
+v = video("video/v.mp4").apply(translate(x, y + 175))
+v[0:20].apply(fadeIn())
+v.add()
+v.keep()
 ```
 
 <img src="docs/readme/example.gif" style="width: 50%;">
@@ -87,6 +88,8 @@ To add the frames of the __Input__ to the timeline, use the __\<Input\>.add()__
     <summary><code>Patchs</code></summary>
 <br>
 
+- `feature`: keep last frame of input on screen (06/03/25)
+- `rework`: one stack (06/03/25)
 - `transformation`: repeat (03/03/25)
 - `input`: text (03/03/25)
 - `rework`: position of the frames (02/03/25)

docs/readme/02_code.md

@@ -3,23 +3,24 @@
 from videocode.VideoCode import *
 
 x = 700
-y = 100
+y = 10
 
 # text: Video-Code
-t = text("Video-Code", 3).apply(translate(x, y), repeat(40))
-t[:20].apply(fadeIn())
-t[20:].apply(fadeOut())
+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), repeat(40))
-t[:20].apply(fadeIn())
-t[20:].apply(fadeOut())
+# text: Made by
+t = text("made by", 3).apply(translate(x, y + 80), repeat(24 * 4))
+t[: 24 * 3].apply(fadeIn(LEFT))
 t.add()
+t.keep()
 
 
 # Me
-v = video("video/v.mp4").apply(translate(x, y + 100))
-v[0:20].apply(fadeIn()).add()
-v[20:40].apply(fadeOut()).add()
+v = video("video/v.mp4").apply(translate(x, y + 175))
+v[0:20].apply(fadeIn())
+v.add()
+v.keep()
 ```

docs/readme/05_patch_notes.md

@@ -37,6 +37,8 @@
     <summary><code>Patchs</code></summary>
 <br>
 
+- `feature`: keep last frame of input on screen (06/03/25)
+- `rework`: one stack (06/03/25)
 - `transformation`: repeat (03/03/25)
 - `input`: text (03/03/25)
 - `rework`: position of the frames (02/03/25)

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"))); }},