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

cleanup

Browse Source
This commit is contained in:
ousttrue
2024-06-24 17:54:14 +09:00
parent 85bfe4bcd1
commit a0ea3ad2e5
2 changed files with 6 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/UniGLTF/Runtime/MeshUtility/MeshExtensions.cs
View File

@@ -168,6 +168,10 @@ namespace UniGLTF.MeshUtility
src.ClearBlendShapes();
foreach (var blendshape in blendshapes)
{
// blendshape の normal, tangent はちゃんと動作しなかった。
// position とロジックが違うのかもしれない。詳細不明。
// 法線に不要な変化が発生し、MToon の outline が乱れたりする。
// 変化しないようにする。
src.AddBlendShapeFrame(blendshape.Name, blendshape.FrameWeight,
blendshape.Vertices, null, null);
}

51
Assets/UniGLTF/Runtime/MeshUtility/MeshFreezer.cs
View File

@@ -122,13 +122,6 @@ namespace UniGLTF.MeshUtility
return newBoneWeights;
}
/// <summary>
///
/// </summary>
/// <param name="src"></param>
/// <param name="boneMap">正規化前のボーンから正規化後のボーンを得る</param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
public static Mesh NormalizeSkinnedMesh(SkinnedMeshRenderer src)
{
if (src == null
@@ -151,6 +144,7 @@ namespace UniGLTF.MeshUtility
// BakeMesh
var mesh = src.sharedMesh.Copy(false, ".baked");
// TODO: scale に関する第２引数があるが true にすると mesh がつぶれた。どうやって使うのか
src.BakeMesh(mesh);
CopyBlendShapes(src, mesh);
@@ -158,15 +152,6 @@ namespace UniGLTF.MeshUtility
var m = Matrix4x4.TRS(Vector3.zero, src.transform.rotation, Vector3.one);
mesh.ApplyMatrixAlsoBlendShapes(m);
//
// BlendShapes
//
// {
// var m = src.localToWorldMatrix; // include scaling
// m.SetColumn(3, new Vector4(0, 0, 0, 1)); // no translation
// CopyBlendShapes(src, srcMesh, mesh, m);
// }
return mesh;
}
@@ -201,12 +186,6 @@ namespace UniGLTF.MeshUtility
private static void CopyBlendShapes(SkinnedMeshRenderer src, Mesh mesh)
{
var srcMesh = src.sharedMesh;
var blendShapeValues = new Dictionary<int, float>();
for (int i = 0; i < srcMesh.blendShapeCount; i++)
{
var val = src.GetBlendShapeWeight(i);
if (val > 0) blendShapeValues.Add(i, val);
}
// clear blendShape always
var backcup = new List<float>();
@@ -256,36 +235,18 @@ namespace UniGLTF.MeshUtility
throw new Exception("different vertex count");
}
var value = blendShapeValues.ContainsKey(i) ? blendShapeValues[i] : 0;
src.SetBlendShapeWeight(i, value);
src.SetBlendShapeWeight(i, backcup[i]);
Vector3[] vertices = blendShapeMesh.vertices;
for (int j = 0; j < vertices.Length; ++j)
{
// if (originalBlendShapePositions[j] == Vector3.zero)
// {
// vertices[j] = Vector3.zero;
// }
// else
// {
// vertices[j] = m.MultiplyPoint(vertices[j] - meshVertices[j]);
// }
vertices[j] = vertices[j] - meshVertices[j];
}
Vector3[] normals = blendShapeMesh.normals;
for (int j = 0; j < normals.Length; ++j)
{
// if (originalBlendShapeNormals[j] == Vector3.zero)
// {
// normals[j] = Vector3.zero;
// }
// else
// {
// normals[j] = m.MultiplyVector(normals[j].normalized) - meshNormals[j];
// }
normals[j] = normals[j] - meshNormals[j];
}
@@ -294,14 +255,6 @@ namespace UniGLTF.MeshUtility
{
for (int j = 0; j < tangents.Length; ++j)
{
// if (originalBlendShapeTangents[j] == Vector3.zero)
// {
// tangents[j] = Vector3.zero;
// }
// else
// {
// tangents[j] = m.MultiplyVector(tangents[j]) - meshTangents[j];
// }
tangents[j] = tangents[j] - meshTangents[j];
}
}