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 4c8d172f4..c333f811c 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs @@ -45,6 +45,10 @@ #define NEWHIERARCHYWINDOWCALLBACKS #endif +#if UNITY_2019_1_OR_NEWER +#define NEW_TIMELINE_AS_PACKAGE +#endif + using UnityEngine; using UnityEditor; using System.Collections.Generic; @@ -1788,96 +1792,238 @@ namespace Spine.Unity.Editor { internal static class SpineTK2DEditorUtility { const string SPINE_TK2D_DEFINE = "SPINE_TK2D"; - static bool IsInvalidGroup (BuildTargetGroup group) { - int gi = (int)group; - return - gi == 15 || gi == 16 - || - group == BuildTargetGroup.Unknown; - } - internal static void EnableTK2D () { - bool added = false; - - DisableSpineAsmdefFiles(); - - foreach (BuildTargetGroup group in System.Enum.GetValues(typeof(BuildTargetGroup))) { - if (IsInvalidGroup(group)) - continue; - - string defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(group); - if (!defines.Contains(SPINE_TK2D_DEFINE)) { - added = true; - if (defines.EndsWith(";", System.StringComparison.Ordinal)) - defines = defines + SPINE_TK2D_DEFINE; - else - defines = defines + ";" + SPINE_TK2D_DEFINE; - - PlayerSettings.SetScriptingDefineSymbolsForGroup(group, defines); - } - } - - if (added) { - Debug.LogWarning("Setting Scripting Define Symbol " + SPINE_TK2D_DEFINE); - } else { - Debug.LogWarning("Already Set Scripting Define Symbol " + SPINE_TK2D_DEFINE); - } + SpineBuildEnvUtility.DisableSpineAsmdefFiles(); + SpineBuildEnvUtility.EnableBuildDefine(SPINE_TK2D_DEFINE); } - internal static void DisableTK2D () { - bool removed = false; + SpineBuildEnvUtility.EnableSpineAsmdefFiles(); + SpineBuildEnvUtility.DisableBuildDefine(SPINE_TK2D_DEFINE); + } + } - EnableSpineAsmdefFiles(); + public static class SpinePackageDependencyUtility + { + public enum RequestState { + NoRequestIssued = 0, + InProgress, + Success, + Failure + } - foreach (BuildTargetGroup group in System.Enum.GetValues(typeof(BuildTargetGroup))) { - if (IsInvalidGroup(group)) - continue; + #if NEW_TIMELINE_AS_PACKAGE + const string SPINE_TIMELINE_PACKAGE_DOWNLOADED_DEFINE = "SPINE_TIMELINE_PACKAGE_DOWNLOADED"; + const string TIMELINE_PACKAGE_NAME = "com.unity.timeline"; + const string TIMELINE_ASMDEF_DEPENDENCY_STRING = "\"Unity.Timeline\""; + static UnityEditor.PackageManager.Requests.AddRequest timelineRequest = null; + + /// + /// Enables Spine's Timeline components by downloading the Timeline Package in Unity 2019 and newer + /// and setting respective compile definitions once downloaded. + /// + internal static void EnableTimelineSupport () { + Debug.Log("Downloading Timeline package " + TIMELINE_PACKAGE_NAME + "."); + timelineRequest = UnityEditor.PackageManager.Client.Add(TIMELINE_PACKAGE_NAME); + // Note: unfortunately there is no callback provided, only polling support. + // So polling HandlePendingAsyncTimelineRequest() is necessary. - string defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(group); - if (defines.Contains(SPINE_TK2D_DEFINE)) { - removed = true; - if (defines.Contains(SPINE_TK2D_DEFINE + ";")) - defines = defines.Replace(SPINE_TK2D_DEFINE + ";", ""); - else - defines = defines.Replace(SPINE_TK2D_DEFINE, ""); + EditorApplication.update -= UpdateAsyncTimelineRequest; + EditorApplication.update += UpdateAsyncTimelineRequest; + } - PlayerSettings.SetScriptingDefineSymbolsForGroup(group, defines); + public static void UpdateAsyncTimelineRequest () { + HandlePendingAsyncTimelineRequest(); + } + + public static RequestState HandlePendingAsyncTimelineRequest () { + if (timelineRequest == null) + return RequestState.NoRequestIssued; + + var status = timelineRequest.Status; + if (status == UnityEditor.PackageManager.StatusCode.InProgress) { + return RequestState.InProgress; + } + else { + EditorApplication.update -= UpdateAsyncTimelineRequest; + timelineRequest = null; + if (status == UnityEditor.PackageManager.StatusCode.Failure) { + Debug.LogError("Download of package " + TIMELINE_PACKAGE_NAME + " failed!"); + return RequestState.Failure; + } + else { // status == UnityEditor.PackageManager.StatusCode.Success + HandleSuccessfulTimelinePackageDownload(); + return RequestState.Success; } } + } - if (removed) { - Debug.LogWarning("Removing Scripting Define Symbol " + SPINE_TK2D_DEFINE); - } else { - Debug.LogWarning("Already Removed Scripting Define Symbol " + SPINE_TK2D_DEFINE); + internal static void DisableTimelineSupport () { + SpineBuildEnvUtility.DisableBuildDefine(SPINE_TIMELINE_PACKAGE_DOWNLOADED_DEFINE); + SpineBuildEnvUtility.RemoveDependencyFromAsmdefFile(TIMELINE_ASMDEF_DEPENDENCY_STRING); + } + + internal static void HandleSuccessfulTimelinePackageDownload () { + + SpineBuildEnvUtility.AddDependencyToAsmdefFile(TIMELINE_ASMDEF_DEPENDENCY_STRING); + SpineBuildEnvUtility.EnableBuildDefine(SPINE_TIMELINE_PACKAGE_DOWNLOADED_DEFINE); + } + #endif + } + } + + public static class SpineBuildEnvUtility + { + static bool IsInvalidGroup (BuildTargetGroup group) { + int gi = (int)group; + return + gi == 15 || gi == 16 + || + group == BuildTargetGroup.Unknown; + } + + public static bool EnableBuildDefine (string define) { + + bool wasDefineAdded = false; + Debug.LogWarning("Please ignore errors \"PlayerSettings Validation: Requested build target group doesn't exist\" below"); + foreach (BuildTargetGroup group in System.Enum.GetValues(typeof(BuildTargetGroup))) { + if (IsInvalidGroup(group)) + continue; + + string defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(group); + if (!defines.Contains(define)) { + wasDefineAdded = true; + if (defines.EndsWith(";", System.StringComparison.Ordinal)) + defines += define; + else + defines += ";" + define; + + PlayerSettings.SetScriptingDefineSymbolsForGroup(group, defines); + } + } + Debug.LogWarning("Please ignore errors \"PlayerSettings Validation: Requested build target group doesn't exist\" above"); + + if (wasDefineAdded) { + Debug.LogWarning("Setting Scripting Define Symbol " + define); + } + else { + Debug.LogWarning("Already Set Scripting Define Symbol " + define); + } + return wasDefineAdded; + } + + public static bool DisableBuildDefine (string define) { + + bool wasDefineRemoved = false; + foreach (BuildTargetGroup group in System.Enum.GetValues(typeof(BuildTargetGroup))) { + if (IsInvalidGroup(group)) + continue; + + string defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(group); + if (defines.Contains(define)) { + wasDefineRemoved = true; + if (defines.Contains(define + ";")) + defines = defines.Replace(define + ";", ""); + else + defines = defines.Replace(define, ""); + + PlayerSettings.SetScriptingDefineSymbolsForGroup(group, defines); } } - internal static void DisableSpineAsmdefFiles() { - SetAsmdefFileActive("spine-unity-editor", false); - SetAsmdefFileActive("spine-unity", false); + if (wasDefineRemoved) { + Debug.LogWarning("Removing Scripting Define Symbol " + define); } - - internal static void EnableSpineAsmdefFiles() { - SetAsmdefFileActive("spine-unity-editor", true); - SetAsmdefFileActive("spine-unity", true); + else { + Debug.LogWarning("Already Removed Scripting Define Symbol " + define); } + return wasDefineRemoved; + } - internal static void SetAsmdefFileActive(string filename, bool setActive) { + public static void DisableSpineAsmdefFiles () { + SetAsmdefFileActive("spine-unity-editor", false); + SetAsmdefFileActive("spine-unity", false); + } - string typeSearchString = setActive ? " t:TextAsset" : " t:AssemblyDefinitionAsset"; - string[] guids = AssetDatabase.FindAssets(filename + typeSearchString); - foreach (string guid in guids) { - string currentPath = AssetDatabase.GUIDToAssetPath(guid); - string targetPath = System.IO.Path.ChangeExtension(currentPath, setActive ? "asmdef" : "txt"); - if (System.IO.File.Exists(currentPath) && !System.IO.File.Exists(targetPath)) { - System.IO.File.Copy(currentPath, targetPath); - System.IO.File.Copy(currentPath + ".meta", targetPath + ".meta"); - } - AssetDatabase.DeleteAsset(currentPath); + public static void EnableSpineAsmdefFiles () { + SetAsmdefFileActive("spine-unity-editor", true); + SetAsmdefFileActive("spine-unity", true); + } + + public static void AddDependencyToAsmdefFile (string dependencyName) { + string asmdefName = "spine-unity"; + string filePath = FindAsmdefFile(asmdefName); + if (string.IsNullOrEmpty(filePath)) + return; + + if (System.IO.File.Exists(filePath)) { + string fileContent = File.ReadAllText(filePath); + // this simple implementation shall suffice for now. + if (!fileContent.Contains(dependencyName)) { + fileContent = fileContent.Replace(@"""references"": [", + @"""references"": [" + dependencyName); + File.WriteAllText(filePath, fileContent); } } } + + public static void RemoveDependencyFromAsmdefFile (string dependencyName) { + string asmdefName = "spine-unity"; + string filePath = FindAsmdefFile(asmdefName); + if (string.IsNullOrEmpty(filePath)) + return; + + if (System.IO.File.Exists(filePath)) { + string fileContent = File.ReadAllText(filePath); + // this simple implementation shall suffice for now. + if (fileContent.Contains(dependencyName)) { + fileContent = fileContent.Replace(dependencyName, ""); + File.WriteAllText(filePath, fileContent); + } + } + } + + internal static string FindAsmdefFile (string filename) { + string filePath = FindAsmdefFile(filename, isDisabledFile: false); + if (string.IsNullOrEmpty(filePath)) + filePath = FindAsmdefFile(filename, isDisabledFile: true); + return filePath; + } + + internal static string FindAsmdefFile (string filename, bool isDisabledFile) { + + string typeSearchString = isDisabledFile ? " t:TextAsset" : " t:AssemblyDefinitionAsset"; + string extension = isDisabledFile ? ".txt" : ".asmdef"; + string filenameWithExtension = filename + (isDisabledFile ? ".txt" : ".asmdef"); + string[] guids = AssetDatabase.FindAssets(filename + typeSearchString); + foreach (string guid in guids) { + string currentPath = AssetDatabase.GUIDToAssetPath(guid); + if (!string.IsNullOrEmpty(currentPath)) { + if (System.IO.Path.GetFileName(currentPath) == filenameWithExtension) + return currentPath; + } + } + return null; + } + + internal static void SetAsmdefFileActive (string filename, bool setActive) { + + string typeSearchString = setActive ? " t:TextAsset" : " t:AssemblyDefinitionAsset"; + string extensionBeforeChange = setActive ? "txt" : "asmdef"; + string[] guids = AssetDatabase.FindAssets(filename + typeSearchString); + foreach (string guid in guids) { + string currentPath = AssetDatabase.GUIDToAssetPath(guid); + if (!System.IO.Path.HasExtension(extensionBeforeChange)) // asmdef is also found as t:TextAsset, so check + continue; + + string targetPath = System.IO.Path.ChangeExtension(currentPath, setActive ? "asmdef" : "txt"); + if (System.IO.File.Exists(currentPath) && !System.IO.File.Exists(targetPath)) { + System.IO.File.Copy(currentPath, targetPath); + System.IO.File.Copy(currentPath + ".meta", targetPath + ".meta"); + } + AssetDatabase.DeleteAsset(currentPath); + } + } } public class TextureModificationWarningProcessor : UnityEditor.AssetModificationProcessor diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline/Editor/SpineSkeletonFlipDrawer.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline/Editor/SpineSkeletonFlipDrawer.cs index 5faa97b1c..398a8b213 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline/Editor/SpineSkeletonFlipDrawer.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline/Editor/SpineSkeletonFlipDrawer.cs @@ -27,7 +27,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if UNITY_2017 || UNITY_2018 +#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) using UnityEditor; using UnityEngine; using UnityEngine.Playables; @@ -53,4 +53,4 @@ public class SpineSkeletonFlipDrawer : PropertyDrawer EditorGUI.PropertyField(singleFieldRect, flipYProp); } } -#endif +#endif \ No newline at end of file diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/PlayableHandle Component/SkeletonAnimationPlayableHandle.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/PlayableHandle Component/SkeletonAnimationPlayableHandle.cs index d43d4f24d..a16737d34 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/PlayableHandle Component/SkeletonAnimationPlayableHandle.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/PlayableHandle Component/SkeletonAnimationPlayableHandle.cs @@ -58,7 +58,7 @@ namespace Spine.Unity.Playables { public override Skeleton Skeleton { get { return skeletonAnimation.Skeleton; } } public override SkeletonData SkeletonData { get { return skeletonAnimation.Skeleton.data; } } - #if UNITY_2017 || UNITY_2018 + #if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) void Awake () { if (skeletonAnimation == null) skeletonAnimation = GetComponent(); diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateBehaviour.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateBehaviour.cs index ef5fd73ca..8bafb2118 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateBehaviour.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateBehaviour.cs @@ -27,7 +27,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if UNITY_2017 || UNITY_2018 +#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) using System; using UnityEngine; using UnityEngine.Playables; diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateClip.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateClip.cs index 8b68f559f..f3b6c175d 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateClip.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateClip.cs @@ -27,7 +27,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if UNITY_2017 || UNITY_2018 +#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) using System; using UnityEngine; using UnityEngine.Playables; diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs index 35980fb38..5b12f920a 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs @@ -29,7 +29,7 @@ #define SPINE_EDITMODEPOSE -#if UNITY_2017 || UNITY_2018 +#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) using System; using UnityEngine; using UnityEngine.Playables; diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateTrack.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateTrack.cs index 13058b8d3..a3d282227 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateTrack.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateTrack.cs @@ -27,7 +27,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if UNITY_2017 || UNITY_2018 +#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) using UnityEngine; using UnityEngine.Playables; using UnityEngine.Timeline; diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipBehaviour.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipBehaviour.cs index 749c936ec..a4eaae0ea 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipBehaviour.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipBehaviour.cs @@ -27,7 +27,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if UNITY_2017 || UNITY_2018 +#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) using System; using UnityEngine; using UnityEngine.Playables; @@ -37,4 +37,4 @@ using UnityEngine.Timeline; public class SpineSkeletonFlipBehaviour : PlayableBehaviour { public bool flipX, flipY; } -#endif +#endif \ No newline at end of file diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipClip.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipClip.cs index 95bf4f808..a570758e9 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipClip.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipClip.cs @@ -27,7 +27,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if UNITY_2017 || UNITY_2018 +#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) using System; using UnityEngine; using UnityEngine.Playables; diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipMixerBehaviour.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipMixerBehaviour.cs index 3573b5761..33e42f3b4 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipMixerBehaviour.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipMixerBehaviour.cs @@ -27,7 +27,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if UNITY_2017 || UNITY_2018 +#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) using System; using UnityEngine; using UnityEngine.Playables; diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipTrack.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipTrack.cs index 7c8361494..efa2a5fd1 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipTrack.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipTrack.cs @@ -27,7 +27,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if UNITY_2017 || UNITY_2018 +#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) using UnityEngine; using UnityEngine.Playables; using UnityEngine.Timeline;