From c6f31e6310833caa57da496db6bb04965d1e88c7 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 24 Jun 2018 09:05:52 +0800 Subject: [PATCH 1/5] [unity] Fix some type uses in SpineMesh code. --- .../Assets/spine-unity/Mesh Generation/SpineMesh.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/spine-unity/Assets/spine-unity/Mesh Generation/SpineMesh.cs b/spine-unity/Assets/spine-unity/Mesh Generation/SpineMesh.cs index 5a43436f4..9d4b12032 100644 --- a/spine-unity/Assets/spine-unity/Mesh Generation/SpineMesh.cs +++ b/spine-unity/Assets/spine-unity/Mesh Generation/SpineMesh.cs @@ -680,8 +680,8 @@ namespace Spine.Unity { int vertexIndex = 0; var tempVerts = this.tempVerts; - Vector3 bmin = this.meshBoundsMin; - Vector3 bmax = this.meshBoundsMax; + Vector2 bmin = this.meshBoundsMin; + Vector2 bmax = this.meshBoundsMax; var vbi = vertexBuffer.Items; var ubi = uvBuffer.Items; @@ -968,8 +968,6 @@ namespace Spine.Unity { var vbi = vertexBuffer.Items; var ubi = uvBuffer.Items; var cbi = colorBuffer.Items; - //var sbi = submeshes.Items; - //int submeshCount = submeshes.Count; // Zero the extra. { @@ -990,10 +988,11 @@ namespace Spine.Unity { mesh.bounds = new Bounds(); } else { //mesh.bounds = ArraysMeshGenerator.ToBounds(meshBoundsMin, meshBoundsMax); - Vector2 halfSize = (meshBoundsMax - meshBoundsMin) * 0.5f; + float halfWidth = (meshBoundsMax.x - meshBoundsMin.x) * 0.5f; + float halfHeight = (meshBoundsMax.y - meshBoundsMin.y) * 0.5f; mesh.bounds = new Bounds { - center = (Vector3)(meshBoundsMin + halfSize), - extents = new Vector3(halfSize.x, halfSize.y, meshBoundsThickness * 0.5f) + center = new Vector3(meshBoundsMin.x + halfWidth, meshBoundsMin.y + halfHeight), + extents = new Vector3(halfWidth, halfHeight, meshBoundsThickness * 0.5f) }; } } From b0aedb0aac493711f796797c2c63919d6ab98e6b Mon Sep 17 00:00:00 2001 From: aram-ahak Date: Thu, 28 Jun 2018 12:15:28 +0400 Subject: [PATCH 2/5] Fixed illogical comparison warning (#1128) --- spine-as3/spine-as3/src/spine/animation/TrackEntry.as | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spine-as3/spine-as3/src/spine/animation/TrackEntry.as b/spine-as3/spine-as3/src/spine/animation/TrackEntry.as index aa6eb3661..1d9543dfe 100644 --- a/spine-as3/spine-as3/src/spine/animation/TrackEntry.as +++ b/spine-as3/spine-as3/src/spine/animation/TrackEntry.as @@ -99,7 +99,7 @@ package spine.animation { var id : String = intId.toString(); var contained: Object = propertyIDs[id]; propertyIDs[id] = true; - if (contained != undefined) { + if (contained != null) { timelineData[i] = AnimationState.SUBSEQUENT; } else if (to == null || !to.hasTimeline(intId)) { timelineData[i] = AnimationState.FIRST; From 3e6ac83a9dc2dbc1ee685ab6aab5d75f2b875287 Mon Sep 17 00:00:00 2001 From: badlogic Date: Thu, 28 Jun 2018 11:11:49 +0200 Subject: [PATCH 3/5] [libgdx] Fixed Maven version. --- spine-libgdx/spine-libgdx/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spine-libgdx/spine-libgdx/pom.xml b/spine-libgdx/spine-libgdx/pom.xml index 472a51fc7..8ebd20fb4 100644 --- a/spine-libgdx/spine-libgdx/pom.xml +++ b/spine-libgdx/spine-libgdx/pom.xml @@ -10,7 +10,7 @@ com.esotericsoftware.spine spine-libgdx jar - 3.6.52.2-SNAPSHOT + 3.6.53.1-SNAPSHOT spine-libgdx Spine Runtime for libGDX @@ -50,7 +50,7 @@ UTF-8 - 1.9.6 + 1.9.6 @@ -92,7 +92,7 @@ org.apache.maven.plugins maven-release-plugin - 2.5.3 + 2.5.3 default From 206a8e675ced943a3f4c4ba0bd9ba9bfa990e3f6 Mon Sep 17 00:00:00 2001 From: badlogic Date: Thu, 28 Jun 2018 11:12:51 +0200 Subject: [PATCH 4/5] [maven-release-plugin] prepare release spine-libgdx-3.6.53.1 --- spine-libgdx/spine-libgdx/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spine-libgdx/spine-libgdx/pom.xml b/spine-libgdx/spine-libgdx/pom.xml index 8ebd20fb4..400886412 100644 --- a/spine-libgdx/spine-libgdx/pom.xml +++ b/spine-libgdx/spine-libgdx/pom.xml @@ -10,7 +10,7 @@ com.esotericsoftware.spine spine-libgdx jar - 3.6.53.1-SNAPSHOT + 3.6.53.1 spine-libgdx Spine Runtime for libGDX @@ -38,7 +38,7 @@ scm:git:https://github.com/EsotericSoftware/spine-runtimes.git scm:git:https://github.com/EsotericSoftware/spine-runtimes.git https://github.com/EsotericSoftware/spine-runtimes/ - HEAD + spine-libgdx-3.6.53.1 From 52f483e0ad89c4a1b6b97e3a527ccce546513a4c Mon Sep 17 00:00:00 2001 From: badlogic Date: Thu, 28 Jun 2018 11:12:57 +0200 Subject: [PATCH 5/5] [maven-release-plugin] prepare for next development iteration --- spine-libgdx/spine-libgdx/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spine-libgdx/spine-libgdx/pom.xml b/spine-libgdx/spine-libgdx/pom.xml index 400886412..c64f420e9 100644 --- a/spine-libgdx/spine-libgdx/pom.xml +++ b/spine-libgdx/spine-libgdx/pom.xml @@ -10,7 +10,7 @@ com.esotericsoftware.spine spine-libgdx jar - 3.6.53.1 + 3.6.53.2-SNAPSHOT spine-libgdx Spine Runtime for libGDX @@ -38,7 +38,7 @@ scm:git:https://github.com/EsotericSoftware/spine-runtimes.git scm:git:https://github.com/EsotericSoftware/spine-runtimes.git https://github.com/EsotericSoftware/spine-runtimes/ - spine-libgdx-3.6.53.1 + HEAD