eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-13 11:19:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed interpolation alpha in timeline

Browse Source
This commit is contained in:
brunoherbelin
2020-08-28 22:29:20 +02:00
parent f90964bac8
commit 6213f3da59
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Timeline.cpp
View File

@@ -1,6 +1,6 @@
#include <algorithm> #include <algorithm>
#include <cmath>
#include "defines.h" #include "defines.h"
#include "Log.h" #include "Log.h"
@@ -194,14 +194,13 @@ void Timeline::clearGaps()
float Timeline::fadingAt(const GstClockTime t) float Timeline::fadingAt(const GstClockTime t)
{ {
GstClockTime modulo = t % step_; double true_index = (static_cast<double>(MAX_TIMELINE_ARRAY) * static_cast<double>(t)) / static_cast<double>(timing_.end);
GstClockTime keyframe = t - modulo; double previous_index = floor(true_index);
size_t keyframe_index = CLAMP( (MAX_TIMELINE_ARRAY * keyframe) / timing_.end, 0, MAX_TIMELINE_ARRAY-1); float percent = static_cast<float>(true_index - previous_index);
size_t keyframe_index = CLAMP( static_cast<size_t>(previous_index), 0, MAX_TIMELINE_ARRAY-1);
size_t keyframe_next_index = CLAMP( keyframe_index+1, 0, MAX_TIMELINE_ARRAY-1); size_t keyframe_next_index = CLAMP( keyframe_index+1, 0, MAX_TIMELINE_ARRAY-1);
float interpol = static_cast<float>( static_cast<double>(modulo) / static_cast<double>(step_) );
float v = fadingArray_[keyframe_index]; float v = fadingArray_[keyframe_index];
v += interpol * (fadingArray_[keyframe_next_index] - fadingArray_[keyframe_index]); v += percent * (fadingArray_[keyframe_next_index] - fadingArray_[keyframe_index]);
return v; return v;
} }