Skip to content

Commit

Permalink
Merge pull request #552 from anatawa12/more-mmd-blendshapes
Browse files Browse the repository at this point in the history 
chore: add & reorganize mmd BlendShapes
  • Loading branch information
@anatawa12
anatawa12 authored Oct 10, 2023
2 parents 3dca952 + ddea15f commit 9b84e00
Show file tree
Hide file tree
Showing 3 changed files with 96 additions and 126 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG-PRERELEASE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ The format is based on [Keep a Changelog].

## [Unreleased]
### Added
- More MMD BlendShapes are registered `#552`
- New English Translation BlendShapes are compatible with AAO!

### Changed
- You now cannot key any of AvatarOptimizer Components `#551`
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ The format is based on [Keep a Changelog].
## [Unreleased]
### Added
- Feature for debugging GC Objects `#543`
- More MMD BlendShapes are registered `#552`
- New English Translation BlendShapes are compatible with AAO!

### Changed
- You now cannot key any of AvatarOptimizer Components `#551`
Expand Down
218 changes: 92 additions & 126 deletions Editor/Processors/TraceAndOptimize/AnimatorParser.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -694,135 +694,101 @@ private IEnumerable<AnimatorState> CollectStates(AnimatorStateMachine stateMachi
[VRCAvatarDescriptor.AnimLayerType.IKPose] = "a9b90a833b3486e4b82834c9d1f7c4ee"
};

private static readonly string[] MmdBlendShapeNames = {
// https://booth.pm/ja/items/3341221
// https://images-wixmp-ed30a86b8c4ca887773594c2.wixmp.com/i/0b7b5e4b-c62e-41f7-8ced-1f3e58c4f5bf/d5nbmvp-5779f5ac-d476-426c-8ee6-2111eff8e76c.png
"まばたき",
"笑い",
"ウィンク",
"ウィンク右",
"ウィンク２",
"ｳｨﾝｸ２右",
"なごみ",
"はぅ",
"びっくり",
"じと目",
"ｷﾘｯ",
"はちゅ目",

"星目",
"はぁと",
"瞳小",
"瞳縦潰れ",
"光下",
"恐ろしい子！",
"ハイライト消",
"映り込み消",
"喜び",
"わぉ!?",
"なごみω",
"悲しむ",
"敵意",

"あ",
"い",
"う",
"え",
"お",
"あ２",
"ん",
"▲",
"∧",
"□",
"ワ",
"ω",

"ω□",
"にやり",
"にやり２",
"にっこり",
"ぺろっ",
"てへぺろ",
"てへぺろ２",
"口角上げ",
"口角下げ",
"口横広げ",
"歯無し上",
"歯無し下",

"真面目",
"困る",
"にこり",
"怒り",
"下",
"上",

// english
"Blink",
"Smile",
"Wink",
"Wink-a",
"Wink-b",
"Wink-c",
"Howawa",
"> <",
"Ha!!!",
"Jito-eye",
"Kiri-eye",
"O O",

"EyeStar",
"EyeHeart",
"EyeSmall",
"EyeSmall-v",
"EyeUnderli",
"EyeFunky",
"EyHi-Off",
"EyeRef-off",
"Joy",
"Wao!?",
"Howawa ω",
"Wail",
"Hostility",

"a",
"i",
"u",
"e",
"o",
"a 2",
"n",
"Mouse_1",
"Mouse_2",
//"□",
"Wa",
"Omega",

// "ω□",
"Niyari",
"Niyari2",
"Smile",
"Pero",
"Bero-tehe",
"Bero-tehe2",
"MouseUP",
"MouseDW",
"MouseWD",
"ToothAnon",
"ToothBnon",

"Serious",
"Trouble",
"Smily",
"Get angry",
"Up",
"Down",
private static readonly string[] MmdBlendShapeNames = new [] {
// New EN by Yi MMD World
// https://docs.google.com/spreadsheets/d/1mfE8s48pUfjP_rBIPN90_nNkAIBUNcqwIxAdVzPBJ-Q/edit?usp=sharing
// Old EN by Xoriu
// https://booth.pm/ja/items/3341221
// https://images-wixmp-ed30a86b8c4ca887773594c2.wixmp.com/i/0b7b5e4b-c62e-41f7-8ced-1f3e58c4f5bf/d5nbmvp-5779f5ac-d476-426c-8ee6-2111eff8e76c.png
// Old EN, New EN, JA,

// ===== Mouth =====
"a", "Ah", "あ",
"i", "Ch", "い",
"u", "U", "う",
"e", "E", "え",
"o", "Oh", "お",
"Niyari", "Grin", "にやり",
"Mouse_2", "∧", "∧",
"Wa", "Wa", "ワ",
"Omega", "ω", "ω",
"Mouse_1", "▲", "▲",
"MouseUP", "Mouth Horn Raise", "口角上げ",
"MouseDW", "Mouth Horn Lower", "口角下げ",
"MouseWD", "Mouth Side Widen", "口横広げ",
"n", null, "ん",
"Niyari2", null, "にやり２",
// by Xoriu only
"a 2", null, "あ２",
"□", null, "□",
"ω□", null, "ω□",
"Smile", null, "にっこり",
"Pero", null, "ぺろっ",
"Bero-tehe", null, "てへぺろ",
"Bero-tehe2", null, "てへぺろ２",

// ===== Eyes =====
"Blink", "Blink", "まばたき",
"Smile", "Blink Happy", "笑い",
"> <", "Close><", "はぅ",
"EyeSmall", "Pupil", "瞳小",
"Wink-c", "Wink 2 Right", "ｳｨﾝｸ２右",
"Wink-b", "Wink 2", "ウィンク２",
"Wink", "Wink", "ウィンク",
"Wink-a", "Wink Right", "ウィンク右",
"Howawa", "Calm", "なごみ",
"Jito-eye", "Stare", "じと目",
"Ha!!!", "Surprised", "びっくり",
"Kiri-eye", "Slant", "ｷﾘｯ",
"EyeHeart", "Heart", "はぁと",
"EyeStar", "Star Eye", "星目",
"EyeFunky", null, "恐ろしい子！",
// by Xoriu only
"O O", null, "はちゅ目",
"EyeSmall-v", null, "瞳縦潰れ",
"EyeUnderli", null, "光下",
"EyHi-Off", null, "ハイライト消",
"EyeRef-off", null, "映り込み消",

// ===== Eyebrow =====
"Smily", "Cheerful", "にこり",
"Up", "Upper", "上",
"Down", "Lower", "下",
"Serious", "Serious", "真面目",
"Trouble", "Sadness", "困る",
"Get angry", "Anger", "怒り",
null, "Front", "前",

// ===== Eyes + Eyebrow Feeling =====
// by Xoriu only
"Joy", null, "喜び",
"Wao!?", null, "わぉ!?",
"Howawa ω", null, "なごみω",
"Wail", null, "悲しむ",
"Hostility", null, "敵意",

// ===== Other ======
null, "Blush", "照れ",
"ToothAnon", null, "歯無し下",
"ToothBnon", null, "歯無し上",
null, null, "涙",

// others

// https://gist.github.com/lilxyzw/80608d9b16bf3458c61dec6b090805c5
"しいたけ",
"照れ",
"涙",
};

// https://site.nicovideo.jp/ch/userblomaga_thanks/archive/ar1471249
"なぬ！",
"はんっ！",
"えー",
"睨み",
"睨む",
"白目",
"瞳大",
"頬染め",
"青ざめ",
}.Where(x => x != null).Distinct().ToArray();

#endregion
}
Expand Down

0 comments on commit 9b84e00

Please sign in to comment.