UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 09:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed AtlasUtilities texture clone not copying wrap mode or filter mode. Closes #1478.

Browse Source
This commit is contained in:
Harald Csaszar 2019-09-24 15:48:59 +02:00
parent 5cb9afd2fa
commit 12ca54ab5e
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AtlasUtilities.cs
View File

@ -269,7 +269,8 @@ namespace Spine.Unity.AttachmentTools {
newTexture.name = newAssetName; newTexture.name = newAssetName;
// Copy settings // Copy settings
if (texturesToPack.Count > 0) { if (texturesToPack.Count > 0) {
newTexture.anisoLevel = texturesToPack[0].anisoLevel; var sourceTexture = texturesToPack[0];
newTexture.CopyTextureAttributesFrom(sourceTexture);
} }
var rects = newTexture.PackTextures(texturesToPack.ToArray(), padding, maxAtlasSize); var rects = newTexture.PackTextures(texturesToPack.ToArray(), padding, maxAtlasSize);
@ -362,7 +363,11 @@ namespace Spine.Unity.AttachmentTools {
// Fill a new texture with the collected attachment textures. // Fill a new texture with the collected attachment textures.
var newTexture = new Texture2D(maxAtlasSize, maxAtlasSize, textureFormat, mipmaps); var newTexture = new Texture2D(maxAtlasSize, maxAtlasSize, textureFormat, mipmaps);
newTexture.mipMapBias = AtlasUtilities.DefaultMipmapBias; newTexture.mipMapBias = AtlasUtilities.DefaultMipmapBias;
newTexture.anisoLevel = texturesToPack[0].anisoLevel;
if (texturesToPack.Count > 0) {
var sourceTexture = texturesToPack[0];
newTexture.CopyTextureAttributesFrom(sourceTexture);
}
newTexture.name = newName; newTexture.name = newName;
var rects = newTexture.PackTextures(texturesToPack.ToArray(), padding, maxAtlasSize); var rects = newTexture.PackTextures(texturesToPack.ToArray(), padding, maxAtlasSize);
@ -428,6 +433,7 @@ namespace Spine.Unity.AttachmentTools {
int width = (int)r.width; int width = (int)r.width;
int height = (int)r.height; int height = (int)r.height;
output = new Texture2D(width, height, textureFormat, mipmaps) { name = ar.name }; output = new Texture2D(width, height, textureFormat, mipmaps) { name = ar.name };
output.CopyTextureAttributesFrom(sourceTexture);
AtlasUtilities.CopyTexture(sourceTexture, r, output); AtlasUtilities.CopyTexture(sourceTexture, r, output);
CachedRegionTextures.Add(ar, output); CachedRegionTextures.Add(ar, output);
CachedRegionTexturesList.Add(output); CachedRegionTexturesList.Add(output);
@ -440,12 +446,14 @@ namespace Spine.Unity.AttachmentTools {
var spriteTexture = s.texture; var spriteTexture = s.texture;
var r = s.textureRect; var r = s.textureRect;
var newTexture = new Texture2D((int)r.width, (int)r.height, textureFormat, mipmaps); var newTexture = new Texture2D((int)r.width, (int)r.height, textureFormat, mipmaps);
newTexture.CopyTextureAttributesFrom(spriteTexture);
AtlasUtilities.CopyTexture(spriteTexture, r, newTexture); AtlasUtilities.CopyTexture(spriteTexture, r, newTexture);
return newTexture; return newTexture;
} }
static Texture2D GetClone (this Texture2D t, TextureFormat textureFormat = SpineTextureFormat, bool mipmaps = UseMipMaps) { static Texture2D GetClone (this Texture2D t, TextureFormat textureFormat = SpineTextureFormat, bool mipmaps = UseMipMaps) {
var newTexture = new Texture2D((int)t.width, (int)t.height, textureFormat, mipmaps); var newTexture = new Texture2D((int)t.width, (int)t.height, textureFormat, mipmaps);
newTexture.CopyTextureAttributesFrom(t);
AtlasUtilities.CopyTexture(t, new Rect(0, 0, t.width, t.height), newTexture); AtlasUtilities.CopyTexture(t, new Rect(0, 0, t.width, t.height), newTexture);
return newTexture; return newTexture;
} }
@ -566,6 +574,15 @@ namespace Spine.Unity.AttachmentTools {
return material.mainTexture as Texture2D; return material.mainTexture as Texture2D;
} }
static void CopyTextureAttributesFrom(this Texture2D destination, Texture2D source) {
destination.filterMode = source.filterMode;
destination.anisoLevel = source.anisoLevel;
destination.alphaIsTransparency = source.alphaIsTransparency;
destination.wrapModeU = source.wrapModeU;
destination.wrapModeV = source.wrapModeV;
destination.wrapModeW = source.wrapModeW;
}
static void ApplyPMA (this Texture2D texture, bool applyImmediately = true) { static void ApplyPMA (this Texture2D texture, bool applyImmediately = true) {
var pixels = texture.GetPixels(); var pixels = texture.GetPixels();
for (int i = 0, n = pixels.Length; i < n; i++) { for (int i = 0, n = pixels.Length; i < n; i++) {