diff --git a/spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/AnimationMatchModifierAsset.cs b/spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/AnimationMatchModifierAsset.cs index 991054d75..01840de95 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/AnimationMatchModifierAsset.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/AnimationMatchModifierAsset.cs @@ -43,7 +43,7 @@ namespace Spine.Unity.Examples { public override void Apply (SkeletonData skeletonData) { if (matchAllAnimations) - AnimationTools.MatchAnimationTimelines(skeletonData.animations, skeletonData); + AnimationTools.MatchAnimationTimelines(skeletonData.Animations, skeletonData); } public static class AnimationTools { @@ -63,7 +63,7 @@ namespace Spine.Unity.Examples { // and a collection of dummy timelines that can be used to fill-in missing items. var timelineDictionary = new Dictionary(); foreach (var animation in animations) { - foreach (var timeline in animation.timelines) { + foreach (var timeline in animation.Timelines) { if (timeline is EventTimeline) continue; int propertyID = timeline.PropertyId; @@ -78,12 +78,12 @@ namespace Spine.Unity.Examples { var currentAnimationIDs = new HashSet(); foreach (var animation in animations) { currentAnimationIDs.Clear(); - foreach (var timeline in animation.timelines) { + foreach (var timeline in animation.Timelines) { if (timeline is EventTimeline) continue; currentAnimationIDs.Add(timeline.PropertyId); } - var animationTimelines = animation.timelines; + var animationTimelines = animation.Timelines; foreach (int propertyID in idsToMatch) { if (!currentAnimationIDs.Contains(propertyID)) animationTimelines.Add(timelineDictionary[propertyID]); @@ -100,116 +100,98 @@ namespace Spine.Unity.Examples { } static Timeline GetFillerTimeline (Timeline timeline, SkeletonData skeletonData) { - int propertyID = timeline.PropertyId; - int tt = propertyID >> 24; - var timelineType = (TimelineType)tt; - - switch (timelineType) { - // Bone - case TimelineType.Rotate: - return GetFillerTimeline((RotateTimeline)timeline, skeletonData); - case TimelineType.Translate: - return GetFillerTimeline((TranslateTimeline)timeline, skeletonData); - case TimelineType.Scale: - return GetFillerTimeline((ScaleTimeline)timeline, skeletonData); - case TimelineType.Shear: - return GetFillerTimeline((ShearTimeline)timeline, skeletonData); - - // Slot - case TimelineType.Attachment: - return GetFillerTimeline((AttachmentTimeline)timeline, skeletonData); - case TimelineType.Color: - return GetFillerTimeline((ColorTimeline)timeline, skeletonData); - case TimelineType.TwoColor: - return GetFillerTimeline((TwoColorTimeline)timeline, skeletonData); - case TimelineType.Deform: - return GetFillerTimeline((DeformTimeline)timeline, skeletonData); - - // Skeleton - case TimelineType.DrawOrder: - return GetFillerTimeline((DrawOrderTimeline)timeline, skeletonData); - - // IK Constraint - case TimelineType.IkConstraint: - return GetFillerTimeline((IkConstraintTimeline)timeline, skeletonData); - - // TransformConstraint - case TimelineType.TransformConstraint: - return GetFillerTimeline((TransformConstraintTimeline)timeline, skeletonData); - - // Path Constraint - case TimelineType.PathConstraintPosition: - return GetFillerTimeline((PathConstraintPositionTimeline)timeline, skeletonData); - case TimelineType.PathConstraintSpacing: - return GetFillerTimeline((PathConstraintSpacingTimeline)timeline, skeletonData); - case TimelineType.PathConstraintMix: - return GetFillerTimeline((PathConstraintMixTimeline)timeline, skeletonData); - } - + if (timeline is RotateTimeline) + return GetFillerTimeline((RotateTimeline)timeline, skeletonData); + if (timeline is TranslateTimeline) + return GetFillerTimeline((TranslateTimeline)timeline, skeletonData); + if (timeline is ScaleTimeline) + return GetFillerTimeline((ScaleTimeline)timeline, skeletonData); + if (timeline is ShearTimeline) + return GetFillerTimeline((ShearTimeline)timeline, skeletonData); + if (timeline is AttachmentTimeline) + return GetFillerTimeline((AttachmentTimeline)timeline, skeletonData); + if (timeline is ColorTimeline) + return GetFillerTimeline((ColorTimeline)timeline, skeletonData); + if (timeline is TwoColorTimeline) + return GetFillerTimeline((TwoColorTimeline)timeline, skeletonData); + if (timeline is DeformTimeline) + return GetFillerTimeline((DeformTimeline)timeline, skeletonData); + if (timeline is DrawOrderTimeline) + return GetFillerTimeline((DrawOrderTimeline)timeline, skeletonData); + if (timeline is IkConstraintTimeline) + return GetFillerTimeline((IkConstraintTimeline)timeline, skeletonData); + if (timeline is TransformConstraintTimeline) + return GetFillerTimeline((TransformConstraintTimeline)timeline, skeletonData); + if (timeline is PathConstraintPositionTimeline) + return GetFillerTimeline((PathConstraintPositionTimeline)timeline, skeletonData); + if (timeline is PathConstraintSpacingTimeline) + return GetFillerTimeline((PathConstraintSpacingTimeline)timeline, skeletonData); + if (timeline is PathConstraintMixTimeline) + return GetFillerTimeline((PathConstraintMixTimeline)timeline, skeletonData); return null; } static RotateTimeline GetFillerTimeline (RotateTimeline timeline, SkeletonData skeletonData) { var t = new RotateTimeline(1); - t.boneIndex = timeline.boneIndex; + t.BoneIndex = timeline.BoneIndex; t.SetFrame(0, 0, 0); return t; } static TranslateTimeline GetFillerTimeline (TranslateTimeline timeline, SkeletonData skeletonData) { var t = new TranslateTimeline(1); - t.boneIndex = timeline.boneIndex; + t.BoneIndex = timeline.BoneIndex; t.SetFrame(0, 0, 0, 0); return t; } static ScaleTimeline GetFillerTimeline (ScaleTimeline timeline, SkeletonData skeletonData) { var t = new ScaleTimeline(1); - t.boneIndex = timeline.boneIndex; + t.BoneIndex = timeline.BoneIndex; t.SetFrame(0, 0, 0, 0); return t; } static ShearTimeline GetFillerTimeline (ShearTimeline timeline, SkeletonData skeletonData) { var t = new ShearTimeline(1); - t.boneIndex = timeline.boneIndex; + t.BoneIndex = timeline.BoneIndex; t.SetFrame(0, 0, 0, 0); return t; } static AttachmentTimeline GetFillerTimeline (AttachmentTimeline timeline, SkeletonData skeletonData) { var t = new AttachmentTimeline(1); - t.slotIndex = timeline.slotIndex; - var slotData = skeletonData.slots.Items[t.slotIndex]; - t.SetFrame(0, 0, slotData.attachmentName); + t.SlotIndex = timeline.SlotIndex; + var slotData = skeletonData.Slots.Items[t.SlotIndex]; + t.SetFrame(0, 0, slotData.AttachmentName); return t; } static ColorTimeline GetFillerTimeline (ColorTimeline timeline, SkeletonData skeletonData) { var t = new ColorTimeline(1); - t.slotIndex = timeline.slotIndex; - var slotData = skeletonData.slots.Items[t.slotIndex]; - t.SetFrame(0, 0, slotData.r, slotData.g, slotData.b, slotData.a); + t.SlotIndex = timeline.SlotIndex; + var slotData = skeletonData.Slots.Items[t.SlotIndex]; + t.SetFrame(0, 0, slotData.R, slotData.G, slotData.B, slotData.A); return t; } static TwoColorTimeline GetFillerTimeline (TwoColorTimeline timeline, SkeletonData skeletonData) { var t = new TwoColorTimeline(1); - t.slotIndex = timeline.slotIndex; - var slotData = skeletonData.slots.Items[t.slotIndex]; - t.SetFrame(0, 0, slotData.r, slotData.g, slotData.b, slotData.a, slotData.r2, slotData.g2, slotData.b2); + t.SlotIndex = timeline.SlotIndex; + var slotData = skeletonData.Slots.Items[t.SlotIndex]; + t.SetFrame(0, 0, slotData.R, slotData.G, slotData.B, slotData.A, slotData.R2, slotData.G2, slotData.B2); return t; } static DeformTimeline GetFillerTimeline (DeformTimeline timeline, SkeletonData skeletonData) { var t = new DeformTimeline(1); - t.slotIndex = timeline.slotIndex; - t.attachment = timeline.attachment; + t.SlotIndex = timeline.SlotIndex; + t.Attachment = timeline.Attachment; - if (t.attachment.IsWeighted()) { - t.SetFrame(0, 0, new float[t.attachment.vertices.Length]); + if (t.Attachment.IsWeighted()) { + t.SetFrame(0, 0, new float[t.Attachment.Vertices.Length]); } else { - t.SetFrame(0, 0, t.attachment.vertices.Clone() as float[]); + t.SetFrame(0, 0, t.Attachment.Vertices.Clone() as float[]); } return t; @@ -223,36 +205,36 @@ namespace Spine.Unity.Examples { static IkConstraintTimeline GetFillerTimeline (IkConstraintTimeline timeline, SkeletonData skeletonData) { var t = new IkConstraintTimeline(1); - var ikConstraintData = skeletonData.ikConstraints.Items[timeline.ikConstraintIndex]; - t.SetFrame(0, 0, ikConstraintData.mix, ikConstraintData.softness, ikConstraintData.bendDirection, ikConstraintData.compress, ikConstraintData.stretch); + var ikConstraintData = skeletonData.IkConstraints.Items[timeline.IkConstraintIndex]; + t.SetFrame(0, 0, ikConstraintData.Mix, ikConstraintData.Softness, ikConstraintData.BendDirection, ikConstraintData.Compress, ikConstraintData.Stretch); return t; } static TransformConstraintTimeline GetFillerTimeline (TransformConstraintTimeline timeline, SkeletonData skeletonData) { var t = new TransformConstraintTimeline(1); - var data = skeletonData.transformConstraints.Items[timeline.transformConstraintIndex]; - t.SetFrame(0, 0, data.rotateMix, data.translateMix, data.scaleMix, data.shearMix); + var data = skeletonData.TransformConstraints.Items[timeline.TransformConstraintIndex]; + t.SetFrame(0, 0, data.RotateMix, data.TranslateMix, data.ScaleMix, data.ShearMix); return t; } static PathConstraintPositionTimeline GetFillerTimeline (PathConstraintPositionTimeline timeline, SkeletonData skeletonData) { var t = new PathConstraintPositionTimeline(1); - var data = skeletonData.pathConstraints.Items[timeline.pathConstraintIndex]; - t.SetFrame(0, 0, data.position); + var data = skeletonData.PathConstraints.Items[timeline.PathConstraintIndex]; + t.SetFrame(0, 0, data.Position); return t; } static PathConstraintSpacingTimeline GetFillerTimeline (PathConstraintSpacingTimeline timeline, SkeletonData skeletonData) { var t = new PathConstraintSpacingTimeline(1); - var data = skeletonData.pathConstraints.Items[timeline.pathConstraintIndex]; - t.SetFrame(0, 0, data.spacing); + var data = skeletonData.PathConstraints.Items[timeline.PathConstraintIndex]; + t.SetFrame(0, 0, data.Spacing); return t; } static PathConstraintMixTimeline GetFillerTimeline (PathConstraintMixTimeline timeline, SkeletonData skeletonData) { var t = new PathConstraintMixTimeline(1); - var data = skeletonData.pathConstraints.Items[timeline.pathConstraintIndex]; - t.SetFrame(0, 0, data.rotateMix, data.translateMix); + var data = skeletonData.PathConstraints.Items[timeline.PathConstraintIndex]; + t.SetFrame(0, 0, data.RotateMix, data.TranslateMix); return t; } #endregion diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhost.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhost.cs index 7932250ae..e6b1a8317 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhost.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhost.cs @@ -110,7 +110,7 @@ namespace Spine.Unity.Examples { if (e.Float > 0) spawnInterval = e.Float; - if (!string.IsNullOrEmpty(e.stringValue)) + if (!string.IsNullOrEmpty(e.String)) this.color = HexToColor(e.String); } } diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs index b09c7057c..d5262c3a7 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs @@ -205,22 +205,22 @@ namespace Spine.Unity.Examples { if (disableIK) { var ikConstraints = skeleton.IkConstraints; for (int i = 0, n = ikConstraints.Count; i < n; i++) - ikConstraints.Items[i].mix = 0; + ikConstraints.Items[i].Mix = 0; } if (disableOtherConstraints) { - var transformConstraints = skeleton.transformConstraints; + var transformConstraints = skeleton.TransformConstraints; for (int i = 0, n = transformConstraints.Count; i < n; i++) { - transformConstraints.Items[i].rotateMix = 0; - transformConstraints.Items[i].scaleMix = 0; - transformConstraints.Items[i].shearMix = 0; - transformConstraints.Items[i].translateMix = 0; + transformConstraints.Items[i].RotateMix = 0; + transformConstraints.Items[i].ScaleMix = 0; + transformConstraints.Items[i].ShearMix = 0; + transformConstraints.Items[i].TranslateMix = 0; } - var pathConstraints = skeleton.pathConstraints; + var pathConstraints = skeleton.PathConstraints; for (int i = 0, n = pathConstraints.Count; i < n; i++) { - pathConstraints.Items[i].rotateMix = 0; - pathConstraints.Items[i].translateMix = 0; + pathConstraints.Items[i].RotateMix = 0; + pathConstraints.Items[i].TranslateMix = 0; } } @@ -277,7 +277,7 @@ namespace Spine.Unity.Examples { #endregion void RecursivelyCreateBoneProxies (Bone b) { - string boneName = b.data.name; + string boneName = b.Data.Name; if (stopBoneNames.Contains(boneName)) return; @@ -288,7 +288,7 @@ namespace Spine.Unity.Examples { t.parent = transform; t.localPosition = new Vector3(b.WorldX, b.WorldY, 0); - t.localRotation = Quaternion.Euler(0, 0, b.WorldRotationX - b.shearX); + t.localRotation = Quaternion.Euler(0, 0, b.WorldRotationX - b.ShearX); t.localScale = new Vector3(b.WorldScaleX, b.WorldScaleY, 1); // MITCH: You left "todo: proper ragdoll branching" @@ -350,9 +350,9 @@ namespace Spine.Unity.Examples { } } - b.x = Mathf.Lerp(b.x, boneLocalPosition.x, mix); - b.y = Mathf.Lerp(b.y, boneLocalPosition.y, mix); - b.rotation = Mathf.Lerp(b.rotation, boneLocalRotation, mix); + b.X = Mathf.Lerp(b.X, boneLocalPosition.x, mix); + b.Y = Mathf.Lerp(b.Y, boneLocalPosition.y, mix); + b.Rotation = Mathf.Lerp(b.Rotation, boneLocalRotation, mix); //b.AppliedRotation = Mathf.Lerp(b.AppliedRotation, boneLocalRotation, mix); } } @@ -394,7 +394,7 @@ namespace Spine.Unity.Examples { float a = b.AppliedRotation; while (parent != null) { a += parent.AppliedRotation; - parent = parent.parent; + parent = parent.Parent; } return a; } diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs index 49de0250d..cdec94fe9 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs @@ -200,22 +200,22 @@ namespace Spine.Unity.Examples { if (disableIK) { var ikConstraints = skeleton.IkConstraints; for (int i = 0, n = ikConstraints.Count; i < n; i++) - ikConstraints.Items[i].mix = 0; + ikConstraints.Items[i].Mix = 0; } if (disableOtherConstraints) { - var transformConstraints = skeleton.transformConstraints; + var transformConstraints = skeleton.TransformConstraints; for (int i = 0, n = transformConstraints.Count; i < n; i++) { - transformConstraints.Items[i].rotateMix = 0; - transformConstraints.Items[i].scaleMix = 0; - transformConstraints.Items[i].shearMix = 0; - transformConstraints.Items[i].translateMix = 0; + transformConstraints.Items[i].RotateMix = 0; + transformConstraints.Items[i].ScaleMix = 0; + transformConstraints.Items[i].ShearMix = 0; + transformConstraints.Items[i].TranslateMix = 0; } - var pathConstraints = skeleton.pathConstraints; + var pathConstraints = skeleton.PathConstraints; for (int i = 0, n = pathConstraints.Count; i < n; i++) { - pathConstraints.Items[i].rotateMix = 0; - pathConstraints.Items[i].translateMix = 0; + pathConstraints.Items[i].RotateMix = 0; + pathConstraints.Items[i].TranslateMix = 0; } } @@ -272,7 +272,7 @@ namespace Spine.Unity.Examples { /// Generates the ragdoll simulation's Transform and joint setup. void RecursivelyCreateBoneProxies (Bone b) { - string boneName = b.data.name; + string boneName = b.Data.Name; if (stopBoneNames.Contains(boneName)) return; @@ -283,13 +283,13 @@ namespace Spine.Unity.Examples { t.parent = transform; t.localPosition = new Vector3(b.WorldX, b.WorldY, 0); - t.localRotation = Quaternion.Euler(0, 0, b.WorldRotationX - b.shearX); + t.localRotation = Quaternion.Euler(0, 0, b.WorldRotationX - b.ShearX); t.localScale = new Vector3(b.WorldScaleX, b.WorldScaleY, 0); // MITCH: You left "todo: proper ragdoll branching" var colliders = AttachBoundingBoxRagdollColliders(b, boneGameObject, skeleton, this.gravityScale); if (colliders.Count == 0) { - float length = b.data.length; + float length = b.Data.Length; if (length == 0) { var circle = boneGameObject.AddComponent(); circle.radius = thickness * 0.5f; @@ -348,9 +348,9 @@ namespace Spine.Unity.Examples { } } - b.x = Mathf.Lerp(b.x, boneLocalPosition.x, mix); - b.y = Mathf.Lerp(b.y, boneLocalPosition.y, mix); - b.rotation = Mathf.Lerp(b.rotation, boneLocalRotation, mix); + b.X = Mathf.Lerp(b.X, boneLocalPosition.x, mix); + b.Y = Mathf.Lerp(b.Y, boneLocalPosition.y, mix); + b.Rotation = Mathf.Lerp(b.Rotation, boneLocalRotation, mix); //b.AppliedRotation = Mathf.Lerp(b.AppliedRotation, boneLocalRotation, mix); } } @@ -362,7 +362,7 @@ namespace Spine.Unity.Examples { var skinEntries = new List(); foreach (Slot slot in skeleton.Slots) { - if (slot.bone == b) { + if (slot.Bone == b) { skin.GetAttachments(skeleton.Slots.IndexOf(slot), skinEntries); bool bbAttachmentAdded = false; @@ -391,7 +391,7 @@ namespace Spine.Unity.Examples { float a = b.AppliedRotation; while (parent != null) { a += parent.AppliedRotation; - parent = parent.parent; + parent = parent.Parent; } return a; } diff --git a/spine-unity/Assets/Spine/Editor/spine-unity-editor.txt b/spine-unity/Assets/Spine/Editor/spine-unity-editor.asmdef similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity-editor.txt rename to spine-unity/Assets/Spine/Editor/spine-unity-editor.asmdef diff --git a/spine-unity/Assets/Spine/Editor/spine-unity-editor.txt.meta b/spine-unity/Assets/Spine/Editor/spine-unity-editor.asmdef.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity-editor.txt.meta rename to spine-unity/Assets/Spine/Editor/spine-unity-editor.asmdef.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs index 3f8362f2d..21bf9d186 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs @@ -47,10 +47,6 @@ #define NEW_PREFERENCES_SETTINGS_PROVIDER #endif -#if UNITY_2019_1_OR_NEWER -#define NEW_TIMELINE_AS_PACKAGE -#endif - using UnityEngine; using UnityEditor; using System.Collections.Generic; diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/BuildSettings.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/BuildSettings.cs index 88f59c469..ab49a5921 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/BuildSettings.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/BuildSettings.cs @@ -47,10 +47,6 @@ #define NEW_PREFERENCES_SETTINGS_PROVIDER #endif -#if UNITY_2019_1_OR_NEWER -#define NEW_TIMELINE_AS_PACKAGE -#endif - using UnityEngine; using UnityEditor; using System.Collections.Generic; @@ -75,105 +71,6 @@ namespace Spine.Unity.Editor { SpineBuildEnvUtility.DisableBuildDefine(SPINE_TK2D_DEFINE); } } - - public static class SpinePackageDependencyUtility - { - public enum RequestState { - NoRequestIssued = 0, - InProgress, - Success, - Failure - } - - #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. - - EditorApplication.update -= UpdateAsyncTimelineRequest; - EditorApplication.update += UpdateAsyncTimelineRequest; - } - - 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; - } - } - } - - internal static void DisableTimelineSupport () { - SpineBuildEnvUtility.DisableBuildDefine(SPINE_TIMELINE_PACKAGE_DOWNLOADED_DEFINE); - SpineBuildEnvUtility.RemoveDependencyFromAsmdefFile(TIMELINE_ASMDEF_DEPENDENCY_STRING); - } - - internal static void HandleSuccessfulTimelinePackageDownload () { - - #if !SPINE_TK2D - SpineBuildEnvUtility.EnableSpineAsmdefFiles(); - #endif - SpineBuildEnvUtility.AddDependencyToAsmdefFile(TIMELINE_ASMDEF_DEPENDENCY_STRING); - SpineBuildEnvUtility.EnableBuildDefine(SPINE_TIMELINE_PACKAGE_DOWNLOADED_DEFINE); - - ReimportTimelineScripts(); - } - - internal static void ReimportTimelineScripts () { - // Note: unfortunately AssetDatabase::Refresh is not enough and - // ImportAsset on a dir does not have the desired effect. - List searchStrings = new List(); - searchStrings.Add("SpineAnimationStateBehaviour t:script"); - searchStrings.Add("SpineAnimationStateClip t:script"); - searchStrings.Add("SpineAnimationStateMixerBehaviour t:script"); - searchStrings.Add("SpineAnimationStateTrack t:script"); - - searchStrings.Add("SpineSkeletonFlipBehaviour t:script"); - searchStrings.Add("SpineSkeletonFlipClip t:script"); - searchStrings.Add("SpineSkeletonFlipMixerBehaviour t:script"); - searchStrings.Add("SpineSkeletonFlipTrack t:script"); - - searchStrings.Add("SkeletonAnimationPlayableHandle t:script"); - searchStrings.Add("SpinePlayableHandleBase t:script"); - - foreach (string searchString in searchStrings) { - string[] guids = AssetDatabase.FindAssets(searchString); - foreach (string guid in guids) { - string currentPath = AssetDatabase.GUIDToAssetPath(guid); - AssetDatabase.ImportAsset(currentPath, ImportAssetOptions.ForceUpdate); - } - } - } - #endif - } } public static class SpineBuildEnvUtility @@ -254,69 +151,6 @@ namespace Spine.Unity.Editor { 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); - - if (!fileContent.Contains("references")) { - string nameLine = string.Concat("\"name\": \"", asmdefName, "\""); - fileContent = fileContent.Replace(nameLine, - nameLine + - @",\n""references"": []"); - } - - 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"; diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/DataReloadHandler.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/DataReloadHandler.cs index eab30af39..a489b7a98 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/DataReloadHandler.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/DataReloadHandler.cs @@ -47,10 +47,6 @@ #define NEW_PREFERENCES_SETTINGS_PROVIDER #endif -#if UNITY_2019_1_OR_NEWER -#define NEW_TIMELINE_AS_PACKAGE -#endif - using UnityEngine; using UnityEditor; using System.Collections.Generic; diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/Icons.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/Icons.cs index 173b00660..0c9aae521 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/Icons.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/Icons.cs @@ -47,10 +47,6 @@ #define NEW_PREFERENCES_SETTINGS_PROVIDER #endif -#if UNITY_2019_1_OR_NEWER -#define NEW_TIMELINE_AS_PACKAGE -#endif - using UnityEngine; using UnityEditor; using System.Collections.Generic; diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/Instantiation.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/Instantiation.cs index 06387ebfd..9dcd7f2c9 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/Instantiation.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/Instantiation.cs @@ -47,10 +47,6 @@ #define NEW_PREFERENCES_SETTINGS_PROVIDER #endif -#if UNITY_2019_1_OR_NEWER -#define NEW_TIMELINE_AS_PACKAGE -#endif - using UnityEngine; using UnityEditor; using System.Collections.Generic; diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/Preferences.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/Preferences.cs index 4ee035e08..a1e733d42 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/Preferences.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/Preferences.cs @@ -47,10 +47,6 @@ #define NEW_PREFERENCES_SETTINGS_PROVIDER #endif -#if UNITY_2019_1_OR_NEWER -#define NEW_TIMELINE_AS_PACKAGE -#endif - using UnityEngine; using UnityEditor; using System.Collections.Generic; @@ -251,22 +247,6 @@ namespace Spine.Unity.Editor { SceneView.RepaintAll(); } } - - #if NEW_TIMELINE_AS_PACKAGE - GUILayout.Space(20); - EditorGUILayout.LabelField("Timeline Support", EditorStyles.boldLabel); - using (new GUILayout.HorizontalScope()) { - EditorGUILayout.PrefixLabel("Timeline Package Support"); - - var requestState = SpineEditorUtilities.SpinePackageDependencyUtility.HandlePendingAsyncTimelineRequest(); - using (new EditorGUI.DisabledGroupScope(requestState != SpineEditorUtilities.SpinePackageDependencyUtility.RequestState.NoRequestIssued)) { - if (GUILayout.Button("Enable", GUILayout.Width(64))) - SpineEditorUtilities.SpinePackageDependencyUtility.EnableTimelineSupport(); - if (GUILayout.Button("Disable", GUILayout.Width(64))) - SpineEditorUtilities.SpinePackageDependencyUtility.DisableTimelineSupport(); - } - } - #endif GUILayout.Space(20); EditorGUILayout.LabelField("3rd Party Settings", EditorStyles.boldLabel); diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs index b40a4ff3a..c7204cde9 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs @@ -50,10 +50,6 @@ #define NEW_PREFERENCES_SETTINGS_PROVIDER #endif -#if UNITY_2019_1_OR_NEWER -#define NEW_TIMELINE_AS_PACKAGE -#endif - using UnityEngine; using UnityEditor; using System.Collections.Generic; diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineHandles.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineHandles.cs index e1a504863..fa28ede10 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineHandles.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/SpineHandles.cs @@ -47,10 +47,6 @@ #define NEW_PREFERENCES_SETTINGS_PROVIDER #endif -#if UNITY_2019_1_OR_NEWER -#define NEW_TIMELINE_AS_PACKAGE -#endif - using UnityEngine; using UnityEditor; using System.Collections.Generic; diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SpinePreferences.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SpinePreferences.cs index 55a2c6fad..2e4107aa7 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SpinePreferences.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SpinePreferences.cs @@ -35,10 +35,6 @@ #define NEW_PREFERENCES_SETTINGS_PROVIDER #endif -#if UNITY_2019_1_OR_NEWER -#define NEW_TIMELINE_AS_PACKAGE -#endif - using UnityEngine; using UnityEditor; using System.Threading; @@ -171,22 +167,6 @@ namespace Spine.Unity.Editor { } } - #if NEW_TIMELINE_AS_PACKAGE - GUILayout.Space(20); - EditorGUILayout.LabelField("Timeline Support", EditorStyles.boldLabel); - using (new GUILayout.HorizontalScope()) { - EditorGUILayout.PrefixLabel("Timeline Package Support"); - - var requestState = SpineEditorUtilities.SpinePackageDependencyUtility.HandlePendingAsyncTimelineRequest(); - using (new EditorGUI.DisabledGroupScope(requestState != SpineEditorUtilities.SpinePackageDependencyUtility.RequestState.NoRequestIssued)) { - if (GUILayout.Button("Enable", GUILayout.Width(64))) - SpineEditorUtilities.SpinePackageDependencyUtility.EnableTimelineSupport(); - if (GUILayout.Button("Disable", GUILayout.Width(64))) - SpineEditorUtilities.SpinePackageDependencyUtility.DisableTimelineSupport(); - } - } - #endif - GUILayout.Space(20); EditorGUILayout.LabelField("3rd Party Settings", EditorStyles.boldLabel); using (new GUILayout.HorizontalScope()) { diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity.txt b/spine-unity/Assets/Spine/Runtime/spine-unity.asmdef similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity.txt rename to spine-unity/Assets/Spine/Runtime/spine-unity.asmdef diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity.txt.meta b/spine-unity/Assets/Spine/Runtime/spine-unity.asmdef.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity.txt.meta rename to spine-unity/Assets/Spine/Runtime/spine-unity.asmdef.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs index b6ec6e603..667f274a4 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs @@ -222,7 +222,7 @@ namespace Spine.Unity { #region API protected Skeleton skeleton; - public Skeleton Skeleton { get { return skeleton; } internal set { skeleton = value; } } + public Skeleton Skeleton { get { return skeleton; } set { skeleton = value; } } public SkeletonData SkeletonData { get { return skeleton == null ? null : skeleton.data; } } public bool IsValid { get { return skeleton != null; } } diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline.meta b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline.meta deleted file mode 100644 index 9dd425c6e..000000000 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 9192f99585e00e2468a2e2592cfce807 -folderAsset: yes -timeCreated: 1505434717 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Sprite/CGIncludes/ShaderShared.cginc b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Sprite/CGIncludes/ShaderShared.cginc index 858636e5d..d404010b4 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Sprite/CGIncludes/ShaderShared.cginc +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Sprite/CGIncludes/ShaderShared.cginc @@ -1,5 +1,7 @@ // Upgrade NOTE: upgraded instancing buffer 'PerDrawSprite' to new syntax. +// Upgrade NOTE: upgraded instancing buffer 'PerDrawSprite' to new syntax. + #ifndef SHADER_SHARED_INCLUDED #define SHADER_SHARED_INCLUDED @@ -11,12 +13,12 @@ #ifdef UNITY_INSTANCING_ENABLED - UNITY_INSTANCING_CBUFFER_START(PerDrawSprite) + UNITY_INSTANCING_BUFFER_START(PerDrawSprite) // SpriteRenderer.Color while Non-Batched/Instanced. fixed4 unity_SpriteRendererColorArray[UNITY_INSTANCED_ARRAY_SIZE]; // this could be smaller but that's how bit each entry is regardless of type float4 unity_SpriteFlipArray[UNITY_INSTANCED_ARRAY_SIZE]; - UNITY_INSTANCING_CBUFFER_END + UNITY_INSTANCING_BUFFER_END(PerDrawSprite) #define _RendererColor unity_SpriteRendererColorArray[unity_InstanceID] #define _Flip unity_SpriteFlipArray[unity_InstanceID] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation/README.md b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation/README.md similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation/README.md rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation/README.md diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation/README.md.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation/README.md.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation/README.md.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation/README.md.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation/add-menu.png b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation/add-menu.png similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation/add-menu.png rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation/add-menu.png diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation/add-menu.png.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation/add-menu.png.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation/add-menu.png.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation/add-menu.png.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation/animationstate-clip-inspector.png b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation/animationstate-clip-inspector.png similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation/animationstate-clip-inspector.png rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation/animationstate-clip-inspector.png diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation/animationstate-clip-inspector.png.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation/animationstate-clip-inspector.png.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation/animationstate-clip-inspector.png.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation/animationstate-clip-inspector.png.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation/skeleton-flip-clip-inspector.png b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation/skeleton-flip-clip-inspector.png similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation/skeleton-flip-clip-inspector.png rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation/skeleton-flip-clip-inspector.png diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation/skeleton-flip-clip-inspector.png.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation/skeleton-flip-clip-inspector.png.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/Documentation/skeleton-flip-clip-inspector.png.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Documentation/skeleton-flip-clip-inspector.png.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline/Editor.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline/Editor.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline/Editor/SpineAnimationStateDrawer.cs b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateDrawer.cs similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline/Editor/SpineAnimationStateDrawer.cs rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateDrawer.cs diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline/Editor/SpineAnimationStateDrawer.cs.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateDrawer.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline/Editor/SpineAnimationStateDrawer.cs.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateDrawer.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline/Editor/SpineSkeletonFlipDrawer.cs b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor/SpineSkeletonFlipDrawer.cs similarity index 96% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline/Editor/SpineSkeletonFlipDrawer.cs rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor/SpineSkeletonFlipDrawer.cs index 398a8b213..6688c3ecb 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline/Editor/SpineSkeletonFlipDrawer.cs +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor/SpineSkeletonFlipDrawer.cs @@ -27,7 +27,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) using UnityEditor; using UnityEngine; using UnityEngine.Playables; @@ -53,4 +52,3 @@ public class SpineSkeletonFlipDrawer : PropertyDrawer EditorGUI.PropertyField(singleFieldRect, flipYProp); } } -#endif \ No newline at end of file diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline/Editor/SpineSkeletonFlipDrawer.cs.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor/SpineSkeletonFlipDrawer.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline/Editor/SpineSkeletonFlipDrawer.cs.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor/SpineSkeletonFlipDrawer.cs.meta diff --git a/spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor/spine-timeline-editor.asmdef b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor/spine-timeline-editor.asmdef new file mode 100644 index 000000000..3b93703b6 --- /dev/null +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor/spine-timeline-editor.asmdef @@ -0,0 +1,16 @@ +{ + "name": "spine-timeline-editor", + "references": [ + "spine-unity", + "spine-timeline" + ], + "optionalUnityReferences": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [] +} \ No newline at end of file diff --git a/spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor/spine-timeline-editor.asmdef.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor/spine-timeline-editor.asmdef.meta new file mode 100644 index 000000000..e3185c772 --- /dev/null +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Editor/spine-timeline-editor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1e7d09e628f0eb342b6a8ab5b3c0d487 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Packages/com.esotericsoftware.spine.timeline/LICENSE.md b/spine-unity/Packages/com.esotericsoftware.spine.timeline/LICENSE.md new file mode 100644 index 000000000..61b10330d --- /dev/null +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/LICENSE.md @@ -0,0 +1,26 @@ +# Spine Runtimes License Agreement +Last updated May 1, 2019. Replaces all prior versions. + +Copyright (c) 2013-2019, Esoteric Software LLC + +Integration of the Spine Runtimes into software or otherwise creating +derivative works of the Spine Runtimes is permitted under the terms and +conditions of Section 2 of the Spine Editor License Agreement: +http://esotericsoftware.com/spine-editor-license + +Otherwise, it is permitted to integrate the Spine Runtimes into software +or otherwise create derivative works of the Spine Runtimes (collectively, +"Products"), provided that each user of the Products must obtain their own +Spine Editor license and redistribution of the Products in any form must +include this license and copyright notice. + +THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE LLC "AS IS" AND ANY EXPRESS +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN +NO EVENT SHALL ESOTERIC SOFTWARE LLC BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, BUSINESS +INTERRUPTION, OR LOSS OF USE, DATA, OR PROFITS) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/spine-unity/Packages/com.esotericsoftware.spine.timeline/LICENSE.md.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/LICENSE.md.meta new file mode 100644 index 000000000..5ea5ee14a --- /dev/null +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/LICENSE.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4c940982dfcc1724a93981844b99fa28 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime.meta similarity index 57% rename from spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime.meta index 6c6b7ad4c..fbc9c697c 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Timeline.meta +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: b7ef9595ebe8c204a8a4f251a55d4d22 +guid: e204f4f677edeef4aa2328ce87780b43 folderAsset: yes -timeCreated: 1527569508 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/PlayableHandle Component.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/PlayableHandle Component.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/PlayableHandle Component.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/PlayableHandle Component.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/PlayableHandle Component/SkeletonAnimationPlayableHandle.cs b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/PlayableHandle Component/SkeletonAnimationPlayableHandle.cs similarity index 95% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/PlayableHandle Component/SkeletonAnimationPlayableHandle.cs rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/PlayableHandle Component/SkeletonAnimationPlayableHandle.cs index 75ccf59f3..013b778cd 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/PlayableHandle Component/SkeletonAnimationPlayableHandle.cs +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/PlayableHandle Component/SkeletonAnimationPlayableHandle.cs @@ -53,13 +53,11 @@ namespace Spine.Unity.Playables { #endregion public override Skeleton Skeleton { get { return skeletonAnimation.Skeleton; } } - public override SkeletonData SkeletonData { get { return skeletonAnimation.Skeleton.data; } } + public override SkeletonData SkeletonData { get { return skeletonAnimation.Skeleton.Data; } } - #if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) void Awake () { if (skeletonAnimation == null) skeletonAnimation = GetComponent(); } -#endif } } diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/PlayableHandle Component/SkeletonAnimationPlayableHandle.cs.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/PlayableHandle Component/SkeletonAnimationPlayableHandle.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/PlayableHandle Component/SkeletonAnimationPlayableHandle.cs.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/PlayableHandle Component/SkeletonAnimationPlayableHandle.cs.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/PlayableHandle Component/SpinePlayableHandleBase.cs b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/PlayableHandle Component/SpinePlayableHandleBase.cs similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/PlayableHandle Component/SpinePlayableHandleBase.cs rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/PlayableHandle Component/SpinePlayableHandleBase.cs diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/PlayableHandle Component/SpinePlayableHandleBase.cs.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/PlayableHandle Component/SpinePlayableHandleBase.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/PlayableHandle Component/SpinePlayableHandleBase.cs.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/PlayableHandle Component/SpinePlayableHandleBase.cs.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateBehaviour.cs b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateBehaviour.cs similarity index 95% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateBehaviour.cs rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateBehaviour.cs index 8bafb2118..f9827e47f 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateBehaviour.cs +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateBehaviour.cs @@ -27,7 +27,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) using System; using UnityEngine; using UnityEngine.Playables; @@ -60,4 +59,3 @@ namespace Spine.Unity.Playables { } } -#endif diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateBehaviour.cs.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateBehaviour.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateBehaviour.cs.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateBehaviour.cs.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateClip.cs b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateClip.cs similarity index 95% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateClip.cs rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateClip.cs index 8f6bc4e22..ed62715e1 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateClip.cs +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateClip.cs @@ -27,7 +27,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) using System; using UnityEngine; using UnityEngine.Playables; @@ -48,4 +47,3 @@ namespace Spine.Unity.Playables { } } -#endif diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateClip.cs.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateClip.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateClip.cs.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateClip.cs.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs similarity index 95% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs index a1bd3f31f..496240f4c 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs @@ -29,7 +29,6 @@ #define SPINE_EDITMODEPOSE -#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) using System; using UnityEngine; using UnityEngine.Playables; @@ -155,8 +154,8 @@ namespace Spine.Unity.Playables { dummyAnimationState = dummyAnimationState ?? new AnimationState(spineComponent.skeletonDataAsset.GetAnimationStateData()); var toTrack = dummyAnimationState.GetCurrent(0); - var fromTrack = toTrack != null ? toTrack.mixingFrom : null; - bool isAnimationTransitionMatch = (toTrack != null && toTrack.animation == toAnimation && fromTrack != null && fromTrack.animation == fromAnimation); + var fromTrack = toTrack != null ? toTrack.MixingFrom : null; + bool isAnimationTransitionMatch = (toTrack != null && toTrack.Animation == toAnimation && fromTrack != null && fromTrack.Animation == fromAnimation); if (!isAnimationTransitionMatch) { dummyAnimationState.ClearTracks(); @@ -167,10 +166,10 @@ namespace Spine.Unity.Playables { } // Update track times. - fromTrack.trackTime = fromClipTime; + fromTrack.TrackTime = fromClipTime; if (toTrack != null) { - toTrack.trackTime = toClipTime; - toTrack.mixTime = toClipTime; + toTrack.TrackTime = toClipTime; + toTrack.MixTime = toClipTime; } // Apply Pose @@ -192,4 +191,3 @@ namespace Spine.Unity.Playables { } } -#endif diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateTrack.cs b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateTrack.cs similarity index 95% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateTrack.cs rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateTrack.cs index a3d282227..bb9d2e06b 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateTrack.cs +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateTrack.cs @@ -27,7 +27,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) using UnityEngine; using UnityEngine.Playables; using UnityEngine.Timeline; @@ -47,4 +46,3 @@ namespace Spine.Unity.Playables { } } } -#endif diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateTrack.cs.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateTrack.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineAnimationState/SpineAnimationStateTrack.cs.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateTrack.cs.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipBehaviour.cs b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipBehaviour.cs similarity index 95% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipBehaviour.cs rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipBehaviour.cs index a4eaae0ea..7867b5430 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipBehaviour.cs +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipBehaviour.cs @@ -27,7 +27,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) using System; using UnityEngine; using UnityEngine.Playables; @@ -37,4 +36,3 @@ using UnityEngine.Timeline; public class SpineSkeletonFlipBehaviour : PlayableBehaviour { public bool flipX, flipY; } -#endif \ No newline at end of file diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipBehaviour.cs.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipBehaviour.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipBehaviour.cs.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipBehaviour.cs.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipClip.cs b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipClip.cs similarity index 95% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipClip.cs rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipClip.cs index a570758e9..ba7ca0160 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipClip.cs +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipClip.cs @@ -27,7 +27,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) using System; using UnityEngine; using UnityEngine.Playables; @@ -46,4 +45,3 @@ public class SpineSkeletonFlipClip : PlayableAsset, ITimelineClipAsset { return playable; } } -#endif diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipClip.cs.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipClip.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipClip.cs.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipClip.cs.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipMixerBehaviour.cs b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipMixerBehaviour.cs similarity index 97% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipMixerBehaviour.cs rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipMixerBehaviour.cs index 615579be6..5f64367e7 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipMixerBehaviour.cs +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipMixerBehaviour.cs @@ -27,8 +27,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) - using System; +using System; using UnityEngine; using UnityEngine.Playables; using UnityEngine.Timeline; @@ -105,4 +104,3 @@ namespace Spine.Unity.Playables { } } -#endif diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipMixerBehaviour.cs.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipMixerBehaviour.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipMixerBehaviour.cs.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipMixerBehaviour.cs.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipTrack.cs b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipTrack.cs similarity index 95% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipTrack.cs rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipTrack.cs index efa2a5fd1..1c6f858c7 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipTrack.cs +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipTrack.cs @@ -27,8 +27,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if UNITY_2017 || UNITY_2018 || (UNITY_2019_1_OR_NEWER && SPINE_TIMELINE_PACKAGE_DOWNLOADED) - using UnityEngine; +using UnityEngine; using UnityEngine.Playables; using UnityEngine.Timeline; using System.Collections.Generic; @@ -64,4 +63,3 @@ namespace Spine.Unity.Playables { } } } -#endif diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipTrack.cs.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipTrack.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipTrack.cs.meta rename to spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/SpineSkeletonFlip/SpineSkeletonFlipTrack.cs.meta diff --git a/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/spine-timeline.asmdef b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/spine-timeline.asmdef new file mode 100644 index 000000000..00951d469 --- /dev/null +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/spine-timeline.asmdef @@ -0,0 +1,16 @@ +{ + "name": "spine-timeline", + "references": [ + "spine-unity", + "Unity.Timeline" + ], + "optionalUnityReferences": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [] +} \ No newline at end of file diff --git a/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/spine-timeline.asmdef.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/spine-timeline.asmdef.meta new file mode 100644 index 000000000..0a1f5d438 --- /dev/null +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/Runtime/spine-timeline.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d081815e631c29f46ab6f2ac745854df +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Packages/com.esotericsoftware.spine.timeline/package.json b/spine-unity/Packages/com.esotericsoftware.spine.timeline/package.json new file mode 100644 index 000000000..9e4858f6c --- /dev/null +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/package.json @@ -0,0 +1,19 @@ +{ + "name": "com.esotericsoftware.spine.timeline", + "displayName": "Spine Timeline Extensions", + "description": "This plugin provides integration of spine-unity for the Unity Timeline.\n\nPrerequisites:\nIt requires a working installation of the spine-unity runtime, version 3.8.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)", + "version": "3.8.0", + "unity": "2018.3", + "author": { + "name": "Esoteric Software", + "email": "contact@esotericsoftware.com", + "url": "http://esotericsoftware.com/" + }, + "dependencies": { + "com.unity.timeline": "1.0.0" + }, + "keywords": [ + "spine", + "timeline" + ] +} \ No newline at end of file diff --git a/spine-unity/Packages/com.esotericsoftware.spine.timeline/package.json.meta b/spine-unity/Packages/com.esotericsoftware.spine.timeline/package.json.meta new file mode 100644 index 000000000..b3c46c06b --- /dev/null +++ b/spine-unity/Packages/com.esotericsoftware.spine.timeline/package.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 591b30eac7c750e4d8b4cf9d09a80351 +PackageManifestImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: