diff --git a/Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs b/Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs index f18c6704d..18e82e3c7 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs @@ -31,8 +31,12 @@ namespace UniGLTF Assert.AreEqual(glWrap.CLAMP_TO_EDGE, sampler.wrapS); Assert.AreEqual(glWrap.CLAMP_TO_EDGE, sampler.wrapT); + + Assert.AreEqual(FilterMode.Trilinear, convTex0.filterMode); + Assert.IsTrue(convTex0.mipmapCount > 1); + // Tirilinear => LINEAR_MIPMAP_LINEAR Assert.AreEqual(glFilter.LINEAR_MIPMAP_LINEAR, sampler.minFilter); - Assert.AreEqual(glFilter.LINEAR_MIPMAP_LINEAR, sampler.magFilter); + Assert.AreEqual(glFilter.LINEAR, sampler.magFilter); } static FileInfo Find(DirectoryInfo current, string target) diff --git a/Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable_compressed.DDS b/Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable_compressed.DDS index 3eb4a189a..7762d89d5 100644 Binary files a/Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable_compressed.DDS and b/Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable_compressed.DDS differ diff --git a/Assets/VRMShaders/GLTF/IO/Tests/CopyTextureTests.cs b/Assets/VRMShaders/GLTF/IO/Tests/CopyTextureTests.cs index cf2a832c0..0a9321402 100644 --- a/Assets/VRMShaders/GLTF/IO/Tests/CopyTextureTests.cs +++ b/Assets/VRMShaders/GLTF/IO/Tests/CopyTextureTests.cs @@ -22,17 +22,13 @@ namespace VRMShaders Black, Black, Black, Black, }; - // DDS のテクスチャ圧縮によって別の色になっている - private static readonly Color32 CompressedBlack = new Color32(24, 24, 24, 255); - private static readonly Color32 CompressedGray = new Color32(101, 96, 101, 255); - private static readonly Color32 CompressedWhite = new Color32(255, 255, 255, 255); - + // DDSは圧縮で微妙に色が変わるので単色にした private static readonly Color32[] DdsTextureValues = new Color32[] { - CompressedBlack, CompressedBlack, CompressedBlack, CompressedBlack, - CompressedGray, CompressedGray, CompressedGray, CompressedGray, - CompressedGray, CompressedGray, CompressedGray, CompressedGray, - CompressedWhite, CompressedWhite, CompressedWhite, CompressedWhite, + Gray, Gray, Gray, Gray, + Gray, Gray, Gray, Gray, + Gray, Gray, Gray, Gray, + Gray, Gray, Gray, Gray, }; [Test]