From 2d5cc4a460df7839c41c5bcfc6af827978d8ad37 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Mon, 8 Jul 2019 16:30:33 +0200 Subject: [PATCH] [unity] Changed default sRGBTexture attribute at spine atlas texture import back to true. This creates consistent and correct look in linear and gamma color space which is more important than rare mipmap problems. The potential problem of incorrectly generated mipmaps at pma textures will be reported by warning message, no longer prevented via default settings. --- .../Spine Examples/Spine Skeletons/Dragon/dragon.png.meta | 2 +- .../Spine Skeletons/Dragon/dragon2.png.meta | 2 +- .../Spine Examples/Spine Skeletons/Eyes/eyes.png.meta | 2 +- .../FootSoldier/Equipment/Equipment.png.meta | 2 +- .../Spine Skeletons/FootSoldier/FS_White.png.meta | 2 +- .../Spine Examples/Spine Skeletons/Gauge/Gauge.png.meta | 2 +- .../Spine Skeletons/Goblins/goblins.png.meta | 2 +- .../Spine Examples/Spine Skeletons/Hero/hero-pro.png.meta | 2 +- .../Raggedy Spineboy/Raggedy Spineboy.png.meta | 2 +- .../Spine Examples/Spine Skeletons/Raptor/raptor.png.meta | 2 +- .../Spine Skeletons/Spineunitygirl/Doi.png.meta | 2 +- .../Stretchyman/stretchyman-diffuse-pma.png.meta | 2 +- .../Spine Skeletons/spineboy-pro/spineboy-pro.png.meta | 2 +- .../Spine Skeletons/spineboy-unity/spineboy.png.meta | 2 +- .../whirlyblendmodes/whirlyblendmodes.png.meta | 2 +- .../Editor/spine-unity/Editor/SpineEditorUtilities.cs | 8 ++------ 16 files changed, 17 insertions(+), 21 deletions(-) diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.png.meta index 7dd533ed4..78249580c 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.png.meta +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.png.meta @@ -29,7 +29,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon2.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon2.png.meta index 669b2c753..265d56e45 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon2.png.meta +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon2.png.meta @@ -27,7 +27,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.png.meta index de9b14ba7..619633917 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.png.meta +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment.png.meta index 58a7db054..7a557cfc2 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment.png.meta +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment.png.meta @@ -12,7 +12,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png.meta index 43704126b..9a1c0a059 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png.meta +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.png.meta index 412ca51e3..85b6f3937 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.png.meta +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.png.meta index d36868930..e339d59aa 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.png.meta +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.png.meta index bb4d9cd0c..d872e8a1f 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.png.meta +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png.meta index 36ce0e803..9480b8230 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png.meta +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.png.meta index f01337f17..7e61d75f1 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.png.meta +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.png.meta @@ -43,7 +43,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png.meta index 37cc6f853..db48e102b 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png.meta +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.png.meta index 13290da3e..ca5e5cc8a 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.png.meta +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png.meta index 101831287..4bce8babc 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png.meta +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png.meta index 228c6061a..b6f7a55c3 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png.meta +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png.meta @@ -35,7 +35,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png.meta index 4bae9ece8..349b06520 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png.meta +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs index facc85c01..551267632 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs @@ -320,8 +320,8 @@ namespace Spine.Unity.Editor { // 'sRGBTexture = true' generates incorrectly weighted mipmaps at PMA textures, // causing white borders due to undesired custom weighting. - if (texImporter.sRGBTexture && texImporter.mipmapEnabled) { - Debug.LogWarningFormat("`{0}` : Incorrect Texture Settings found: When enabling `Generate Mip Maps`, it is strongly recommended to disable `sRGB (Color Texture)`. Otherwise you will receive white border artifacts on an atlas exported with default `Premultiply alpha` settings.\n(You can disable this warning in `Edit - Preferences - Spine`)", texturePath); + if (texImporter.sRGBTexture && texImporter.mipmapEnabled && PlayerSettings.colorSpace == ColorSpace.Gamma) { + Debug.LogWarningFormat("`{0}` : Problematic Texture Settings found: When enabling `Generate Mip Maps` in Gamma color space, it is recommended to disable `sRGB (Color Texture)`. Otherwise you will receive white border artifacts on an atlas exported with default `Premultiply alpha` settings.\n(You can disable this warning in `Edit - Preferences - Spine`)", texturePath); } if (texImporter.alphaIsTransparency) { int straightAlphaValue = material.GetInt(STRAIGHT_ALPHA_PARAM_ID); @@ -1038,10 +1038,6 @@ namespace Spine.Unity.Editor { continue; } - // Note: 'sRGBTexture = false' below might seem counter-intuitive, but prevents mipmaps from being - // generated incorrectly (causing white borders due to undesired custom weighting) for PMA textures - // when mipmaps are enabled later. - texImporter.sRGBTexture = false; texImporter.textureCompression = TextureImporterCompression.Uncompressed; texImporter.alphaSource = TextureImporterAlphaSource.FromInput; texImporter.mipmapEnabled = false;