Merge pull request #33 from anpawo/rework/input

Rework/input #31

Author: anpawo

.clang-format

@@ -32,17 +32,16 @@ BreakBeforeBraces: Custom
 BraceWrapping:
     AfterNamespace: true
     AfterCaseLabel: false
-    AfterClass: false
-    AfterControlStatement: Never
+    AfterClass: true
+    AfterControlStatement: true
     AfterEnum: false
     AfterFunction: true
-    # BeforeNamespace: true
     AfterObjCDeclaration: false
     AfterStruct: false
     AfterUnion: false
     AfterExternBlock: false
     BeforeCatch: false
-    BeforeElse: false
+    BeforeElse: true
     BeforeLambdaBody: false
     BeforeWhile: false
     IndentBraces: false
@@ -106,7 +105,7 @@ IndentAccessModifiers: false
 IndentCaseLabels: true
 IndentCaseBlocks: false
 IndentGotoLabels: true
-IndentPPDirectives: None
+IndentPPDirectives: BeforeHash
 IndentExternBlock: AfterExternBlock
 IndentRequires: false
 IndentWidth: 4 # indent width

Makefile

@@ -27,7 +27,7 @@ QT_MACRO_DEF	=	-DQT_NO_DEBUG		\
 					-DQT_GUI_LIB		\
 					-DQT_CORE_LIB		\
 					-DQT_NO_KEYWORDS	\
-# Fix Python Conflict (btw this comment made the build fail when placed above)
+# Fix Python Conflict
 
 CXX				?=	g++
 
@@ -67,23 +67,25 @@ LDFLAGS			+=	$(OPENCV_LIB)		\
 
 LFLAGS			=	-O1 -Wl,-rpath-link,/usr/lib64
 
-SRC				=	$(SRC_MAIN)			\
-					$(SRC_VM)			\
-					$(SRC_INPUT)		\
+SRC				=	$(SRC_MAIN)				\
+					$(SRC_VM)				\
+					$(SRC_INPUT)			\
+					$(SRC_TRANSFORM)	\
 
 
 SRC_MAIN		=	src/Main.cpp
 
 SRC_VM			=	src/vm/LiveWindow.cpp	\
 					src/vm/WindowEvent.cpp	\
+					src/vm/Register.cpp		\
 
 
-SRC_INPUT		=	src/input/_AInput.cpp	\
+SRC_INPUT		=	src/input/ABCInput.cpp	\
 					src/input/Image.cpp		\
 					src/input/Video.cpp		\
-					src/input/List.cpp		\
-					src/input/Slice.cpp		\
-					src/input/Copy.cpp		\
+
+SRC_TRANSFORM	=	src/transformation/position/translate.cpp	\
+					src/transformation/other/overlay.cpp		\
 
 
 OBJ				=	$(SRC:.cpp=.o)

frontend/Global.py

@@ -2,8 +2,8 @@
 
 
 type Arguments = list[int | float | str | Arguments]
-type Variable = list[tuple[str, Arguments]]
-type Stack = list[tuple[str, int, Arguments]]
+type RequiredInputs = list[tuple[str, Arguments]]
+type TransformationStack = list[tuple[str, int, Arguments]]
 
 
 class Global:
@@ -12,13 +12,13 @@ class Global:
     """
 
     # Input Variables declared in a scene.
-    variable: Variable = []
+    requiredInputs: RequiredInputs = []
 
     # Represents the steps of the scene.
-    stack: Stack = []
+    transformationStack: TransformationStack = []
 
     def __str__(self) -> str:
-        return f"\nvariable={self.variable};\n\nstack={self.stack};\n"
+        return f"\nRequiredInputs={self.requiredInputs};\n\nTransformations={self.transformationStack};\n"
 
     def __repr__(self) -> str:
         return str(self)

frontend/Serialize.py

@@ -50,12 +50,12 @@ def serializeScene(filepath: str) -> str:
     # Serialize the instructions to JSON
     return json.dumps(
         {
-            "variable": g.variable,
-            "stack": g.stack,
+            "requiredInputs": g.requiredInputs,
+            "transformationStack": g.transformationStack,
         }
     )
 
 
 if __name__ == "__main__":
     for k, v in json.loads(serializeScene("video.py")).items():
-        print(f"{k:<12}{v}")
+        print(f"{k:<20}{v}")

frontend/__init__.py

@@ -5,8 +5,7 @@
 import copy
 from typing import Any, Self, overload
 
-from frontend.transformation._Transformation import Transformation
-from frontend.Constant import uint
+from frontend.transformation.Transformation import Transformation
 from frontend.Global import *
 
 
@@ -29,7 +28,7 @@ def shape() -> Input: ...
 
     def __new__(cls, *args, **kwargs) -> Self:
         instance = super().__new__(cls)
-        instance.index = len(Global.variable)
+        instance.index = len(Global.requiredInputs)
         return instance
 
     @abstractmethod
@@ -39,63 +38,36 @@ def add(self) -> None:
         """
         Appends the `frames` of `self` to the `timeline`.
         """
-        Global.stack.append(("Add", self.index, []))
+        Global.transformationStack.append(("Add", self.index, []))
 
     def apply(self, *ts: Transformation) -> Input:
         """
         Applies the `Transformations` `ts` to all the `frames` of `self`.
         """
         for t in ts:
-            Global.stack.append(("Apply", self.index, [t.__class__.__name__, t.attributes()]))
-        return self
-
-    def repeat(self, n: uint) -> Input:
-        """
-        Creates a `new` `Input` made of `n` times `self`.
-        """
-        Global.stack.append(("Repeat", self.index, [n]))
+            Global.transformationStack.append(("Apply", self.index, [t.__class__.__name__, t.attributes()]))
         return self
 
     def copy(self) -> Input:
         """
         Creates a `copy` of `self`.
         """
         cp = copy.deepcopy(self)
-        cp.index = len(Global.variable)
-        Global.variable.append(Global.variable[self.index])
-        Global.stack.append(("Copy", self.index, []))
+        cp.index = len(Global.requiredInputs)
+        Global.requiredInputs.append(("Copy", [self.index]))
         return cp
 
-    def concat(self, i: Input) -> Input:
-        """
-        Concatenates `i` after `self`.
-        """
-        Global.stack.append(("Concat", self.index, [i.index]))
-        return self
-
-    def merge(self, i: Input) -> Input:
-        """
-        Merges with `i`.
-
-        Each `Input` will have the same ratio on the result.
-        """
-        Global.stack.append(("Merge", self.index, [i.index]))
-        return self
-
-    def overlay(self, i: Input) -> Input:
-        """
-        Overlays `i` on top of `self`.
-
-        `i` has a ratio priority over `self`.
-        """
-        Global.stack.append(("Overlay", self.index, [i.index]))
-        return self
-
     def __getitem__(self, i: int | slice[int, int, None]) -> Slice:
         """
         Creates a `reference` of the `frames` `s`.
 
         Usefull if you want to apply a `Transformation` to a part of a video.
+
+        Examples
+        --------
+        >>> v = video("test.mp4")
+        >>> v[0:20].fade() # Fade-in during the first 20 frames.
+        >>> v.add()
         """
         if isinstance(i, int):
             s = slice(i, i)
@@ -108,8 +80,7 @@ def __getitem__(self, i: int | slice[int, int, None]) -> Slice:
             s = slice(start, stop)
 
         temp = Slice(self, s)
-        Global.variable.append(("Slice", [self.index, s.start, s.stop]))
-        Global.stack.append(("Slice", self.index, [s.start, s.stop]))
+        Global.requiredInputs.append(("Slice", [self.index, s.start, s.stop]))
         return temp
 
 

frontend/input/_Input.py frontend/input/Input.pyfrontend/input/_Input.py renamed to frontend/input/Input.py

@@ -4,7 +4,7 @@
 # All Inputs Types
 #
 
-from frontend.input._Input import *
+from frontend.input.Input import *
 
 # External Inputs
 from frontend.input.media.Image import *

frontend/input/_AllInput.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 
 
-from frontend.input._Input import *
+from frontend.input.Input import *
 
 
 class image(Input):
     def __init__(self, filepath: str) -> None:
-        Global.variable.append(("Image", [filepath]))
+        Global.requiredInputs.append(("Image", [filepath]))

frontend/input/media/Image.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 
 
-from frontend.input._Input import *
+from frontend.input.Input import *
 
 
 class video(Input):
     def __init__(self, filepath: str) -> None:
-        Global.variable.append(("Video", [filepath]))
+        Global.requiredInputs.append(("Video", [filepath]))

frontend/input/media/Video.py

@@ -6,4 +6,4 @@
 
 class circle(Shape):
     def __init__(self, radius: int) -> None:
-        Global.variable.append(("Circle", [radius]))
+        Global.requiredInputs.append(("Circle", [radius]))