From d337f587b7ea826611a9bd96c149003876d770c6 Mon Sep 17 00:00:00 2001 From: badlogic Date: Tue, 16 Apr 2019 14:55:54 +0200 Subject: [PATCH] [csharp] Ported addition of x/y bounding coordinates to SkeletonData. See #1325. --- spine-csharp/src/SkeletonBinary.cs | 4 +++- spine-csharp/src/SkeletonData.cs | 6 ++++-- spine-csharp/src/SkeletonJson.cs | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/spine-csharp/src/SkeletonBinary.cs b/spine-csharp/src/SkeletonBinary.cs index 921f08e65..fae45427b 100644 --- a/spine-csharp/src/SkeletonBinary.cs +++ b/spine-csharp/src/SkeletonBinary.cs @@ -144,7 +144,9 @@ namespace Spine { if (skeletonData.hash.Length == 0) skeletonData.hash = null; skeletonData.version = ReadString(input); if (skeletonData.version.Length == 0) skeletonData.version = null; - skeletonData.width = ReadFloat(input); + skeletonData.x = ReadFloat(input); + skeletonData.y = ReadFloat(input); + skeletonData.width = ReadFloat(input); skeletonData.height = ReadFloat(input); bool nonessential = ReadBoolean(input); diff --git a/spine-csharp/src/SkeletonData.cs b/spine-csharp/src/SkeletonData.cs index 06781eca3..aa4cc7759 100644 --- a/spine-csharp/src/SkeletonData.cs +++ b/spine-csharp/src/SkeletonData.cs @@ -44,7 +44,7 @@ namespace Spine { internal ExposedList ikConstraints = new ExposedList(); internal ExposedList transformConstraints = new ExposedList(); internal ExposedList pathConstraints = new ExposedList(); - internal float width, height; + internal float x , y, width, height; internal string version, hash; // Nonessential. @@ -74,7 +74,9 @@ namespace Spine { public ExposedList TransformConstraints { get { return transformConstraints; } set { transformConstraints = value; } } public ExposedList PathConstraints { get { return pathConstraints; } set { pathConstraints = value; } } - public float Width { get { return width; } set { width = value; } } + public float X { get { return x; } set { x = value; } } + public float Y { get { return y; } set { y = value; } } + public float Width { get { return width; } set { width = value; } } public float Height { get { return height; } set { height = value; } } /// The Spine version used to export this data, or null. public string Version { get { return version; } set { version = value; } } diff --git a/spine-csharp/src/SkeletonJson.cs b/spine-csharp/src/SkeletonJson.cs index e6bd3545c..975c02d30 100644 --- a/spine-csharp/src/SkeletonJson.cs +++ b/spine-csharp/src/SkeletonJson.cs @@ -100,7 +100,9 @@ namespace Spine { var skeletonMap = (Dictionary)root["skeleton"]; skeletonData.hash = (string)skeletonMap["hash"]; skeletonData.version = (string)skeletonMap["spine"]; - skeletonData.width = GetFloat(skeletonMap, "width", 0); + skeletonData.x = GetFloat(skeletonMap, "x", 0); + skeletonData.y = GetFloat(skeletonMap, "y", 0); + skeletonData.width = GetFloat(skeletonMap, "width", 0); skeletonData.height = GetFloat(skeletonMap, "height", 0); skeletonData.fps = GetFloat(skeletonMap, "fps", 0); skeletonData.imagesPath = GetString(skeletonMap, "images", null);