From a29dbcaf97e3ed4b58606c82b4a60c3c1e779c1f Mon Sep 17 00:00:00 2001 From: badlogic Date: Thu, 11 Apr 2019 16:16:25 +0200 Subject: [PATCH] [monogame] Upgraded to latest MonoGame version, fixed y-flipping in example. --- spine-csharp/src/SkeletonClipping.cs | 2 +- spine-csharp/src/Triangulator.cs | 2 +- spine-monogame/example/ExampleGame.cs | 13 +++++++------ .../example/spine-monogame-example.csproj | 9 +++++++++ .../data/{goblins-mesh.atlas => goblins.atlas} | 0 5 files changed, 18 insertions(+), 8 deletions(-) rename spine-xna/example/data/{goblins-mesh.atlas => goblins.atlas} (100%) diff --git a/spine-csharp/src/SkeletonClipping.cs b/spine-csharp/src/SkeletonClipping.cs index 7efc7c143..bc2ea4d0b 100644 --- a/spine-csharp/src/SkeletonClipping.cs +++ b/spine-csharp/src/SkeletonClipping.cs @@ -270,7 +270,7 @@ namespace Spine { return clipped; } - static void MakeClockwise (ExposedList polygon) { + public static void MakeClockwise (ExposedList polygon) { float[] vertices = polygon.Items; int verticeslength = polygon.Count; diff --git a/spine-csharp/src/Triangulator.cs b/spine-csharp/src/Triangulator.cs index c4bdb0418..ad9f39ee2 100644 --- a/spine-csharp/src/Triangulator.cs +++ b/spine-csharp/src/Triangulator.cs @@ -31,7 +31,7 @@ using System; namespace Spine { - internal class Triangulator { + public class Triangulator { private readonly ExposedList> convexPolygons = new ExposedList>(); private readonly ExposedList> convexPolygonsIndices = new ExposedList>(); diff --git a/spine-monogame/example/ExampleGame.cs b/spine-monogame/example/ExampleGame.cs index ced2ede1e..f9251046d 100644 --- a/spine-monogame/example/ExampleGame.cs +++ b/spine-monogame/example/ExampleGame.cs @@ -65,9 +65,9 @@ namespace Spine { // String name = "spineboy-ess"; // String name = "goblins-pro"; - // String name = "raptor-pro"; + String name = "raptor-pro"; // String name = "tank-pro"; - String name = "coin-pro"; + // String name = "coin-pro"; String atlasName = name.Replace("-pro", "").Replace("-ess", ""); bool binaryData = false; @@ -109,17 +109,17 @@ namespace Spine { state.Complete += Complete; state.Event += Event; - state.SetAnimation(0, "test", false); + state.SetAnimation(0, "run", false); TrackEntry entry = state.AddAnimation(0, "jump", false, 0); entry.End += End; // Event handling for queued animations. state.AddAnimation(0, "run", true, 0); } else if (name == "raptor-pro") { state.SetAnimation(0, "walk", true); - state.AddAnimation(1, "gungrab", false, 2); + state.AddAnimation(1, "gun-grab", false, 2); } else if (name == "coin-pro") { - state.SetAnimation(0, "rotate", true); + state.SetAnimation(0, "animation", true); } else if (name == "tank-pro") { state.SetAnimation(0, "drive", true); @@ -127,9 +127,10 @@ namespace Spine { else { state.SetAnimation(0, "walk", true); } - + skeleton.X = 400 + (name == "tank-pro" ? 300 : 0); skeleton.Y = GraphicsDevice.Viewport.Height; + skeleton.ScaleY = -1; skeleton.UpdateWorldTransform(); headSlot = skeleton.FindSlot("head"); diff --git a/spine-monogame/example/spine-monogame-example.csproj b/spine-monogame/example/spine-monogame-example.csproj index 5638d957d..bb44f0321 100644 --- a/spine-monogame/example/spine-monogame-example.csproj +++ b/spine-monogame/example/spine-monogame-example.csproj @@ -42,6 +42,15 @@ app.manifest + + spine-xna\ShapeRenderer.cs + + + spine-xna\SkeletonDebugRenderer.cs + + + spine-xna\VertexEffect.cs + spine-xna\MeshBatcher.cs diff --git a/spine-xna/example/data/goblins-mesh.atlas b/spine-xna/example/data/goblins.atlas similarity index 100% rename from spine-xna/example/data/goblins-mesh.atlas rename to spine-xna/example/data/goblins.atlas