Skip to content

Commit 317bed8

Browse files
authored
Merge pull request #43 from anpawo/rework/position_&_rotation
Rework/position & rotation
2 parents 07775a4 + 8dd5ccd commit 317bed8

File tree

26 files changed

+193
-138
lines changed

26 files changed

+193
-138
lines changed

.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ BraceWrapping:
3737
AfterEnum: false
3838
AfterFunction: true
3939
AfterObjCDeclaration: false
40-
AfterStruct: false
40+
AfterStruct: true
4141
AfterUnion: false
4242
AfterExternBlock: false
4343
BeforeCatch: false

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ SRC_TSF = $(SRC_TSF_POS) \
9999

100100

101101
SRC_TSF_POS = src/transformation/position/translate.cpp \
102+
src/transformation/position/move.cpp \
102103

103104

104105
SRC_TSF_COLOR = src/transformation/color/fade.cpp \

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ from frontend.VideoCode import *
99

1010
v1 = video("video/v.mp4")
1111

12-
v1[:20].apply(fadeIn())
13-
v1[-20:].apply(fadeOut())
14-
15-
v1.add()
12+
v1[0:20].apply(fadeIn()).add()
13+
v1[20:40].apply(fadeOut()).add()
1614
```
1715

1816
<img src="docs/readme/example.gif" style="width: 50%;">

docs/readme/02_code.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ from frontend.VideoCode import *
55

66
v1 = video("video/v.mp4")
77

8-
v1[:20].apply(fadeIn())
9-
v1[-20:].apply(fadeOut())
10-
11-
v1.add()
8+
v1[0:20].apply(fadeIn()).add()
9+
v1[20:40].apply(fadeOut()).add()
1210
```

docs/readme/example.gif

-2.82 MB
Loading

frontend/input/Input.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def __getitem__(self, i: int | slice[int | None, int | None, None]) -> Slice:
8888
---
8989
### Example
9090
>>> v = video("test.mp4")
91-
>>> v[0:20].fade() # fade in during the first 20 frames.
91+
>>> v[0:20].apply(fadeIn()) # fade in during the first 20 frames.
9292
>>> v.add() # adds it to the timeline
9393
9494
"""

frontend/transformation/color/Fade.py

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,35 @@
66

77

88
class fade(Transformation):
9-
def __init__(self, sides: list[side] = ALL, startOpacity: uint = 0, endOpacity: uint = 255) -> None:
10-
"""
11-
`Fade` from `sides`.
9+
"""
10+
`Fade` from `sides`.
11+
12+
Modify `opacity` for a `Fade in` or a `Fade out`.
1213
13-
Modify `opacity` for a `Fade in` or a `Fade out`.
14+
Default: `Fade in`.
15+
"""
1416

15-
Default: `Fade in`.
16-
"""
17+
def __init__(self, sides: list[side] = ALL, startOpacity: uint = 0, endOpacity: uint = 255) -> None:
1718
self.sides = sides
1819
self.startOpacity = startOpacity
1920
self.endOpacity = endOpacity
2021

2122

2223
class fadeIn:
24+
"""
25+
`Fade in` from `sides`.
26+
"""
27+
2328
def __new__(cls, sides: list[side] = ALL) -> fade:
24-
"""
25-
`Fade in` from `sides`.
26-
"""
2729
return fade(sides, startOpacity=0, endOpacity=255)
2830

2931

3032
class fadeOut:
33+
"""
34+
`Fade out` from `sides`.
35+
"""
36+
3137
def __new__(cls, sides: list[side] = ALL) -> fade:
32-
"""
33-
`Fade out` from `sides`.
34-
"""
3538
return fade(sides, startOpacity=255, endOpacity=0)
3639

3740

frontend/transformation/color/Grayscale.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55

66
class grayscale(Transformation):
7-
def __init__(self) -> None:
8-
"""
9-
`Grayscale` `Transformation`.
10-
"""
7+
"""
8+
`Grayscale` `Transformation`.
9+
"""
10+
11+
def __init__(self) -> None: ...

frontend/transformation/position/Move.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44

55

66
class move(Transformation):
7+
"""
8+
`Moves` an `Input` by `x` `y`, you will arrive at `x` `y` at the last frame.
9+
10+
The position of the `Input` changes over time.
11+
"""
12+
713
def __init__(self, x: int, y: int) -> None:
8-
"""
9-
`Moves` an `Input` by `x` `y`, you will arrive at `x` `y` at the last frame.
10-
"""
1114
self.x = x
1215
self.y = y

frontend/transformation/position/Translate.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@
44

55

66
class translate(Transformation):
7+
"""
8+
`Translates` an `Input` by `x` `y`.
9+
10+
This takes action on all frames instantly, there is no delay.
11+
12+
For a movement over time, see `Move`.
13+
"""
14+
715
def __init__(self, x: int, y: int) -> None:
8-
"""
9-
`Translates` an `Input` by `x` `y`.
10-
"""
1116
self.x = x
1217
self.y = y

0 commit comments

Comments
 (0)