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

Improve animation rules for "f" sound

This commit is contained in:
Daniel Wolf 2022-06-14 18:56:43 +02:00
parent 0b4d4ee30d
commit 205540a91b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
# Version history # Version history
## Unreleased
* **Improved** animation rules for "F" sound when using just the basic mouth shapes.
## Version 1.12.0 ## Version 1.12.0
* **Added** support for skinning in Rhubarb for Spine ([issue #108](https://github.com/DanielSWolf/rhubarb-lip-sync/issues/108)) * **Added** support for skinning in Rhubarb for Spine ([issue #108](https://github.com/DanielSWolf/rhubarb-lip-sync/issues/108))

4
rhubarb/src/animation/animationRules.cpp
View File

@ -15,7 +15,7 @@ constexpr size_t shapeValueCount = static_cast<size_t>(Shape::EndSentinel);
Shape getBasicShape(Shape shape) { Shape getBasicShape(Shape shape) {
static constexpr array<Shape, shapeValueCount> basicShapes = static constexpr array<Shape, shapeValueCount> 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<size_t>(shape)]; return basicShapes[static_cast<size_t>(shape)];
} }
@ -39,7 +39,7 @@ Shape getClosestShape(Shape reference, ShapeSet shapes) {
/* D */ make_array(D, C, H, B, G, A, X, E, F), /* D */ make_array(D, C, H, B, G, A, X, E, F),
/* E */ make_array(E, C, H, B, G, A, X, D, 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), /* 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 /* 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 /* X */ make_array(X, A, G, B, C, H, E, D, F) // Like A
); );