From 8c9466bcf39b19199108346ef517b0299738a322 Mon Sep 17 00:00:00 2001 From: Daniel Wolf Date: Sun, 26 Jun 2016 20:07:48 +0200 Subject: [PATCH] Removed mouth shape H (special shape for 'L' sound) --- src/Shape.cpp | 3 +-- src/Shape.h | 4 +--- src/mouthAnimation.cpp | 4 +--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/Shape.cpp b/src/Shape.cpp index e9a5ac5..2d7f069 100644 --- a/src/Shape.cpp +++ b/src/Shape.cpp @@ -19,8 +19,7 @@ EnumConverter::member_data ShapeConverter::getMemberData() { { Shape::D, "D" }, { Shape::E, "E" }, { Shape::F, "F" }, - { Shape::G, "G" }, - { Shape::H, "H" } + { Shape::G, "G" } }; } diff --git a/src/Shape.h b/src/Shape.h index 4acab6b..9932a7e 100644 --- a/src/Shape.h +++ b/src/Shape.h @@ -1,6 +1,5 @@ #pragma once -#include #include "EnumConverter.h" // The classic Hanna-Barbera mouth shapes A-F phus the common supplements G-H @@ -13,8 +12,7 @@ enum class Shape { D, // Mouth wide open (b[u]t, m[y], sh[ou]ld...) E, // h[ow] F, // Pout ([o]ff, sh[ow]) - G, // F, V - H // L + G // F, V }; class ShapeConverter : public EnumConverter { diff --git a/src/mouthAnimation.cpp b/src/mouthAnimation.cpp index 16ca6c0..23b364e 100644 --- a/src/mouthAnimation.cpp +++ b/src/mouthAnimation.cpp @@ -35,6 +35,7 @@ Shape getShape(Phone phone) { case Phone::AH: case Phone::EY: case Phone::HH: + case Phone::L: return Shape::C; case Phone::AA: @@ -58,9 +59,6 @@ Shape getShape(Phone phone) { case Phone::V: return Shape::G; - case Phone::L: - return Shape::H; - default: throw std::runtime_error("Unexpected Phone value."); }