Removed mouth shape H (special shape for 'L' sound)
This commit is contained in:
parent
9bf8355742
commit
8c9466bcf3
|
@ -19,8 +19,7 @@ EnumConverter<Shape>::member_data ShapeConverter::getMemberData() {
|
||||||
{ Shape::D, "D" },
|
{ Shape::D, "D" },
|
||||||
{ Shape::E, "E" },
|
{ Shape::E, "E" },
|
||||||
{ Shape::F, "F" },
|
{ Shape::F, "F" },
|
||||||
{ Shape::G, "G" },
|
{ Shape::G, "G" }
|
||||||
{ Shape::H, "H" }
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
#include "EnumConverter.h"
|
#include "EnumConverter.h"
|
||||||
|
|
||||||
// The classic Hanna-Barbera mouth shapes A-F phus the common supplements G-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...)
|
D, // Mouth wide open (b[u]t, m[y], sh[ou]ld...)
|
||||||
E, // h[ow]
|
E, // h[ow]
|
||||||
F, // Pout ([o]ff, sh[ow])
|
F, // Pout ([o]ff, sh[ow])
|
||||||
G, // F, V
|
G // F, V
|
||||||
H // L
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class ShapeConverter : public EnumConverter<Shape> {
|
class ShapeConverter : public EnumConverter<Shape> {
|
||||||
|
|
|
@ -35,6 +35,7 @@ Shape getShape(Phone phone) {
|
||||||
case Phone::AH:
|
case Phone::AH:
|
||||||
case Phone::EY:
|
case Phone::EY:
|
||||||
case Phone::HH:
|
case Phone::HH:
|
||||||
|
case Phone::L:
|
||||||
return Shape::C;
|
return Shape::C;
|
||||||
|
|
||||||
case Phone::AA:
|
case Phone::AA:
|
||||||
|
@ -58,9 +59,6 @@ Shape getShape(Phone phone) {
|
||||||
case Phone::V:
|
case Phone::V:
|
||||||
return Shape::G;
|
return Shape::G;
|
||||||
|
|
||||||
case Phone::L:
|
|
||||||
return Shape::H;
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
throw std::runtime_error("Unexpected Phone value.");
|
throw std::runtime_error("Unexpected Phone value.");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue