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

Fixed #7: Incorrect animation before some pauses

This commit is contained in:
Daniel Wolf 2017-02-08 19:37:02 +01:00
parent 8f3cad9510
commit c410c00214
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/animation/timingOptimization.cpp
View File

@ -170,17 +170,17 @@ JoiningContinuousTimeline<Shape> optimizeTiming(const JoiningContinuousTimeline<
const centiseconds maxExtensionDuration = 6_cs; const centiseconds maxExtensionDuration = 6_cs;
// Make sure all open and closed segments are long enough to register visually. // Make sure all open and closed segments are long enough to register visually.
// We don't care about idle shapes at this point.
JoiningContinuousTimeline<Shape> result(animation.getRange(), Shape::X); JoiningContinuousTimeline<Shape> result(animation.getRange(), Shape::X);
// ... we're filling the result timeline from right to left, so `resultStart` points to the earliest shape already written // ... we're filling the result timeline from right to left, so `resultStart` points to the earliest shape already written
centiseconds resultStart = result.getRange().getEnd(); centiseconds resultStart = result.getRange().getEnd();
for (auto segmentIt = segments.rbegin(); segmentIt != segments.rend(); ++segmentIt) { for (auto segmentIt = segments.rbegin(); segmentIt != segments.rend(); ++segmentIt) {
// We don't care about idle shapes at this point.
if (segmentIt->getValue() == MouthState::Idle) continue; if (segmentIt->getValue() == MouthState::Idle) continue;
const centiseconds segmentTargetEnd = std::min(segmentIt->getEnd(), resultStart); resultStart = std::min(segmentIt->getEnd(), resultStart);
if (segmentTargetEnd - segmentIt->getStart() >= minSegmentDuration) { if (resultStart - segmentIt->getStart() >= minSegmentDuration) {
// The segment is long enough; we don't have to extend it to the left. // The segment is long enough; we don't have to extend it to the left.
const TimeRange targetRange(segmentIt->getStart(), segmentTargetEnd); const TimeRange targetRange(segmentIt->getStart(), resultStart);
const auto retimedSegment = retime(animation, segmentIt->getTimeRange(), targetRange); const auto retimedSegment = retime(animation, segmentIt->getTimeRange(), targetRange);
for (const auto& timedShape : retimedSegment) { for (const auto& timedShape : retimedSegment) {
result.set(timedShape); result.set(timedShape);