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

Merge pull request #812 from ousttrue/fix/enum_texture_unique

Browse Source 
Fix/enum texture unique
This commit is contained in:
ousttrue
2021-03-23 14:21:47 +09:00
committed by GitHub
parent 87398e0ee4 50d5539f8d
commit 05b976762f
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfTextureEnumerator.cs
View File

@@ -52,11 +52,14 @@ namespace UniGLTF
public static IEnumerable<GetTextureParam> Enumerate(glTF gltf)
{
var used = new HashSet<GetTextureParam>();
foreach (var material in gltf.materials)
{
foreach (var textureInfo in EnumerateTextures(gltf, material))
{
yield return textureInfo;
if(used.Add(textureInfo)){
yield return textureInfo;
}
}
}
}

33
Assets/UniGLTF/Tests/UniGLTF/GltfLoadTests.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using NUnit.Framework;
using UnityEngine;
@@ -53,7 +54,7 @@ namespace UniGLTF
}
}
static void Load(FileInfo gltf, DirectoryInfo root)
static void RuntimeLoad(FileInfo gltf, int subStrStart)
{
var parser = new GltfParser();
try
@@ -75,10 +76,34 @@ namespace UniGLTF
}
catch (Exception ex)
{
Message(gltf.FullName.Substring(root.FullName.Length), ex);
Message(gltf.FullName.Substring(subStrStart), ex);
}
}
/// <summary>
/// Extract をテスト
/// </summary>
/// <param name="gltf"></param>
/// <param name="root"></param>
static void EditorLoad(FileInfo gltf, int subStrStart)
{
var parser = new GltfParser();
try
{
parser.ParsePath(gltf.FullName);
}
catch (Exception ex)
{
Debug.LogError($"ParseError: {gltf}");
Debug.LogException(ex);
}
// should unique
var gltfTextures = GltfTextureEnumerator.Enumerate(parser.GLTF);
var distinct = gltfTextures.Distinct().ToArray();
Assert.True(gltfTextures.SequenceEqual(distinct));
}
[Test]
public void GltfSampleModelsTests()
{
@@ -95,7 +120,9 @@ namespace UniGLTF
foreach (var gltf in EnumerateGltfFiles(root))
{
Load(gltf, root);
RuntimeLoad(gltf, root.FullName.Length);
EditorLoad(gltf, root.FullName.Length);
}
}
}