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

MeshImporterDividedのBlendShapeの更新にかなり時間がかかっていた問題を修正

Browse Source
This commit is contained in:
notargs 2021-11-16 19:11:53 +09:00
parent 7b32f07c78
commit be35f19cb7
2 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Assets/VRM10/Runtime/IO/Model/MeshImporterDivided.cs
View File

@ -40,43 +40,58 @@ namespace UniVRM10
}
// 各種データを再構築
Profiler.BeginSample("Bounds");
resultMesh.RecalculateBounds();
Profiler.EndSample();
Profiler.BeginSample("Tangents");
resultMesh.RecalculateTangents();
Profiler.EndSample();
// BlendShapeを更新
Profiler.BeginSample("BlendShape");
var blendShapeCount = meshGroup.Meshes[0].MorphTargets.Count;
var blendShapePositions = new List<Vector3>();
var blendShapeNormals = new List<Vector3>();
for (var i = 0; i < blendShapeCount; ++i)
{
blendShapePositions.Clear();
blendShapeNormals.Clear();
var name = meshGroup.Meshes[0].MorphTargets[i].Name;
var positionsCount = 0;
var normalsCount = 0;
foreach (var mesh in meshGroup.Meshes)
{
var morphTarget = mesh.MorphTargets[i];
blendShapePositions.AddRange(morphTarget.VertexBuffer.Positions.GetSpan<Vector3>());
if (morphTarget.VertexBuffer.Normals != null)
{
blendShapeNormals.AddRange(morphTarget.VertexBuffer.Normals.GetSpan<Vector3>());
}
else
{
// fill zero
blendShapeNormals.AddRange(Enumerable.Range(0, morphTarget.VertexBuffer.Count)
.Select(x => Vector3.zero));
}
positionsCount += morphTarget.VertexBuffer.Positions.Count;
normalsCount += morphTarget.VertexBuffer.Normals?.Count ?? morphTarget.VertexBuffer.Count;
}
resultMesh.AddBlendShapeFrame(name, 100.0f, blendShapePositions.ToArray(), blendShapeNormals.ToArray(),
var blendShapePositions = new NativeArray<Vector3>(positionsCount, Allocator.Temp);
var blendShapeNormals = new NativeArray<Vector3>(normalsCount, Allocator.Temp);
var blendShapePositionOffset = 0;
var blendShapeNormalOffset = 0;
foreach (var mesh in meshGroup.Meshes)
{
var morphTarget = mesh.MorphTargets[i];
morphTarget.VertexBuffer.Positions.CopyToNativeSlice(
new NativeSlice<Vector3>(
blendShapePositions,
blendShapePositionOffset,
morphTarget.VertexBuffer.Positions.Count
)
);
// nullならdefault(0)のまま
morphTarget.VertexBuffer.Normals?.CopyToNativeSlice(
new NativeSlice<Vector3>(
blendShapeNormals,
blendShapeNormalOffset,
morphTarget.VertexBuffer.Normals.Count
)
);
blendShapePositionOffset += morphTarget.VertexBuffer.Positions.Count;
blendShapeNormalOffset += morphTarget.VertexBuffer.Normals?.Count ?? morphTarget.VertexBuffer.Count;
}
resultMesh.AddBlendShapeFrame(meshGroup.Meshes[0].MorphTargets[i].Name,
100.0f,
blendShapePositions.ToArray(),
blendShapeNormals.ToArray(),
null);
}
Profiler.EndSample();
Profiler.EndSample();

11
Assets/VRM10/vrmlib/Runtime/BufferAccessor.cs
View File

@ -119,6 +119,17 @@ namespace VrmLib
}
}
/// <summary>
/// バッファをNativeSliceへと書き込む
/// </summary>
public unsafe void CopyToNativeSlice<T>(NativeSlice<T> destArray) where T : unmanaged
{
fixed (byte* byteArray = Bytes.Array)
{
UnsafeUtility.MemCpy((T*)destArray.GetUnsafePtr(), byteArray + Bytes.Offset, Bytes.Count);
}
}
public void Assign<T>(T[] values) where T : struct
{
if (Marshal.SizeOf(typeof(T)) != Stride)