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

Better animation of short pauses

This commit is contained in:
Daniel Wolf 2016-10-14 20:25:30 +02:00
parent 503ba9104a
commit 529a32e1b2
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/mouthAnimation.cpp
View File

@ -125,6 +125,29 @@ optional<pair<Shape, TweenTiming>> getTween(Shape first, Shape second) {
return it != lookup.end() ? it->second : optional<pair<Shape, TweenTiming>>(); return it != lookup.end() ? it->second : optional<pair<Shape, TweenTiming>>();
} }
// Returns the mouth shape to use for *short* pauses between words.
Shape getRelaxedShape(Shape lhs, Shape rhs) {
if (lhs == rhs) {
return lhs;
}
// Lookup that contains relaxed versions of mouth shapes
static const map<Shape, Shape> relaxed {
{ A, A },
{ B, B },
{ C, C },
{ D, C },
{ E, C },
{ F, B },
{ G, X },
{ H, C },
{ X, X }
};
assert(relaxed.size() == static_cast<size_t>(Shape::EndSentinel));
return relaxed.at(lhs);
}
Timeline<Shape> createTweens(ContinuousTimeline<Shape> shapes) { Timeline<Shape> createTweens(ContinuousTimeline<Shape> shapes) {
centiseconds minTweenDuration = 4_cs; centiseconds minTweenDuration = 4_cs;
centiseconds maxTweenDuration = 10_cs; centiseconds maxTweenDuration = 10_cs;
@ -175,16 +198,15 @@ Timeline<Shape> animatePauses(const ContinuousTimeline<Shape>& shapes) {
Timeline<Shape> result; Timeline<Shape> result;
// Don't close mouth for short pauses // Don't close mouth for short pauses
for (const auto& timedShape : shapes) { for_each_adjacent(shapes.begin(), shapes.end(), [&](const Timed<Shape>& lhs, const Timed<Shape>& pause, const Timed<Shape>& rhs) {
if (timedShape.getValue() != X) continue; if (pause.getValue() != X) return;
if (timedShape.getStart() == 0_cs || timedShape.getEnd() == shapes.getRange().getEnd()) continue;
const centiseconds maxPausedOpenMouthDuration = 35_cs; const centiseconds maxPausedOpenMouthDuration = 35_cs;
const TimeRange timeRange = timedShape.getTimeRange(); const TimeRange timeRange = pause.getTimeRange();
if (timeRange.getDuration() <= maxPausedOpenMouthDuration) { if (timeRange.getDuration() <= maxPausedOpenMouthDuration) {
result.set(timeRange, B); result.set(timeRange, getRelaxedShape(lhs.getValue(), rhs.getValue()));
} }
} });
// Keep mouth open into pause if it just opened // Keep mouth open into pause if it just opened
for_each_adjacent(shapes.begin(), shapes.end(), [&](const Timed<Shape>& secondLast, const Timed<Shape>& last, const Timed<Shape>& pause) { for_each_adjacent(shapes.begin(), shapes.end(), [&](const Timed<Shape>& secondLast, const Timed<Shape>& last, const Timed<Shape>& pause) {
@ -195,7 +217,7 @@ Timeline<Shape> animatePauses(const ContinuousTimeline<Shape>& shapes) {
if (isClosed(secondLast.getValue()) && !isClosed(last.getValue()) && lastDuration < minOpenDuration) { if (isClosed(secondLast.getValue()) && !isClosed(last.getValue()) && lastDuration < minOpenDuration) {
const centiseconds minSpillDuration = 20_cs; const centiseconds minSpillDuration = 20_cs;
centiseconds spillDuration = std::min(minSpillDuration, pause.getDuration()); centiseconds spillDuration = std::min(minSpillDuration, pause.getDuration());
result.set(pause.getStart(), pause.getStart() + spillDuration, B); result.set(pause.getStart(), pause.getStart() + spillDuration, getRelaxedShape(last.getValue(), X));
} }
}); });