[vrm1.0] impl refactor mesh integration #2180
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
ousttrue
commented
Oct 27, 2023
| @@ -90,7 +90,7 @@ public static bool Execute(GameObject src, bool onlyBlendShapeRenderers) | |||
| // write mesh asset. | |||
| foreach (var result in results) | |||
| { | |||
| var mesh = result.IntegratedRenderer.sharedMesh; | |||
There was a problem hiding this comment.
result には Renderer 乗せない(sharedMesh, sharedMaterials, bones を保持する)
ousttrue
commented
Oct 27, 2023
| @@ -144,5 +145,33 @@ static void RemoveScaleAndRotationRecursive(Transform src, Transform dst, Dictio | |||
|
|
|||
| return (normalized, boneMap); | |||
| } | |||
|
|
|||
| public static void WriteBackResult(GameObject go, GameObject normalized, Dictionary<Transform, Transform> boneMap) | |||
There was a problem hiding this comment.
copy せずにヒエラルキーを直接改変するために作った。
TODO: undo に対応する。
ousttrue
commented
Oct 27, 2023
| @@ -232,7 +236,24 @@ public void Push(SkinnedMeshRenderer renderer) | |||
| } | |||
| } | |||
|
|
|||
| public MeshIntegrationResult Integrate(MeshEnumerateOption onlyBlendShapeRenderers) | |||
| public static MeshIntegrationResult Integrate(MeshIntegrationGroup group, bool useBlendShape) | |||
There was a problem hiding this comment.
MeshEnumerateOption を見て‘Renderer を収集する責務を外に移動。
ousttrue
commented
Oct 27, 2023
| @@ -306,5 +306,30 @@ public static bool GetHumanDescription(UnityEngine.Object target, ref HumanDescr | |||
| avatar.name = "created"; | |||
| return avatar; | |||
| } | |||
|
|
|||
| public static Avatar RecreateAvatar(Animator src) | |||
There was a problem hiding this comment.
親子関係は変わっていないが transform が変わったヒエラルキーに対して
avatar を再作成する関数。
Santarh
requested changes
Oct 31, 2023
| @@ -1,9 +1,11 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Net.WebSockets; | |||
There was a problem hiding this comment.
おそらく Reference ミス？コンパイル通らなくなる場合ありそうなので消してもらえると
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Runtime.CompilerServices; |
There was a problem hiding this comment.
こちらも不要な using？
どうでもいいものならいいんですが CompilerServices は特定環境でマズそう
Santarh
approved these changes
Oct 31, 2023
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.
#2169 の部品
List を統合するシンプルなインタフェースに改変。
exclude や統合対象を調整する責務は呼び出し側に移動した。