diff --git a/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs b/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs index b3087000b..4e41e20d3 100644 --- a/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs +++ b/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs @@ -28,40 +28,6 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -/****************************************************************************** - * Spine Runtimes Software License - * Version 2.3 - * - * Copyright (c) 2013-2015, Esoteric Software - * All rights reserved. - * - * You are granted a perpetual, non-exclusive, non-sublicensable and - * non-transferable license to use, install, execute and perform the Spine - * Runtimes Software (the "Software") and derivative works solely for personal - * or internal use. Without the written permission of Esoteric Software (see - * Section 2 of the Spine Software License Agreement), you may not (a) modify, - * translate, adapt or otherwise create derivative works, improvements of the - * Software or develop new applications using the Software or (b) remove, - * delete, alter or obscure any trademarks or any copyright, trademark, patent - * or other intellectual property or proprietary rights notices on or in the - * Software, including any copy thereof. Redistributions in binary or source - * form must include this license and terms. - * - * THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE "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 BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) 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. - *****************************************************************************/ -#if (UNITY_5_0 || UNITY_5_1 || UNITY_4_0 || UNITY_4_1 || UNITY_4_2 || UNITY_4_3 || UNITY_4_4 || UNITY_4_5 || UNITY_4_6 || UNITY_4_7) -#define PREUNITY_5_2 -#endif - using UnityEngine; using UnityEngine.UI; using Spine; @@ -89,7 +55,6 @@ namespace Spine.Unity { protected override void OnValidate () { // This handles Scene View preview. base.OnValidate (); - #if !PREUNITY_5_2 if (this.IsValid) { if (skeletonDataAsset == null) { Clear(); @@ -109,11 +74,7 @@ namespace Spine.Unity { } else { if (skeletonDataAsset != null) Initialize(true); - } - #else - Debug.LogWarning("SkeletonGraphic requres Unity 5.2 or higher.\nUnityEngine.UI 5.1 and below does not accept meshes and can't be used to render Spine skeletons. You may delete the SkeletonGraphic folder under `Modules` if you want to exclude it from your project." ); - #endif - + } } protected override void Reset () { @@ -124,7 +85,6 @@ namespace Spine.Unity { #endif #endregion - #if !PREUNITY_5_2 #region Internals // This is used by the UI system to determine what to put in the MaterialPropertyBlock. public override Texture mainTexture { @@ -241,11 +201,5 @@ namespace Spine.Unity { } } #endregion - #else - public Skeleton Skeleton { get { return null; } } - public AnimationState AnimationState { get { return null; } } - public event UpdateBonesDelegate UpdateLocal, UpdateWorld, UpdateComplete; - public void LateUpdate () { } - #endif } } diff --git a/spine-unity/Assets/spine-unity/Modules/YieldInstructions/WaitForSpineAnimationComplete.cs b/spine-unity/Assets/spine-unity/Modules/YieldInstructions/WaitForSpineAnimationComplete.cs index 912c880d7..535fdd6b0 100644 --- a/spine-unity/Assets/spine-unity/Modules/YieldInstructions/WaitForSpineAnimationComplete.cs +++ b/spine-unity/Assets/spine-unity/Modules/YieldInstructions/WaitForSpineAnimationComplete.cs @@ -28,10 +28,6 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if (UNITY_5_0 || UNITY_5_1 || UNITY_5_2 || UNITY_4_0 || UNITY_4_1 || UNITY_4_2 || UNITY_4_3 || UNITY_4_4 || UNITY_4_5 || UNITY_4_6 || UNITY_4_7) -#define PREUNITY_5_3 -#endif - using UnityEngine; using System.Collections; using Spine; @@ -45,10 +41,6 @@ namespace Spine.Unity { bool m_WasFired = false; public WaitForSpineAnimationComplete (Spine.TrackEntry trackEntry) { - #if PREUNITY_5_3 - Debug.LogWarning("Unity 5.3 or later is required for Spine Unity custom yield instructions to function correctly."); - #endif - SafeSubscribe(trackEntry); } diff --git a/spine-unity/Assets/spine-unity/Modules/YieldInstructions/WaitForSpineEvent.cs b/spine-unity/Assets/spine-unity/Modules/YieldInstructions/WaitForSpineEvent.cs index e0a58fc58..9f619c6f8 100644 --- a/spine-unity/Assets/spine-unity/Modules/YieldInstructions/WaitForSpineEvent.cs +++ b/spine-unity/Assets/spine-unity/Modules/YieldInstructions/WaitForSpineEvent.cs @@ -28,10 +28,6 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if (UNITY_5_0 || UNITY_5_1 || UNITY_5_2 || UNITY_4_0 || UNITY_4_1 || UNITY_4_2 || UNITY_4_3 || UNITY_4_4 || UNITY_4_5 || UNITY_4_6 || UNITY_4_7) -#define PREUNITY_5_3 -#endif - using UnityEngine; using System.Collections; using Spine; @@ -51,10 +47,6 @@ namespace Spine.Unity { #region Constructors void Subscribe (Spine.AnimationState state, Spine.EventData eventDataReference, bool unsubscribe) { - #if PREUNITY_5_3 - Debug.LogWarning("Unity 5.3 or later is required for Spine Unity custom yield instructions to function correctly."); - #endif - if (state == null) { Debug.LogWarning("AnimationState argument was null. Coroutine will continue immediately."); m_WasFired = true; @@ -74,10 +66,6 @@ namespace Spine.Unity { } void SubscribeByName (Spine.AnimationState state, string eventName, bool unsubscribe) { - #if PREUNITY_5_3 - Debug.LogWarning("Unity 5.3 or later is required for Spine Unity custom yield instructions to function correctly."); - #endif - if (state == null) { Debug.LogWarning("AnimationState argument was null. Coroutine will continue immediately."); m_WasFired = true; @@ -168,7 +156,5 @@ namespace Spine.Unity { void IEnumerator.Reset () { m_WasFired = false; } object IEnumerator.Current { get { return null; } } #endregion - - } } diff --git a/spine-unity/Assets/spine-unity/Modules/YieldInstructions/WaitForSpineTrackEntryEnd.cs b/spine-unity/Assets/spine-unity/Modules/YieldInstructions/WaitForSpineTrackEntryEnd.cs index 0696f11f5..7c5ef9495 100644 --- a/spine-unity/Assets/spine-unity/Modules/YieldInstructions/WaitForSpineTrackEntryEnd.cs +++ b/spine-unity/Assets/spine-unity/Modules/YieldInstructions/WaitForSpineTrackEntryEnd.cs @@ -28,10 +28,6 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#if (UNITY_5_0 || UNITY_5_1 || UNITY_5_2 || UNITY_4_0 || UNITY_4_1 || UNITY_4_2 || UNITY_4_3 || UNITY_4_4 || UNITY_4_5 || UNITY_4_6 || UNITY_4_7) -#define PREUNITY_5_3 -#endif - using UnityEngine; using System.Collections; using Spine; @@ -45,10 +41,6 @@ namespace Spine.Unity { bool m_WasFired = false; public WaitForSpineTrackEntryEnd (Spine.TrackEntry trackEntry) { - #if PREUNITY_5_3 - Debug.LogWarning("Unity 5.3 or later is required for Spine Unity custom yield instructions to function correctly."); - #endif - SafeSubscribe(trackEntry); }