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

Minor improvements to animation rules

This commit is contained in:
Daniel Wolf 2016-08-10 20:13:05 +02:00
parent 8b025a3522
commit a851a76ce5
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/mouthAnimation.cpp
View File

@ -58,17 +58,17 @@ Timeline<Viseme> animate(optional<Phone> phone, centiseconds duration, centiseco
case Phone::AA: return single({ D }); case Phone::AA: return single({ D });
case Phone::IY: return single({ B }); case Phone::IY: return single({ B });
case Phone::UW: return single({ F }); case Phone::UW: return single({ F });
case Phone::EH: return single({ C }); case Phone::EH: return single({ { C }, 20_cs, { D } });
case Phone::IH: return single({ B }); case Phone::IH: return single({ B });
case Phone::UH: return single({ E }); case Phone::UH: return single({ E });
case Phone::AH: return single({ { B, C, D, E, F }, 6_cs, { C } }); // Heuristic: < 6_cs is schwa case Phone::AH: return single({ { B, C, D, E, F }, 6_cs, { C } }); // Heuristic: < 6_cs is schwa
case Phone::AE: return single({ D }); case Phone::AE: return single({ D });
case Phone::EY: return diphtong({ C }, { B }); case Phone::EY: return diphtong({ { C }, 20_cs, { D } }, { B });
case Phone::AY: return diphtong({ D }, { B }); case Phone::AY: return diphtong({ D }, { B });
case Phone::OW: return diphtong({ E }, { F }); case Phone::OW: return diphtong({ E }, { F });
case Phone::AW: return diphtong({ D }, { F }); case Phone::AW: return diphtong({ D }, { F });
case Phone::OY: return diphtong({ E }, { B }); case Phone::OY: return diphtong({ F }, { B });
case Phone::ER: return single({ E }); case Phone::ER: return single({ { B }, 7_cs, { E } });
case Phone::P: case Phone::P:
case Phone::B: return bilabialStop(); case Phone::B: return bilabialStop();
case Phone::T: case Phone::T: