From 14803b4fab189e4cb258a19c0456566a8225c9dd Mon Sep 17 00:00:00 2001 From: Tomasz Jaworski Date: Thu, 18 Jun 2015 18:01:59 +0200 Subject: [PATCH] Windows Phone 8 complation fixed (BufferedStream changed to FileStream) RaggedySpineboy - changed fixedAngle to freezeRotation for Unity 5.1 Changed SkeletonRagdoll2D #if UNITY_5_0 to UNITY_5 --- spine-csharp/src/SkeletonBinary.cs | 8 +++++++- spine-unity/Assets/Examples/Scripts/RaggedySpineboy.cs | 4 ++++ .../Assets/spine-unity/Ragdoll/SkeletonRagdoll2D.cs | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/spine-csharp/src/SkeletonBinary.cs b/spine-csharp/src/SkeletonBinary.cs index ab12c506f..310d7e766 100644 --- a/spine-csharp/src/SkeletonBinary.cs +++ b/spine-csharp/src/SkeletonBinary.cs @@ -86,7 +86,13 @@ namespace Spine { using (var input = new BufferedStream(Microsoft.Xna.Framework.TitleContainer.OpenStream(path))) { #else - using (var input = new BufferedStream(new FileStream(path, FileMode.Open))) { +#if UNITY_WP8 || UNITY_WP8_1 + using (var input = new FileStream(path, FileMode.Open)) + { +#else + using (var input = new BufferedStream(new FileStream(path, FileMode.Open))) + { +#endif #endif SkeletonData skeletonData = ReadSkeletonData(input); skeletonData.name = Path.GetFileNameWithoutExtension(path); diff --git a/spine-unity/Assets/Examples/Scripts/RaggedySpineboy.cs b/spine-unity/Assets/Examples/Scripts/RaggedySpineboy.cs index f15e773fc..8599c9598 100644 --- a/spine-unity/Assets/Examples/Scripts/RaggedySpineboy.cs +++ b/spine-unity/Assets/Examples/Scripts/RaggedySpineboy.cs @@ -18,7 +18,11 @@ public class RaggedySpineboy : MonoBehaviour { void AddRigidbody () { var rb = gameObject.AddComponent(); +#if UNITY_5_1 + rb.freezeRotation = true; +#else rb.fixedAngle = true; +#endif naturalCollider.enabled = true; } diff --git a/spine-unity/Assets/spine-unity/Ragdoll/SkeletonRagdoll2D.cs b/spine-unity/Assets/spine-unity/Ragdoll/SkeletonRagdoll2D.cs index 690e10dd2..962acf543 100644 --- a/spine-unity/Assets/spine-unity/Ragdoll/SkeletonRagdoll2D.cs +++ b/spine-unity/Assets/spine-unity/Ragdoll/SkeletonRagdoll2D.cs @@ -280,7 +280,7 @@ public class SkeletonRagdoll2D : MonoBehaviour { if (colliders.Count == 0) { var box = go.AddComponent(); box.size = new Vector2(length, thickness); -#if UNITY_5_0 +#if UNITY_5 box.offset = new Vector2((b.WorldFlipX ? -length : length) / 2, 0); #else box.center = new Vector2((b.WorldFlipX ? -length : length) / 2, 0);