jamosdev
/
rhubarb-lip-sync
mirror of https://github.com/DanielSWolf/rhubarb-lip-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optimized timing at the beginning of an open or closed segment

This commit is contained in:
Daniel Wolf 2016-12-19 21:08:48 +01:00
parent 4af606ae89
commit 2cce8eebd9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/animation/timingOptimization.cpp
View File

@ -35,7 +35,11 @@ JoiningContinuousTimeline<Shape> retime(const JoiningContinuousTimeline<Shape>&
centiseconds targetPosition = targetRange.getEnd(); centiseconds targetPosition = targetRange.getEnd();
while (targetPosition > targetRange.getStart()) { while (targetPosition > targetRange.getStart()) {
// Determine the time range of source shapes competing for the next target shape // Determine the time range of source shapes competing for the next target shape
TimeRange candidateRange(targetPosition - minShapeDuration, targetPosition); const centiseconds remainingTargetDuration = targetPosition - targetRange.getStart();
const bool canFitOneOrLess = remainingTargetDuration <= minShapeDuration;
const bool canFitTwo = remainingTargetDuration >= 2 * minShapeDuration;
const centiseconds duration = canFitOneOrLess || canFitTwo ? minShapeDuration : remainingTargetDuration / 2;
TimeRange candidateRange(targetPosition - duration, targetPosition);
if (targetPosition == targetRange.getEnd()) { if (targetPosition == targetRange.getEnd()) {
// This is the first iteration. // This is the first iteration.
// Extend the candidate range to the right in order to consider all source shapes after the target range. // Extend the candidate range to the right in order to consider all source shapes after the target range.