Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-28 22:04:56 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

MeshAttachInfo

Browse Source
This commit is contained in:
ousttrue
2023-11-27 18:58:50 +09:00
parent 6d251c5993
commit ff68649036
5 changed files with 110 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
Assets/UniGLTF/Runtime/MeshUtility/BoneNormalizer.cs
View File

@@ -71,6 +71,56 @@ namespace UniGLTF.MeshUtility
}
}
public static MeshAttachInfo CreateMeshInfo(Transform src, Dictionary<Transform, Transform> boneMap, bool freezeBlendShape)
{
Transform dst;
if (!boneMap.TryGetValue(src, out dst))
{
return default;
}
// SkinnedMeshRenderer
var smr = src.GetComponent<SkinnedMeshRenderer>();
var (mesh, dstBones) = MeshFreezer.NormalizeSkinnedMesh(
smr,
boneMap,
dst.localToWorldMatrix,
freezeBlendShape);
if (mesh != null)
{
var info = new MeshAttachInfo
{
Mesh = mesh,
Materials = smr.sharedMaterials,
};
if (smr.rootBone != null)
{
if (boneMap.TryGetValue(smr.rootBone, out Transform found))
{
info.RootBone = found;
}
}
return info;
}
// MeshRenderer
var mr = src.GetComponent<MeshRenderer>();
if (mr != null)
{
var dstMesh = MeshFreezer.NormalizeNoneSkinnedMesh(mr);
if (dstMesh != null)
{
return new MeshAttachInfo
{
Mesh = dstMesh,
Materials = mr.sharedMaterials,
};
}
}
return default;
}
/// <summary>
/// 回転とスケールを除去したヒエラルキーのコピーを作成する(MeshをBakeする)
@@ -79,7 +129,8 @@ namespace UniGLTF.MeshUtility
/// <param name="bakeCurrentBlendShape">BlendShapeを0クリアするか否か。false の場合 BlendShape の現状を Bake する</param>
/// <param name="createAvatar">Avatarを作る関数</param>
/// <returns></returns>
public static (GameObject, Dictionary<Transform, Transform>) NormalizeHierarchyFreezeMesh(GameObject go,
public static (GameObject, Dictionary<Transform, Transform>, Dictionary<Transform, MeshAttachInfo>) NormalizeHierarchyFreezeMesh(
GameObject go,
bool removeScaling = true,
bool removeRotation = true,
bool freezeBlendShape = true
@@ -93,57 +144,16 @@ namespace UniGLTF.MeshUtility
//
// 各メッシュから回転・スケールを取り除いてBinding行列を再計算する
//
var result = new Dictionary<Transform, MeshAttachInfo>();
foreach (var src in go.transform.Traverse())
{
Transform dst;
if (!boneMap.TryGetValue(src, out dst))
var info = CreateMeshInfo(src, boneMap, freezeBlendShape);
if (info != null)
{
continue;
}
{
// SkinnedMeshRenderer
var srcRenderer = src.GetComponent<SkinnedMeshRenderer>();
var (mesh, dstBones) = MeshFreezer.NormalizeSkinnedMesh(
srcRenderer,
boneMap,
dst.localToWorldMatrix,
freezeBlendShape);
if (mesh != null)
{
var dstRenderer = dst.gameObject.AddComponent<SkinnedMeshRenderer>();
dstRenderer.sharedMaterials = srcRenderer.sharedMaterials;
if (srcRenderer.rootBone != null)
{
if (boneMap.TryGetValue(srcRenderer.rootBone, out Transform found))
{
dstRenderer.rootBone = found;
}
}
dstRenderer.bones = dstBones;
dstRenderer.sharedMesh = mesh;
}
}
{
// MeshRenderer
var srcRenderer = src.GetComponent<MeshRenderer>();
if (srcRenderer != null)
{
var dstMesh = MeshFreezer.NormalizeNoneSkinnedMesh(srcRenderer);
if (dstMesh != null)
{
var dstFilter = dst.gameObject.AddComponent<MeshFilter>();
dstFilter.sharedMesh = dstMesh;
// Materialをコピー
var dstRenderer = dst.gameObject.AddComponent<MeshRenderer>();
dstRenderer.sharedMaterials = srcRenderer.sharedMaterials;
}
}
result.Add(src, info);
}
}
return (normalized, boneMap);
return (normalized, boneMap, result);
}
public static void WriteBackResult(GameObject go, GameObject normalized, Dictionary<Transform, Transform> boneMap)

7
Assets/UniGLTF/Runtime/MeshUtility/GltfMeshUtility.cs
View File

@@ -162,11 +162,16 @@ namespace UniGLTF.MeshUtility
// 正規化されたヒエラルキーを作る
if (FreezeBlendShape || FreezeRotation || FreezeScaling)
{
var (normalized, boneMap) = BoneNormalizer.NormalizeHierarchyFreezeMesh(go,
var (normalized, boneMap, newMesh) = BoneNormalizer.NormalizeHierarchyFreezeMesh(go,
removeScaling: FreezeScaling,
removeRotation: FreezeRotation,
freezeBlendShape: FreezeBlendShape);
foreach (var (k, v) in newMesh)
{
v.AttachTo(k.gameObject);
}
// write back normalized transform to boneMap
BoneNormalizer.WriteBackResult(go, normalized, boneMap);
if (Application.isPlaying)

30
Assets/UniGLTF/Runtime/MeshUtility/MeshAttachInfo.cs Normal file
View File

@@ -0,0 +1,30 @@
using UnityEngine;
namespace UniGLTF.MeshUtility
{
public class MeshAttachInfo
{
public Mesh Mesh;
public Material[] Materials;
public Transform[] Bones;
public Transform RootBone;
public void AttachTo(GameObject dst)
{
if (Bones != null)
{
var dstRenderer = dst.AddComponent<SkinnedMeshRenderer>();
dstRenderer.sharedMesh = Mesh;
dstRenderer.sharedMaterials = Materials;
dstRenderer.bones = Bones;
dstRenderer.rootBone = RootBone;
}
else
{
var dstFilter = dst.AddComponent<MeshFilter>();
dstFilter.sharedMesh = Mesh;
var dstRenderer = dst.gameObject.AddComponent<MeshRenderer>();
dstRenderer.sharedMaterials = Materials;
}
}
}
}

11
Assets/UniGLTF/Runtime/MeshUtility/MeshAttachInfo.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e6eff3bee96e61849ac190387ec28542
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/VRM/Runtime/SkinnedMeshUtility/VRMBoneNormalizer.cs
View File

@@ -67,7 +67,12 @@ namespace VRM
}
// 正規化されたヒエラルキーを作る
var (normalized, bMap) = BoneNormalizer.NormalizeHierarchyFreezeMesh(go);
var (normalized, bMap, newMesh) = BoneNormalizer.NormalizeHierarchyFreezeMesh(go);
foreach (var (k, v) in newMesh)
{
v.AttachTo(k.gameObject);
}
// 新しいヒエラルキーからAvatarを作る
var newAvatar = UniHumanoid.AvatarDescription.CreateAvatarForCopyHierarchy(