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

Merge pull request #920 from hiroj/backport_918

Browse Source 
backport 918
This commit is contained in:
ousttrue
2021-04-28 15:47:47 +09:00
committed by GitHub
parent b35a91dd2a 5f41a2e452
commit bf6c8e06bf
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs
View File

@@ -269,6 +269,11 @@ namespace UniGLTF
{
node.mesh = meshIndex;
}
else if (mesh != null && !mesh.vertices.Any())
{
// 頂点データが無い場合
node.mesh = -1;
}
else
{
// MeshとMaterialが一致するものが見つからなかった
@@ -287,6 +292,11 @@ namespace UniGLTF
node.mesh = meshIndex;
node.skin = skins.IndexOf(skinnedMeshRenderer);
}
else if (mesh != null && !mesh.vertices.Any())
{
// 頂点データが無い場合
node.mesh = -1;
}
else
{
// MeshとMaterialが一致するものが見つからなかった
@@ -322,8 +332,15 @@ namespace UniGLTF
.Skip(1) // exclude root object for the symmetry with the importer
.ToList();
var unityMeshes = MeshWithRenderer.FromNodes(Nodes).Where(x => x.Mesh.vertices.Any()).ToList();
var uniqueUnityMeshes = new List<MeshWithRenderer>();
foreach (var um in unityMeshes)
{
if (!uniqueUnityMeshes.Any(x => x.IsSameMeshAndMaterials(um))) uniqueUnityMeshes.Add(um);
}
#region Materials and Textures
Materials = Nodes.SelectMany(x => x.GetSharedMaterials()).Where(x => x != null).Distinct().ToList();
Materials = uniqueUnityMeshes.SelectMany(x => x.Renderer.sharedMaterials).Where(x => x != null).Distinct().ToList();
var unityTextures = Materials.SelectMany(x => TextureExporter.GetTextures(x)).Where(x => x.texture != null).Distinct().ToList();
TextureManager = new TextureExportManager(unityTextures.Select(x => x.texture));
@@ -339,13 +356,6 @@ namespace UniGLTF
#endregion
#region Meshes
var unityMeshes = MeshWithRenderer.FromNodes(Nodes).Where(x=> x.Mesh.vertices.Any()).ToList();
var uniqueUnityMeshes = new List<MeshWithRenderer>();
foreach (var um in unityMeshes)
{
if (!uniqueUnityMeshes.Any(x => x.IsSameMeshAndMaterials(um))) uniqueUnityMeshes.Add(um);
}
MeshBlendShapeIndexMap = new Dictionary<Mesh, Dictionary<int, int>>();
foreach (var (mesh, gltfMesh, blendShapeIndexMap) in MeshExporter.ExportMeshes(
glTF, bufferIndex, uniqueUnityMeshes, Materials, meshExportSettings))