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

Merge pull request #918 from hiroj/fix_none_vertex_mesh_export

Browse Source 
mesh.vertices = 0 の場合にmeshとmaterialをexportしないように修正
This commit is contained in:
ousttrue
2021-04-28 13:47:47 +09:00
committed by GitHub
parent eb47884c3e 5447d2a67e
commit b226abce4e
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

@@ -160,6 +160,11 @@ namespace UniGLTF
{
node.mesh = meshIndex;
}
else if(mesh != null && !mesh.vertices.Any())
{
// 頂点データが無い場合
node.mesh = -1;
}
else
{
// MeshとMaterialが一致するものが見つからなかった
@@ -178,6 +183,11 @@ namespace UniGLTF
node.mesh = meshIndex;
node.skin = skins.IndexOf(skinnedMeshRenderer);
}
else if (mesh != null && !mesh.vertices.Any())
{
// 頂点データが無い場合
node.mesh = -1;
}
else
{
// MeshとMaterialが一致するものが見つからなかった
@@ -218,8 +228,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();
TextureManager = new TextureExporter(useAsset);
@@ -228,13 +245,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 unityMesh in uniqueUnityMeshes)
{