From d89dca1e47fad2f9d8f46f4d1b74a74f46e435dc Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Wed, 19 May 2021 17:27:48 +0900 Subject: [PATCH] mv texture --- .../Tests/{4x4.png => 4x4_non_readable.png} | Bin ...4x4.png.meta => 4x4_non_readable.png.meta} | 0 ...ed.DDS => 4x4_non_readable_compressed.DDS} | Bin ...a => 4x4_non_readable_compressed.DDS.meta} | 0 .../GLTF/IO/Tests/CopyTextureTests.cs | 18 +++++++++--------- .../GLTF/IO/Tests/TextureBytesTests.cs | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) rename Assets/VRMShaders/GLTF/IO/Tests/{4x4.png => 4x4_non_readable.png} (100%) rename Assets/VRMShaders/GLTF/IO/Tests/{4x4.png.meta => 4x4_non_readable.png.meta} (100%) rename Assets/VRMShaders/GLTF/IO/Tests/{4x4compressed.DDS => 4x4_non_readable_compressed.DDS} (100%) rename Assets/VRMShaders/GLTF/IO/Tests/{4x4compressed.DDS.meta => 4x4_non_readable_compressed.DDS.meta} (100%) diff --git a/Assets/VRMShaders/GLTF/IO/Tests/4x4.png b/Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable.png similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Tests/4x4.png rename to Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable.png diff --git a/Assets/VRMShaders/GLTF/IO/Tests/4x4.png.meta b/Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable.png.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Tests/4x4.png.meta rename to Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable.png.meta diff --git a/Assets/VRMShaders/GLTF/IO/Tests/4x4compressed.DDS b/Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable_compressed.DDS similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Tests/4x4compressed.DDS rename to Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable_compressed.DDS diff --git a/Assets/VRMShaders/GLTF/IO/Tests/4x4compressed.DDS.meta b/Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable_compressed.DDS.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Tests/4x4compressed.DDS.meta rename to Assets/VRMShaders/GLTF/IO/Tests/4x4_non_readable_compressed.DDS.meta diff --git a/Assets/VRMShaders/GLTF/IO/Tests/CopyTextureTests.cs b/Assets/VRMShaders/GLTF/IO/Tests/CopyTextureTests.cs index a5a69b284..cf2a832c0 100644 --- a/Assets/VRMShaders/GLTF/IO/Tests/CopyTextureTests.cs +++ b/Assets/VRMShaders/GLTF/IO/Tests/CopyTextureTests.cs @@ -9,11 +9,11 @@ namespace VRMShaders public sealed class CopyTextureTests { private static string AssetPath = "Assets/VRMShaders/GLTF/IO/Tests"; - + private static readonly Color32 Black = new Color32(0, 0, 0, 255); private static readonly Color32 Gray = new Color32(127, 127, 127, 255); private static readonly Color32 White = new Color32(255, 255, 255, 255); - + private static readonly Color32[] PngTextureValues = new Color32[] { White, White, White, White, @@ -21,12 +21,12 @@ namespace VRMShaders Gray, Gray, Gray, Gray, 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); - + private static readonly Color32[] DdsTextureValues = new Color32[] { CompressedBlack, CompressedBlack, CompressedBlack, CompressedBlack, @@ -34,11 +34,11 @@ namespace VRMShaders CompressedGray, CompressedGray, CompressedGray, CompressedGray, CompressedWhite, CompressedWhite, CompressedWhite, CompressedWhite, }; - + [Test] public void CopyFromNonReadableSRgbPng() { - var nonReadableTex = AssetDatabase.LoadAssetAtPath($"{AssetPath}/4x4.png"); + var nonReadableTex = AssetDatabase.LoadAssetAtPath($"{AssetPath}/4x4_non_readable.png"); Assert.False(nonReadableTex.isReadable); var copiedTex = TextureConverter.CopyTexture(nonReadableTex, ColorSpace.sRGB, null); var pixels = copiedTex.GetPixels32(miplevel: 0); @@ -48,11 +48,11 @@ namespace VRMShaders Assert.AreEqual(PngTextureValues[idx], pixels[idx]); } } - + [Test] public void CopyFromNonReadableSRgbDds() { - var compressedTex = AssetDatabase.LoadAssetAtPath($"{AssetPath}/4x4compressed.dds"); + var compressedTex = AssetDatabase.LoadAssetAtPath($"{AssetPath}/4x4_non_readable_compressed.dds"); Assert.False(compressedTex.isReadable); var copiedTex = TextureConverter.CopyTexture(compressedTex, ColorSpace.sRGB, null); var pixels = copiedTex.GetPixels32(miplevel: 0); @@ -63,4 +63,4 @@ namespace VRMShaders } } } -} \ No newline at end of file +} diff --git a/Assets/VRMShaders/GLTF/IO/Tests/TextureBytesTests.cs b/Assets/VRMShaders/GLTF/IO/Tests/TextureBytesTests.cs index e22afe166..f425ba3e0 100644 --- a/Assets/VRMShaders/GLTF/IO/Tests/TextureBytesTests.cs +++ b/Assets/VRMShaders/GLTF/IO/Tests/TextureBytesTests.cs @@ -12,7 +12,7 @@ namespace VRMShaders [Test] public void NonReadablePng() { - var nonReadableTex = AssetDatabase.LoadAssetAtPath($"{AssetPath}/4x4.png"); + var nonReadableTex = AssetDatabase.LoadAssetAtPath($"{AssetPath}/4x4_non_readable.png"); Assert.False(nonReadableTex.isReadable); var (bytes, mime) = AssetTextureUtil.GetTextureBytesWithMime(nonReadableTex, ColorSpace.sRGB); Assert.NotNull(bytes); @@ -21,7 +21,7 @@ namespace VRMShaders [Test] public void NonReadableDds() { - var readonlyTexture = AssetDatabase.LoadAssetAtPath($"{AssetPath}/4x4compressed.dds"); + var readonlyTexture = AssetDatabase.LoadAssetAtPath($"{AssetPath}/4x4_non_readable_compressed.dds"); Assert.False(readonlyTexture.isReadable); var (bytes, mime) = AssetTextureUtil.GetTextureBytesWithMime(readonlyTexture, ColorSpace.sRGB); Assert.NotNull(bytes);