From 367cf651cfad62e3be02d1d52c1e4123a9c1cf52 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Sat, 17 Sep 2016 09:24:34 +0200 Subject: [PATCH] Added FPS for 3.5.00-beta. --- .../com/esotericsoftware/spine/SkeletonBinary.java | 1 + .../com/esotericsoftware/spine/SkeletonData.java | 14 +++++++++++++- .../com/esotericsoftware/spine/SkeletonJson.java | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java index 53a34e91e..00c4aa1b8 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java @@ -170,6 +170,7 @@ public class SkeletonBinary { boolean nonessential = input.readBoolean(); if (nonessential) { + skeletonData.fps = input.readFloat(); skeletonData.imagesPath = input.readString(); if (skeletonData.imagesPath.isEmpty()) skeletonData.imagesPath = null; } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonData.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonData.java index 9b90d213f..d168c0685 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonData.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonData.java @@ -45,7 +45,11 @@ public class SkeletonData { final Array transformConstraints = new Array(); final Array pathConstraints = new Array(); float width, height; - String version, hash, imagesPath; + String version, hash; + + // Nonessential. + float fps; + String imagesPath; // --- Bones. @@ -273,6 +277,14 @@ public class SkeletonData { this.imagesPath = imagesPath; } + public float getFps () { + return fps; + } + + public void setFps (float fps) { + this.fps = fps; + } + public String toString () { return name != null ? name : super.toString(); } diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java index 63bb5b6d2..04913c2cf 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java @@ -110,6 +110,7 @@ public class SkeletonJson { skeletonData.version = skeletonMap.getString("spine", null); skeletonData.width = skeletonMap.getFloat("width", 0); skeletonData.height = skeletonMap.getFloat("height", 0); + skeletonData.fps = skeletonMap.getFloat("fps", 0); skeletonData.imagesPath = skeletonMap.getString("images", null); }