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

Preferring wide-open mouths

This commit is contained in:
Daniel Wolf 2017-01-03 11:01:02 +01:00
parent 05a0050d52
commit b987071009
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/animation/timingOptimization.cpp
View File

@ -31,11 +31,14 @@ Shape getRepresentativeShape(const JoiningTimeline<Shape>& timeline) {
} }
// Select shape with highest total duration within the candidate range // Select shape with highest total duration within the candidate range
const Shape result = std::max_element( const Shape bestShape = std::max_element(
candidateShapeWeights.begin(), candidateShapeWeights.end(), candidateShapeWeights.begin(), candidateShapeWeights.end(),
[](auto a, auto b) { return a.second < b.second; } [](auto a, auto b) { return a.second < b.second; }
)->first; )->first;
return result;
// Shapes C and D are similar, but D is more interesting.
const bool substituteD = bestShape == Shape::C && candidateShapeWeights[Shape::D] > 0_cs;
return substituteD ? Shape::D : bestShape;
} }
struct ShapeReduction { struct ShapeReduction {