Improved phone-to-mouth mapping

This commit is contained in:
Daniel Wolf 2016-01-31 21:39:49 +01:00
parent 7aa6057b8e
commit 0cb0153874
1 changed files with 13 additions and 14 deletions

View File

@ -1,5 +1,4 @@
#include "mouthAnimation.h" #include "mouthAnimation.h"
#include <boost/utility.hpp>
using std::map; using std::map;
@ -12,7 +11,7 @@ Shape getShape(Phone phone) {
return Shape::A; return Shape::A;
case Phone::Unknown: case Phone::Unknown:
case Phone::EH: case Phone::IY:
case Phone::T: case Phone::T:
case Phone::D: case Phone::D:
case Phone::K: case Phone::K:
@ -28,31 +27,31 @@ Shape getShape(Phone phone) {
case Phone::N: case Phone::N:
case Phone::NG: case Phone::NG:
case Phone::R: case Phone::R:
case Phone::Y:
return Shape::B; return Shape::B;
case Phone::IY: case Phone::EH:
case Phone::IH: case Phone::IH:
case Phone::AH:
case Phone::EY: case Phone::EY:
case Phone::ER:
case Phone::HH: case Phone::HH:
case Phone::Y:
return Shape::C; return Shape::C;
case Phone::UW: case Phone::AA:
case Phone::UH:
case Phone::AH:
case Phone::AE: case Phone::AE:
case Phone::AY: case Phone::AY:
case Phone::OY: case Phone::AW:
case Phone::W:
return Shape::D; return Shape::D;
case Phone::AW: case Phone::AO:
case Phone::UH:
case Phone::OW:
case Phone::ER:
return Shape::E; return Shape::E;
case Phone::AO: case Phone::UW:
case Phone::AA: case Phone::OY:
case Phone::OW: case Phone::W:
return Shape::F; return Shape::F;
case Phone::F: case Phone::F: