Merge pull request #972 from ousttrue/fix/unittest_textureexport_dds

Fix/unittest textureexport dds
This commit is contained in:
ousttrue
2021-05-24 18:55:46 +09:00
committed by GitHub
3 changed files with 10 additions and 10 deletions

View File

@@ -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)

View File

@@ -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]