VrmAnimation の Expression は float field に変更 #2124
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
AnimationClip に普通の float curve として格納する様に変更した。 VrmAnimationInstance の public field と連動する。
Santarh
previously approved these changes
Aug 8, 2023
Comment on lines
+27
to
+30
| // public float preset_lookup; | ||
| // public float preset_lookdown; | ||
| // public float preset_lookleft; | ||
| // public float preset_lookright; |
There was a problem hiding this comment.
LookAt 情報は float ではなく別にアニメーションデータが存在し、また
そもそも LookAt によって上書き制御されるので、ここには要らない
| @@ -9,14 +9,14 @@ namespace UniGLTF | |||
| { | |||
| public static class AnimationImporterUtil | |||
| { | |||
| private enum TangentMode | |||
| public enum TangentMode | |||
There was a problem hiding this comment.
public にするなら class 内定義である必要はなさそうだが…まあ必要があればいずれリファクタ
| var gltfAnimation = Data.GLTF.animations[0]; | ||
| if (animation.Expressions.Preset is Preset preset) | ||
| { | ||
| { if (GetExpression(gltfAnimation, ExpressionKey.CreateFromPreset(ExpressionPreset.happy), "preset_happy", preset.Happy) is ExpressionInfo info) yield return info; } |
There was a problem hiding this comment.
string リテラルの部分、たとえば nameof(VrmAnimationInstance.preset_happy) にするとコード追跡性が上がって良さそう（１行長くなるが…）
Santarh
approved these changes
Aug 14, 2023
| { if (GetExpression(gltfAnimation, ExpressionKey.CreateFromPreset(ExpressionPreset.oh), "preset_oh", preset.Oh) is ExpressionInfo info) yield return info; } | ||
| { if (GetExpression(gltfAnimation, ExpressionKey.CreateFromPreset(ExpressionPreset.blink), "preset_blink", preset.Blink) is ExpressionInfo info) yield return info; } | ||
| { if (GetExpression(gltfAnimation, ExpressionKey.CreateFromPreset(ExpressionPreset.blinkLeft), "preset_blinkLeft", preset.BlinkLeft) is ExpressionInfo info) yield return info; } | ||
| { if (GetExpression(gltfAnimation, ExpressionKey.CreateFromPreset(ExpressionPreset.blinkRight), "preset_blinkRight", preset.BlinkRight) is ExpressionInfo info) yield return info; } |
There was a problem hiding this comment.
あ、別に property 名を意図していたリテラル指定というわけではなくて
ちょっと違ったんですね……
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.
AnimationClip に普通の float curve として格納する様に変更した。
VrmAnimationInstance の public field と連動する。