diff --git a/Assets/UniGLTF/Tests/UniGLTF/MaterialTests.cs b/Assets/UniGLTF/Tests/UniGLTF/MaterialTests.cs index 55c418f10..4ec781cc7 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/MaterialTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/MaterialTests.cs @@ -1,4 +1,5 @@ -using NUnit.Framework; +using System; +using NUnit.Framework; using UnityEngine; using UniJSON; using System.Linq; @@ -262,7 +263,6 @@ namespace UniGLTF var gltfMaterial = materialExporter.ExportMaterial(material, textureExporter, new GltfExportSettings()); var maxComponent = Mathf.GammaToLinearSpace(2f); - Assert.That(gltfMaterial.emissiveFactor, Is.EqualTo(new float[] { 0f, 1f / maxComponent, 1f }).Within(0.5f / 255f)); } } diff --git a/Assets/VRM10/Tests/MigrationTests.cs b/Assets/VRM10/Tests/MigrationTests.cs index 6f2219e22..e21bf5011 100644 --- a/Assets/VRM10/Tests/MigrationTests.cs +++ b/Assets/VRM10/Tests/MigrationTests.cs @@ -359,7 +359,7 @@ namespace UniVRM10 new Color(0.5f, 0.5f, 0.5f, 1), new Color(0f, 0f, 0f, 1), new Color(0f, 0f, 0f, 1), - new Color( Mathf.Pow(0.5f, 1f/2.2f), Mathf.Pow(0.5f, 1f/2.2f), Mathf.Pow(0.5f, 1f/2.2f), 1), + new Color(Mathf.LinearToGammaSpace(0.5f), Mathf.LinearToGammaSpace(0.5f), Mathf.LinearToGammaSpace(0.5f), 1), new Color(0f, 0f, 0f, 1), new Color(0f, 0f, 0f, 1), }; diff --git a/Tests/Models/Materials/EmissionMigration_v0.106.0.vrm b/Tests/Models/Materials/EmissionMigration_v0.106.0.vrm index 4eadbb0a4..d4c142b42 100644 Binary files a/Tests/Models/Materials/EmissionMigration_v0.106.0.vrm and b/Tests/Models/Materials/EmissionMigration_v0.106.0.vrm differ diff --git a/Tests/Models/Materials/EmissionMigration_v0.107.0.vrm b/Tests/Models/Materials/EmissionMigration_v0.107.0.vrm index 65380f6e7..56ff278be 100644 Binary files a/Tests/Models/Materials/EmissionMigration_v0.107.0.vrm and b/Tests/Models/Materials/EmissionMigration_v0.107.0.vrm differ