UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-10 00:58:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Removed limitation of not importing assets from the Packages directory which caused problems on Unity 2019.1, but no longer on 2019.4. Closes #1924.

Browse Source
This commit is contained in:
Harald Csaszar 2021-07-14 12:36:51 +02:00
parent ba07ea9f91
commit 2b3d395e51
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs
View File

@ -47,6 +47,10 @@
#define EXPOSES_SPRITE_ATLAS_UTILITIES
#endif
#if !UNITY_2019_4_OR_NEWER
#define PROBLEMATIC_PACKAGE_ASSET_MODIFICATION
#endif
using UnityEngine;
using UnityEditor;
using System.Collections.Generic;
@ -313,8 +317,10 @@ namespace Spine.Unity.Editor {
// Import atlases first.
var newAtlases = new List<AtlasAssetBase>();
foreach (string ap in atlasPaths) {
#if PROBLEMATIC_PACKAGE_ASSET_MODIFICATION
if (ap.StartsWith("Packages"))
continue;
#endif
TextAsset atlasText = AssetDatabase.LoadAssetAtPath<TextAsset>(ap);
AtlasAssetBase atlas = IngestSpineAtlas(atlasText, texturesWithoutMetaFile);
newAtlases.Add(atlas);
@ -327,8 +333,10 @@ namespace Spine.Unity.Editor {
string skeletonPath = skeletonPathEntry.path;
var compatibilityProblems = skeletonPathEntry.compatibilityProblems;
string otherProblemDescription = skeletonPathEntry.otherProblemDescription;
#if PROBLEMATIC_PACKAGE_ASSET_MODIFICATION
if (skeletonPath.StartsWith("Packages"))
continue;
#endif
if (!reimport && CheckForValidSkeletonData(skeletonPath)) {
ReloadSkeletonData(skeletonPath, compatibilityProblems);
continue;
@ -617,7 +625,7 @@ namespace Spine.Unity.Editor {
}
public static bool SpriteAtlasSettingsNeedAdjustment (UnityEngine.U2D.SpriteAtlas spriteAtlas) {
#if EXPOSES_SPRITE_ATLAS_UTILITIES
#if EXPOSES_SPRITE_ATLAS_UTILITIES
UnityEditor.U2D.SpriteAtlasPackingSettings packingSettings = UnityEditor.U2D.SpriteAtlasExtensions.GetPackingSettings(spriteAtlas);
UnityEditor.U2D.SpriteAtlasTextureSettings textureSettings = UnityEditor.U2D.SpriteAtlasExtensions.GetTextureSettings(spriteAtlas);
@ -628,13 +636,13 @@ namespace Spine.Unity.Editor {
textureSettings.generateMipMaps == false;
// note: platformSettings.textureCompression is always providing "Compressed", so we have to skip it.
return !areSettingsAsDesired;
#else
#else
return false;
#endif
#endif
}
public static bool AdjustSpriteAtlasSettings (UnityEngine.U2D.SpriteAtlas spriteAtlas) {
#if EXPOSES_SPRITE_ATLAS_UTILITIES
#if EXPOSES_SPRITE_ATLAS_UTILITIES
UnityEditor.U2D.SpriteAtlasPackingSettings packingSettings = UnityEditor.U2D.SpriteAtlasExtensions.GetPackingSettings(spriteAtlas);
UnityEditor.U2D.SpriteAtlasTextureSettings textureSettings = UnityEditor.U2D.SpriteAtlasExtensions.GetTextureSettings(spriteAtlas);
@ -654,9 +662,9 @@ namespace Spine.Unity.Editor {
string atlasPath = AssetDatabase.GetAssetPath(spriteAtlas);
Debug.Log(string.Format("Adjusted unsuitable SpriteAtlas settings '{0}'", atlasPath), spriteAtlas);
return false;
#else
#else
return true;
#endif
#endif
}
public static bool GeneratePngFromSpriteAtlas (UnityEngine.U2D.SpriteAtlas spriteAtlas, out string texturePath) {