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

Merge pull request #1477 from Santarh/mrconv

Browse Source 
Fix the test of exporting Metallic-Rougness texture
This commit is contained in:
ousttrue 2022-01-19 16:20:31 +09:00 committed by GitHub
commit b71705e2bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/VRMShaders/GLTF/IO/Tests/MetallicRoughnessConverterTests.cs
View File

@ -131,7 +131,6 @@ namespace VRMShaders
[Test]
public void ExportMetallicSmoothnessOcclusion_Test()
{
var textureSerializer = new EditorTextureSerializer();
var metallic = new Texture2D(4, 4, TextureFormat.ARGB32, false, true);
var occlusion = new Texture2D(4, 4, TextureFormat.ARGB32, false, true);
@ -139,16 +138,23 @@ namespace VRMShaders
var exporter = new TextureExporter(new EditorTextureSerializer());
Assert.AreEqual(-1, exporter.RegisterExportingAsCombinedGltfPbrParameterTextureFromUnityStandardTextures(null, 0, null));
}
{
var exporter = new TextureExporter(new EditorTextureSerializer());
Assert.AreEqual(0, exporter.RegisterExportingAsCombinedGltfPbrParameterTextureFromUnityStandardTextures(metallic, 0, occlusion));
Assert.AreEqual(0, exporter.RegisterExportingAsCombinedGltfPbrParameterTextureFromUnityStandardTextures(metallic, 0, occlusion));
}
{
var exporter = new TextureExporter(new EditorTextureSerializer());
Assert.AreEqual(0, exporter.RegisterExportingAsCombinedGltfPbrParameterTextureFromUnityStandardTextures(null, 0, occlusion));
Assert.AreEqual(1, exporter.RegisterExportingAsCombinedGltfPbrParameterTextureFromUnityStandardTextures(metallic, 0, null));
}
{
// NOTE: 部分集合が一致していても、Combined テクスチャとしては別物としてみなす.
// 正しい PBR Material の作り方をしていればまず該当しないエッジケースのため、ファイル容量増加を許容する.
var exporter = new TextureExporter(new EditorTextureSerializer());
Assert.AreEqual(0, exporter.RegisterExportingAsCombinedGltfPbrParameterTextureFromUnityStandardTextures(metallic, 0, occlusion));
Assert.AreEqual(0, exporter.RegisterExportingAsCombinedGltfPbrParameterTextureFromUnityStandardTextures(null, 0, occlusion));
Assert.AreEqual(0, exporter.RegisterExportingAsCombinedGltfPbrParameterTextureFromUnityStandardTextures(metallic, 0, null));
Assert.AreEqual(1, exporter.RegisterExportingAsCombinedGltfPbrParameterTextureFromUnityStandardTextures(null, 0, occlusion));
Assert.AreEqual(2, exporter.RegisterExportingAsCombinedGltfPbrParameterTextureFromUnityStandardTextures(metallic, 0, null));
}
}
}