فهرست منبع

Merge branch '3.8-beta' of https://github.com/EsotericSoftware/spine-runtimes into 3.8-beta

badlogic 6 سال پیش
والد
کامیت
7f9617a50b
16فایلهای تغییر یافته به همراه17 افزوده شده و 21 حذف شده
  1. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.png.meta
  2. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon2.png.meta
  3. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.png.meta
  4. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment.png.meta
  5. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png.meta
  6. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.png.meta
  7. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.png.meta
  8. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.png.meta
  9. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png.meta
  10. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.png.meta
  11. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png.meta
  12. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.png.meta
  13. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png.meta
  14. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png.meta
  15. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png.meta
  16. 2 6
      spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 2 - 6
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;