From 005e714534004213c7095334aad81cf66168977c Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Tue, 2 Aug 2022 16:19:34 +0200 Subject: [PATCH] [unity] Fixed compile error of previous commit regarding Vector2Int on Unity 2017.1. --- .../SkeletonRenderTexture/SkeletonGraphicRenderTexture.cs | 6 ++++++ .../SkeletonRenderTexture/SkeletonRenderTextureBase.cs | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonRenderTexture/SkeletonGraphicRenderTexture.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonRenderTexture/SkeletonGraphicRenderTexture.cs index af30ad8e7..5587bced2 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonRenderTexture/SkeletonGraphicRenderTexture.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonRenderTexture/SkeletonGraphicRenderTexture.cs @@ -27,6 +27,10 @@ * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ +#if UNITY_2017_2_OR_NEWER +#define HAS_VECTOR2INT +#endif + using System.Collections.Generic; using UnityEngine; using UnityEngine.Rendering; @@ -44,6 +48,7 @@ namespace Spine.Unity.Examples { /// [RequireComponent(typeof(SkeletonGraphic))] public class SkeletonGraphicRenderTexture : SkeletonRenderTextureBase { +#if HAS_VECTOR2INT [System.Serializable] public struct TextureMaterialPair { public Texture texture; @@ -249,5 +254,6 @@ namespace Spine.Unity.Examples { protected override void AssignMeshAtRenderer () { quadCanvasRenderer.SetMesh(quadMesh); } +#endif // HAS_VECTOR2INT } } diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonRenderTexture/SkeletonRenderTextureBase.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonRenderTexture/SkeletonRenderTextureBase.cs index 8842385ff..bdd84d153 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonRenderTexture/SkeletonRenderTextureBase.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonRenderTexture/SkeletonRenderTextureBase.cs @@ -31,9 +31,14 @@ using System; using UnityEngine; using UnityEngine.Rendering; +#if UNITY_2017_2_OR_NEWER +#define HAS_VECTOR2INT +#endif + namespace Spine.Unity.Examples { public abstract class SkeletonRenderTextureBase : MonoBehaviour { +#if HAS_VECTOR2INT public Color color = Color.white; public int maxRenderTextureSize = 1024; public GameObject quad; @@ -143,5 +148,6 @@ namespace Spine.Unity.Examples { } protected abstract void AssignMeshAtRenderer (); +#endif // HAS_VECTOR2INT } }