-
Notifications
You must be signed in to change notification settings - Fork 43
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.
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
Add merge! for animation types, insert! for AnimationTrack. #115
Conversation
Codecov Report
@@ Coverage Diff @@
## master #115 +/- ##
=========================================
- Coverage 76.04% 75.5% -0.55%
=========================================
Files 14 15 +1
Lines 405 449 +44
=========================================
+ Hits 308 339 +31
- Misses 97 110 +13
Continue to review full report at Codecov.
|
This seems totally reasonable. Let's do it! |
f8e847d
to
3ae5048
Compare
function Base.merge!(a::AnimationClip, others::AnimationClip...) | ||
for other in others | ||
@assert other.fps == a.fps | ||
merge!(merge!, a.tracks, other.tracks) # merge tracks recursively |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was just thinking: there could potentially be two animation tracks with the same name but different jstype
s. That would currently error here. Again, not with the current atframe
implementation,
Lines 12 to 14 in 160933c
track = get!(clip.tracks, prop) do | |
AnimationTrack(prop, jstype, Int[], wider_js_type(typeof(value))[]) | |
end |
but still.
3078385
to
fd6cd97
Compare
fd6cd97
to
888c2bc
Compare
3505532
to
ca6e588
Compare
Thanks! |
Actually, there's still an issue with merging |
Ok, no problem |
On top of #112.
Needs tests, but seems to be working fine for me. Just wanted to open this for review and so that I don't forget.