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

fix and optimize normalize blendShape.

Browse Source
This commit is contained in:
ousttrue
2018-04-05 17:34:13 +09:00
parent 1c70c1487a
commit 2bc3a48d6b
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Scripts/Format/VRMVersion.cs
View File

@@ -4,11 +4,11 @@ namespace VRM
public static class VRMVersion
{
public const int MAJOR = 0;
public const int MINOR = 13;
public const int MINOR = 14;
public const string VERSION = "0.13";
public const string VERSION = "0.14";
public const string DecrementMenuName = "VRM/Version(0.13) Decrement";
public const string IncrementMenuName = "VRM/Version(0.13) Increment";
public const string DecrementMenuName = "VRM/Version(0.14) Decrement";
public const string IncrementMenuName = "VRM/Version(0.14) Increment";
}
}

30
Scripts/SkinnedMeshUtility/Editor/BoneNormalizer.cs
View File

@@ -161,6 +161,7 @@ namespace VRM
}
mesh.boneWeights = srcMesh.boneWeights;
var meshVertices = mesh.vertices;
var blendShapeMesh = new Mesh();
for (int i = 0; i < srcMesh.blendShapeCount; ++i)
{
@@ -168,22 +169,41 @@ namespace VRM
srcRenderer.BakeMesh(blendShapeMesh);
srcRenderer.SetBlendShapeWeight(i, 0);
if (blendShapeMesh.vertices.Length!=mesh.vertices.Length){
throw new Exception("diffrent vertex count");
}
var weight = srcMesh.GetBlendShapeFrameWeight(i, 0);
var vertices = blendShapeMesh.vertices;
var normals = blendShapeMesh.normals;
var tangents = blendShapeMesh.tangents.Select(x => (Vector3)x).ToArray();
for (int j = 0; j < vertices.Length; ++j) {
vertices[j]= m.MultiplyPoint(vertices[j]) - meshVertices[j];
}
for (int j = 0; j < normals.Length; ++j)
{
normals[j] = m.MultiplyVector(normals[j]).normalized;
}
for(int j=0; j<tangents.Length; ++j)
{
tangents[j] = m.MultiplyVector(tangents[j]).normalized;
}
var name = srcMesh.GetBlendShapeName(i);
if (string.IsNullOrEmpty(name))
{
name = String.Format("{0}", i);
}
var weight = srcMesh.GetBlendShapeFrameWeight(i, 0);
var s = src.localScale.x;
try
{
mesh.AddBlendShapeFrame(name,
weight,
blendShapeMesh.vertices.Select((x, j) => m.MultiplyPoint(x) - mesh.vertices[j]).ToArray(),
blendShapeMesh.normals.Select(x => m.MultiplyVector(x).normalized).ToArray(),
blendShapeMesh.tangents.Select(x => m.MultiplyVector(x).normalized).ToArray()
vertices.Length == meshVertices.Length ? vertices : null,
normals.Length == meshVertices.Length ? normals : null,
tangents.Length == meshVertices.Length ? tangents : null
);
}
catch (Exception)