Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Adding shader support for doing the animations #702

Draft
wants to merge 68 commits into
base: master
Choose a base branch
from
+2,721 −1,761
Draft

[WIP] Adding shader support for doing the animations #702

Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
6d03eb1
Merge branch 'Timeline-Transformation-matrices-integration' into New-…
m-agour Sep 5, 2022
5b63f7f
Updated tutorials
m-agour Sep 5, 2022
68e01dc
Updated titles
m-agour Sep 5, 2022
c4d7ca5
Time as float representation
m-agour Sep 11, 2022
88d9187
Added slerp docs
m-agour Sep 12, 2022
2b40bf3
Added add_timeline method
m-agour Sep 19, 2022
ddb3bdb
added unit test for `add_timeline`
m-agour Sep 19, 2022
671a441
Fixed pep issue
m-agour Sep 19, 2022
143b9d2
@filipinascimento's review
m-agour Sep 20, 2022
5bef71b
pep8
m-agour Sep 20, 2022
7d3adea
_get_actors to return list of actors not UI element
m-agour Sep 20, 2022
de4b952
Modified how PlaybackPanel objects are added to scene
m-agour Sep 20, 2022
4b6a75f
Implemented remove_timeline from ShowManagger
m-agour Sep 20, 2022
ffa85d8
removed additional prints
m-agour Sep 20, 2022
70a78d0
Renamed `ren` to `scene`
m-agour Sep 20, 2022
93a2a2c
Set timer_callback to None again and added tests
m-agour Sep 20, 2022
50b31a7
@skoudoro review (pep)
m-agour Sep 23, 2022
c722947
@skoudoro review (issue) and updated tests
m-agour Sep 23, 2022
c219c40
Seperating Timeline into Timeline and Animation
m-agour Sep 25, 2022
a97754a
Modifing tests
m-agour Sep 25, 2022
49d0d73
Fixed some docs
m-agour Sep 26, 2022
03c14d2
Added more docs
m-agour Sep 26, 2022
e158720
Duration should be initialized
m-agour Sep 26, 2022
2105548
Animation playable on its own
m-agour Sep 26, 2022
fb9df0d
parent animation impl and doc
m-agour Sep 26, 2022
af350a1
updated robot arm tutorial
m-agour Sep 26, 2022
c4a0c6d
pep fixing
m-agour Sep 26, 2022
83e716c
Tutorials adapt to new method
m-agour Sep 26, 2022
f255501
Update duration in case of hard setting the length
m-agour Sep 26, 2022
7d5615b
Set back playback_panel to False untill tutorials are edited
m-agour Sep 26, 2022
0d602f4
@skoudoro review - pep and doc issues
m-agour Sep 27, 2022
373268e
Impl `get_camera_data` method
m-agour Sep 27, 2022
965daa1
get_keyframes doc typo
m-agour Sep 27, 2022
bf1ab65
Too long dash fixed
m-agour Sep 27, 2022
fc67551
Fixed one letter param
m-agour Sep 27, 2022
5a8c805
Merge remote-tracking branch 'upstream/master' into Seperating-`Timel…
m-agour Sep 27, 2022
097cb3f
fixed glTF animation test
m-agour Sep 27, 2022
cc806e4
Optimized motion path and some docs
m-agour Sep 28, 2022
8b35e9a
assert actor is not already added to animation
m-agour Sep 28, 2022
2682f5b
updated tests
m-agour Sep 28, 2022
426936b
sleep time is not accurate and fails the tests on some OSs
m-agour Sep 28, 2022
5c23ece
Added loop property
m-agour Sep 30, 2022
117c270
making Timeline independent
m-agour Oct 1, 2022
9751457
updated tests
m-agour Oct 1, 2022
ac94ae4
Merge branch 'Seperating-`Timeline`-into-`Timeline`-and-`Animation`' …
m-agour Oct 2, 2022
a9f97f4
Implemented `remove_from_scene` for Timeline and Animation
m-agour Oct 2, 2022
79f30d1
add_animation to showManager
m-agour Oct 2, 2022
2cf48cb
updated tests
m-agour Oct 2, 2022
09ad047
PlaybackPanel might not exist
m-agour Oct 3, 2022
a2f8030
Adding animations after adding creating the PlaybackPanel
m-agour Oct 3, 2022
c45dc5b
some renaming and loop issue fixed
m-agour Oct 4, 2022
37ab99c
Abandoned the `Container` as a superclass
m-agour Oct 4, 2022
87d2169
Separated camera animation from normal animation
m-agour Oct 5, 2022
0a73f7e
Updated docs
m-agour Oct 5, 2022
1d0c673
Added 'camera' property and some docs
m-agour Oct 5, 2022
1c32b2d
Added tests for CameraAnimation
m-agour Oct 5, 2022
0617d87
renaming `update_timeline` to just `update`
m-agour Oct 5, 2022
926ef96
Merge branch 'Seperating-`Timeline`-into-`Timeline`-and-`Animation`' …
m-agour Oct 7, 2022
8197396
`update_timeline` renamed
m-agour Oct 7, 2022
cee5723
Animation loop adjustment
m-agour Oct 7, 2022
0fb1880
Added the ability to get current timestamp of Animation
m-agour Oct 7, 2022
331e755
Added support for general callbacks
m-agour Oct 7, 2022
8c735d9
Merge branch 'Seperating-`Timeline`-into-`Timeline`-and-`Animation`' …
m-agour Oct 7, 2022
1c1d117
Merge branch 'Add-timeline-to-showmanager' into New-tutorials
m-agour Oct 7, 2022
d65059e
updated animation tutorials
m-agour Oct 7, 2022
5b04d88
Added hierarchical animation tutorial
m-agour Oct 7, 2022
8906480
@filipinascimento's addition
m-agour Oct 8, 2022
ae80376
Added initial shader support for animation
m-agour Oct 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed glTF animation test
@m-agour
m-agour committed Sep 27, 2022
commit 097cb3f66d278fb8281ac0f5099ea548e961bc76
2 changes: 1 addition & 1 deletion fury/gltf.py
View file
Original file line number Diff line number Diff line change
@@ -585,7 +585,7 @@ def main_timeline(self):
main_timeline = Timeline(playback_panel=True)
timelines = self.get_animation_timelines()
for timeline in timelines:
main_timeline.add_child_timeline(timeline)
main_timeline.add_child_animation(timeline)
return main_timeline