From 763d0b516bfef4b33e73f8e84ab52bb79ff78c2a Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Mon, 7 Nov 2022 21:30:00 +0900 Subject: [PATCH] fix tests --- Assets/UniGLTF/Tests/UniGLTF/MaterialTests.cs | 4 ++-- Assets/VRM10/Tests/MigrationTests.cs | 2 +- .../Materials/EmissionMigration_v0.106.0.vrm | Bin 202784 -> 202760 bytes .../Materials/EmissionMigration_v0.107.0.vrm | Bin 202808 -> 202792 bytes 4 files changed, 3 insertions(+), 3 deletions(-) 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 4eadbb0a485420891eae9bd62c791b271a8594dc..d4c142b420d3825eb6abd6c8e52dd90b0a594339 100644 GIT binary patch delta 45 zcmZ3mfu~~w4{v%-h#M0F0|SQyGXu*;-VIihy{$PXZ?Ms8=CN+)v1Z)PW6dOT7XTc; B3`GC{ delta 75 zcmeC!z_VZj4{v%-h#M0F1A~GDGlR@V-VIiYCYFXKrX~hvraA_CSlN?5SZFrCw`zZH M#kl>w6_ey$0K+d7>;M1& diff --git a/Tests/Models/Materials/EmissionMigration_v0.107.0.vrm b/Tests/Models/Materials/EmissionMigration_v0.107.0.vrm index 65380f6e73878d6d1d97d608d9ef22db654d5673..56ff278be0562701ef189fbc814f4764bb791aca 100644 GIT binary patch delta 72 zcmdn7foH`A9^Ukv5H}_U1_liYW(Jjwyz4DFO!Q1GP0TG#Ht)5RVB|E_G0+3!$^2HD Zo8_%Fl^7M8J!0EEVi~u4#4>%@1puS^6Kenf delta 87 zcmZ3nfoI1C9^Ukv5H}_U1_lcWW(Jduyz4C)jW!>#lwedeu{1O>H8C(V)iKb+%AS1D ZI(u_~^>f8$i`aIHSjO!Zu}mL!0RZSw7_tBW