From b3645b9599a794c9bc039a9acac15348a6fc3b5d Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 24 May 2021 18:43:24 +0900 Subject: [PATCH 1/2] fix TextureExportTest --- Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) From b75453db83b3bd351ea8b73d891bf0f9a6fc55ed Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 24 May 2021 18:52:57 +0900 Subject: [PATCH 2/2] =?UTF-8?q?CopyFromNonReadableSRgbDds=20=E3=82=92?= =?UTF-8?q?=E3=82=B7=E3=83=B3=E3=83=97=E3=83=AB=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Nvidia と Radeon で動作が異なる？ --- .../IO/Tests/4x4_non_readable_compressed.DDS | Bin 152 -> 192 bytes .../GLTF/IO/Tests/CopyTextureTests.cs | 14 +++++--------- 2 files changed, 5 insertions(+), 9 deletions(-) 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 3eb4a189a2793a00416ceaabba1d2136eed56653..7762d89d5e9034c458c38098d511b7e8b3a58dde 100644 GIT binary patch literal 192 zcmZ>930A0KU|`@EU|?VY(jW|Ef&n9tbocZP&~930A0KU|?Vu;9_6_(jd$M#Ed}948)`W1)yS(ewT<4Lu~pu1ROAg|NlQM5&Hi> U!}q-$PN58;4DYMoSA!G*00Phr@&Et; 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]