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

Merge pull request #1315 from Santarh/ignoreCaseImport

Browse Source 
At importing, Unity asset name is fixed with ignore-case comparison.
This commit is contained in:
ousttrue
2021-10-15 17:38:20 +09:00
committed by GitHub
parent 5341b0bbb0 40e5de26c2
commit 2e8a6cebb3
3 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/UniGLTF/Runtime/UniGLTF/IO/Parser/GlbLowLevelParser.cs
View File

@@ -174,7 +174,8 @@ namespace UniGLTF
/// </summary>
private static void FixTextureNameUnique(glTF GLTF)
{
var used = new HashSet<string>();
// NOTE: Windows FileSystem は大文字小文字の違いは同名ファイルとして扱ってしまうため, IgnoreCase で評価する.
var used = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
for (var textureIdx = 0; textureIdx < GLTF.textures.Count; ++textureIdx)
{
var gltfTexture = GLTF.textures[textureIdx];
@@ -200,7 +201,8 @@ namespace UniGLTF
private static void FixMaterialNameUnique(glTF GLTF)
{
var used = new HashSet<string>();
// NOTE: Windows FileSystem は大文字小文字の違いは同名ファイルとして扱ってしまうため, IgnoreCase で評価する.
var used = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
for (var materialIdx = 0; materialIdx < GLTF.materials.Count; ++materialIdx)
{
var material = GLTF.materials[materialIdx];
@@ -231,7 +233,8 @@ namespace UniGLTF
private static void FixAnimationNameUnique(glTF GLTF)
{
var used = new HashSet<string>();
// NOTE: Windows FileSystem は大文字小文字の違いは同名ファイルとして扱ってしまうため, IgnoreCase で評価する.
var used = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
for (int i = 0; i < GLTF.animations.Count; ++i)
{
var animation = GLTF.animations[i];

41
Assets/UniGLTF/Tests/UniGLTF/GlbParserTests.cs Normal file
View File

@@ -0,0 +1,41 @@
using System;
using NUnit.Framework;
namespace UniGLTF
{
public sealed class GlbParserTests
{
[Test]
public void TextureNameUniqueness()
{
var gltfData = new glTF();
gltfData.asset.version = "2.0";
gltfData.buffers.Add(new glTFBuffer(new ArrayByteBuffer(Array.Empty<byte>())));
gltfData.textures.Add(new glTFTexture
{
name = "FooBar",
source = 0,
});
gltfData.textures.Add(new glTFTexture
{
name = "foobar",
source = 1,
});
gltfData.images.Add(new glTFImage
{
name = "HogeFuga",
});
gltfData.images.Add(new glTFImage
{
name = "hogefuga",
});
var parser = new GlbLowLevelParser("Test", gltfData.ToGlbBytes());
var data = parser.Parse();
Assert.AreEqual("FooBar", data.GLTF.textures[0].name);
// NOTE: 大文字小文字が違うだけの名前は、同一としてみなされ、Suffix が付く。
Assert.AreEqual("foobar__UNIGLTF__DUPLICATED__2", data.GLTF.textures[1].name);
}
}
}

3
Assets/UniGLTF/Tests/UniGLTF/GlbParserTests.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 21904270c266400aa6fe5edf3915a31e
timeCreated: 1634282839