From 205540a91b06d0452546aa6b636b02a513e766d8 Mon Sep 17 00:00:00 2001 From: Daniel Wolf Date: Tue, 14 Jun 2022 18:56:43 +0200 Subject: [PATCH] Improve animation rules for "f" sound --- CHANGELOG.md | 4 ++++ rhubarb/src/animation/animationRules.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97247d9..8ee5503 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Version history +## Unreleased + +* **Improved** animation rules for "F" sound when using just the basic mouth shapes. + ## Version 1.12.0 * **Added** support for skinning in Rhubarb for Spine ([issue #108](https://github.com/DanielSWolf/rhubarb-lip-sync/issues/108)) diff --git a/rhubarb/src/animation/animationRules.cpp b/rhubarb/src/animation/animationRules.cpp index 1b31bf5..239a263 100644 --- a/rhubarb/src/animation/animationRules.cpp +++ b/rhubarb/src/animation/animationRules.cpp @@ -15,7 +15,7 @@ constexpr size_t shapeValueCount = static_cast(Shape::EndSentinel); Shape getBasicShape(Shape shape) { static constexpr array basicShapes = - make_array(A, B, C, D, E, F, B, C, A); + make_array(A, B, C, D, E, F, A, C, A); return basicShapes[static_cast(shape)]; } @@ -39,7 +39,7 @@ Shape getClosestShape(Shape reference, ShapeSet shapes) { /* D */ make_array(D, C, H, B, G, A, X, E, F), /* E */ make_array(E, C, H, B, G, A, X, D, F), /* F */ make_array(F, B, G, A, X, C, H, E, D), - /* G */ make_array(G, B, C, H, A, X, E, D, F), + /* G */ make_array(G, A, B, C, H, X, E, D, F), /* H */ make_array(H, C, B, G, D, A, X, E, F), // Like C /* X */ make_array(X, A, G, B, C, H, E, D, F) // Like A );