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

Merge branch '4.0' into 4.1-beta

Browse Source
This commit is contained in:
Harald Csaszar 2022-02-10 17:06:28 +01:00
commit 684693fd1c
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,6 +213,14 @@ namespace Spine.Unity.Editor {
binary = null;
}
internal static AtlasAssetBase GetMatchingAtlas (List<string> requiredPaths, string skeletonName,
List<AtlasAssetBase> atlasAssets) {
atlasAssets.Sort((a, b) => (
string.CompareOrdinal(b.name, skeletonName)
- string.CompareOrdinal(a.name, skeletonName)));
return GetMatchingAtlas(requiredPaths, atlasAssets);
}
internal static AtlasAssetBase GetMatchingAtlas (List<string> requiredPaths, List<AtlasAssetBase> atlasAssets) {
AtlasAssetBase atlasAssetMatch = null;
@ -384,13 +392,30 @@ namespace Spine.Unity.Editor {
IngestSpineProject(loadedAsset, null);
#else
string skeletonName = Path.GetFileNameWithoutExtension(skeletonPath);
var atlasesForSkeleton = FindAtlasesAtPath(dir);
List<string> requiredPaths = GetRequiredAtlasRegions(skeletonPath);
List<AtlasAssetBase> atlasesForSkeleton = FindAtlasesAtPath(dir);
atlasesForSkeleton = atlasesForSkeleton.Union(newAtlases).ToList();
var requiredPaths = GetRequiredAtlasRegions(skeletonPath);
atlasesForSkeleton.Sort((a, b) => (
string.CompareOrdinal(b.name, skeletonName)
- string.CompareOrdinal(a.name, skeletonName)));
var atlasMatch = GetMatchingAtlas(requiredPaths, atlasesForSkeleton);
List<AtlasAssetBase> atlasesInSameDir = atlasesForSkeleton.Where(
atlas => AssetDatabase.GetAssetPath(atlas).Contains(dir)).ToList();
AtlasAssetBase atlasMatch = GetMatchingAtlas(requiredPaths, skeletonName, atlasesInSameDir);
if (atlasMatch == null && atlasesInSameDir.Count > 0) {
AtlasAssetBase firstAtlas = atlasesInSameDir[0];
Debug.LogWarning(string.Format(
"'{0}' atlas found in skeleton directory does not contain all required attachments",
firstAtlas.name), firstAtlas);
List<AtlasAssetBase> atlasesInOtherDir = atlasesForSkeleton.Except(atlasesInSameDir).ToList();
atlasMatch = GetMatchingAtlas(requiredPaths, skeletonName, atlasesInOtherDir);
if (atlasMatch != null) {
Debug.Log(string.Format(
"Using suitable atlas '{0}' of other imported directory. If this is the " +
"wrong atlas asset, please assign the correct one at the SkeletonData asset.",
atlasMatch.name), atlasMatch);
}
}
if (atlasMatch != null || requiredPaths.Count == 0) {
IngestSpineProject(loadedAsset, atlasMatch);
} else {