[1.0] VRM0.xのマテリアルの表情アニメーションに対応する #1020
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vrm0.xのマテリアルアニメーションに対応するためにrenameMaterialPropertyを移動する。 使用すると考えられる場所はvrm0.xでのマテリアルアニメーションをバインドする箇所だけだと考えられる
読み込み時にVRM0.xの場合でもマテリアルを表情で変化させることが出来るようにする。 MaterialColor - color - emissionColor - shadeColor - rimColor - outlineColor TextureTransform - scale - offset RotationはVRMの仕様として表情に紐づけることが出来ない。
0b5vr
reviewed
Aug 15, 2022
packages/three-vrm-core/src/expressions/VRMExpressionLoaderPlugin.ts
Outdated
Show resolved
Hide resolved
0b5vr
reviewed
Aug 15, 2022
Comment on lines
354
to
356
| const expressionType = renameMaterialProperty( | ||
| materialValue.propertyName!, | ||
| ) as VRMExpressionMaterialColorType; |
There was a problem hiding this comment.
これで正しいexpressionTypeが取れる確証はありますか？
0b5vr
reviewed
Aug 15, 2022
| targetValue: new THREE.Color(...materialValue.targetValue!.slice(0, 3)), | ||
| }), | ||
| ); | ||
| } else { |
There was a problem hiding this comment.
ここはelseで弾くよりかは、 _MainTex_ST と等価比較をしたくありませんか？
There was a problem hiding this comment.
および、ここがハズレた場合は、「このパラメータは対応してないよ」Warningを出すのが親切かなと思っています
There was a problem hiding this comment.
VRM0でMToonにアサインできるのはこれらですね。
There was a problem hiding this comment.
color, emissionColor, shadeColor, rimColor, outlineColor
すべてお名前は揃っていそうですね。
ただ、以下のようなmapを用意してやったほうがより良さそうと思います (i.e. renameMaterialPropert を用いない):
{
'_Color': 'color',
'_ShadeColor': 'shadeColor',
...
}
VRM0のMaterialColorTypeの名前からVRM1用に変換するMapを追加する '_Color': 'color'
- OutlineColorのアニメーション対応 - _propertyNameMapMapの名前修正 - shadeTextureのUVアニメーションの修正
0b5vr
reviewed
Aug 17, 2022
Comment on lines
25
to
+29
| color: 'color', | ||
| emissionColor: 'emissive', | ||
| outlineColor: 'outlineFactor', | ||
| rimColor: 'rimFactor', | ||
| shadeColor: 'shadeFactor', | ||
| outlineColor: 'outlineColorFactor', | ||
| rimColor: 'parametricRimColorFactor', | ||
| shadeColor: 'shadeColorFactor', |
There was a problem hiding this comment.
materialBindが対象とするMToonMaterialのプロパティがお名前がズレていたため、それの修正です
There was a problem hiding this comment.
今回、こんな感じで4つほどお名前ステークホルダーがいたのですが:
- VRM0.xのmaterial bindのお名前（undocumented）: [1.0] VRM0.xのマテリアルの表情アニメーションに対応する #1020 (comment)
- VRM1.0のmaterial bindのお名前: https://github.com/vrm-c/vrm-specification/blob/master/specification/VRMC_vrm-1.0-beta/expressions.ja.md#materialcolorbind
- VRMC_materials_mtoonのプロパティ名: https://github.com/vrm-c/vrm-specification/blob/master/specification/VRMC_materials_mtoon-1.0-beta/README.ja.md
- three-vrmのMToonMaterialのプロパティ名: https://github.com/pixiv/three-vrm/blob/1.0/packages/three-vrm-materials-mtoon/src/MToonMaterial.ts
ここのObjectは、このうちVRM1.0のmaterialBindの名前をthree-vrmのMToonMaterialのプロパティ名へマップするObjectです。
0b5vr
reviewed
Aug 17, 2022
Comment on lines
+468
to
+473
| vec2 shadeMultiplyTextureUv = ( shadeMultiplyTextureUvTransform * vec3( uv, 1 ) ).xy; | ||
| #if THREE_VRM_THREE_REVISION >= 137 | ||
| material.shadeColor *= texture2D( shadeMultiplyTexture, uv ).rgb; | ||
| material.shadeColor *= texture2D( shadeMultiplyTexture, shadeMultiplyTextureUv ).rgb; | ||
| #else | ||
| // COMPAT: pre-r137 | ||
| material.shadeColor *= shadeMultiplyTextureTexelToLinear( texture2D( shadeMultiplyTexture, uv ) ).rgb; | ||
| material.shadeColor *= shadeMultiplyTextureTexelToLinear( texture2D( shadeMultiplyTexture, shadeMultiplyTextureUv) ).rgb; |
There was a problem hiding this comment.
もともと shadeMultiplyTextureUvTransform が全く機能していなかったので（今回の趣旨と関連はするが直交するバグ）、それの修正です。
0b5vr
added
bug
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
1.0でVRM0.xのモデルを読み込んだ際も表情アニメーションでマテリアルを変化できるように実装する.
MaterialColor に対応
TextureTransform に対応
TextureTransform.RotationはVRMの仕様として表情に紐づけることが出来ない。