UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed curves for spine-csharp.

Browse Source
This commit is contained in:
NathanSweet 2013-04-21 20:08:05 +02:00
parent f055dc8fd7
commit 5b346095cf
3 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
spine-csharp/src/SkeletonJson.cs
View File

@ -77,12 +77,12 @@ namespace Spine {
throw new Exception("Parent bone not found: " + boneMap["parent"]); throw new Exception("Parent bone not found: " + boneMap["parent"]);
} }
BoneData boneData = new BoneData((String)boneMap["name"], parent); BoneData boneData = new BoneData((String)boneMap["name"], parent);
boneData.Length = getFloat(boneMap, "length", 0) * Scale; boneData.Length = GetFloat(boneMap, "length", 0) * Scale;
boneData.X = getFloat(boneMap, "x", 0) * Scale; boneData.X = GetFloat(boneMap, "x", 0) * Scale;
boneData.Y = getFloat(boneMap, "y", 0) * Scale; boneData.Y = GetFloat(boneMap, "y", 0) * Scale;
boneData.Rotation = getFloat(boneMap, "rotation", 0); boneData.Rotation = GetFloat(boneMap, "rotation", 0);
boneData.ScaleX = getFloat(boneMap, "scaleX", 1); boneData.ScaleX = GetFloat(boneMap, "scaleX", 1);
boneData.ScaleY = getFloat(boneMap, "scaleY", 1); boneData.ScaleY = GetFloat(boneMap, "scaleY", 1);
skeletonData.AddBone(boneData); skeletonData.AddBone(boneData);
} }
@ -99,10 +99,10 @@ namespace Spine {
if (slotMap.ContainsKey("color")) { if (slotMap.ContainsKey("color")) {
String color = (String)slotMap["color"]; String color = (String)slotMap["color"];
slotData.R = toColor(color, 0); slotData.R = ToColor(color, 0);
slotData.G = toColor(color, 1); slotData.G = ToColor(color, 1);
slotData.B = toColor(color, 2); slotData.B = ToColor(color, 2);
slotData.A = toColor(color, 3); slotData.A = ToColor(color, 3);
} }
if (slotMap.ContainsKey("attachment")) if (slotMap.ContainsKey("attachment"))
@ -120,7 +120,7 @@ namespace Spine {
foreach (KeyValuePair<String, Object> slotEntry in (Dictionary<String, Object>)entry.Value) { foreach (KeyValuePair<String, Object> slotEntry in (Dictionary<String, Object>)entry.Value) {
int slotIndex = skeletonData.FindSlotIndex(slotEntry.Key); int slotIndex = skeletonData.FindSlotIndex(slotEntry.Key);
foreach (KeyValuePair<String, Object> attachmentEntry in ((Dictionary<String, Object>)slotEntry.Value)) { foreach (KeyValuePair<String, Object> attachmentEntry in ((Dictionary<String, Object>)slotEntry.Value)) {
Attachment attachment = readAttachment(skin, attachmentEntry.Key, (Dictionary<String, Object>)attachmentEntry.Value); Attachment attachment = ReadAttachment(skin, attachmentEntry.Key, (Dictionary<String, Object>)attachmentEntry.Value);
skin.AddAttachment(slotIndex, attachmentEntry.Key, attachment); skin.AddAttachment(slotIndex, attachmentEntry.Key, attachment);
} }
} }
@ -135,7 +135,7 @@ namespace Spine {
if (root.ContainsKey("animations")) { if (root.ContainsKey("animations")) {
Dictionary<String, Object> animationMap = (Dictionary<String, Object>)root["animations"]; Dictionary<String, Object> animationMap = (Dictionary<String, Object>)root["animations"];
foreach (KeyValuePair<String, Object> entry in animationMap) foreach (KeyValuePair<String, Object> entry in animationMap)
readAnimation(entry.Key, (Dictionary<String, Object>)entry.Value, skeletonData); ReadAnimation(entry.Key, (Dictionary<String, Object>)entry.Value, skeletonData);
} }
skeletonData.Bones.TrimExcess(); skeletonData.Bones.TrimExcess();
@ -145,7 +145,7 @@ namespace Spine {
return skeletonData; return skeletonData;
} }
private Attachment readAttachment (Skin skin, String name, Dictionary<String, Object> map) { private Attachment ReadAttachment (Skin skin, String name, Dictionary<String, Object> map) {
if (map.ContainsKey("name")) if (map.ContainsKey("name"))
name = (String)map["name"]; name = (String)map["name"];
@ -156,32 +156,32 @@ namespace Spine {
if (attachment is RegionAttachment) { if (attachment is RegionAttachment) {
RegionAttachment regionAttachment = (RegionAttachment)attachment; RegionAttachment regionAttachment = (RegionAttachment)attachment;
regionAttachment.X = getFloat(map, "x", 0) * Scale; regionAttachment.X = GetFloat(map, "x", 0) * Scale;
regionAttachment.Y = getFloat(map, "y", 0) * Scale; regionAttachment.Y = GetFloat(map, "y", 0) * Scale;
regionAttachment.ScaleX = getFloat(map, "scaleX", 1); regionAttachment.ScaleX = GetFloat(map, "scaleX", 1);
regionAttachment.ScaleY = getFloat(map, "scaleY", 1); regionAttachment.ScaleY = GetFloat(map, "scaleY", 1);
regionAttachment.Rotation = getFloat(map, "rotation", 0); regionAttachment.Rotation = GetFloat(map, "rotation", 0);
regionAttachment.Width = getFloat(map, "width", 32) * Scale; regionAttachment.Width = GetFloat(map, "width", 32) * Scale;
regionAttachment.Height = getFloat(map, "height", 32) * Scale; regionAttachment.Height = GetFloat(map, "height", 32) * Scale;
regionAttachment.UpdateOffset(); regionAttachment.UpdateOffset();
} }
return attachment; return attachment;
} }
private float getFloat (Dictionary<String, Object> map, String name, float defaultValue) { private float GetFloat (Dictionary<String, Object> map, String name, float defaultValue) {
if (!map.ContainsKey(name)) if (!map.ContainsKey(name))
return (float)defaultValue; return (float)defaultValue;
return (float)map[name]; return (float)map[name];
} }
public static float toColor (String hexString, int colorIndex) { public static float ToColor (String hexString, int colorIndex) {
if (hexString.Length != 8) if (hexString.Length != 8)
throw new ArgumentException("Color hexidecimal length must be 8, recieved: " + hexString); throw new ArgumentException("Color hexidecimal length must be 8, recieved: " + hexString);
return Convert.ToInt32(hexString.Substring(colorIndex * 2, 2), 16) / (float)255; return Convert.ToInt32(hexString.Substring(colorIndex * 2, 2), 16) / (float)255;
} }
private void readAnimation (String name, Dictionary<String, Object> map, SkeletonData skeletonData) { private void ReadAnimation (String name, Dictionary<String, Object> map, SkeletonData skeletonData) {
var timelines = new List<Timeline>(); var timelines = new List<Timeline>();
float duration = 0; float duration = 0;
@ -204,7 +204,7 @@ namespace Spine {
foreach (Dictionary<String, Object> valueMap in values) { foreach (Dictionary<String, Object> valueMap in values) {
float time = (float)valueMap["time"]; float time = (float)valueMap["time"];
timeline.SetFrame(frameIndex, time, (float)valueMap["angle"]); timeline.SetFrame(frameIndex, time, (float)valueMap["angle"]);
readCurve(timeline, frameIndex, valueMap); ReadCurve(timeline, frameIndex, valueMap);
frameIndex++; frameIndex++;
} }
timelines.Add(timeline); timelines.Add(timeline);
@ -227,7 +227,7 @@ namespace Spine {
float x = valueMap.ContainsKey("x") ? (float)valueMap["x"] : 0; float x = valueMap.ContainsKey("x") ? (float)valueMap["x"] : 0;
float y = valueMap.ContainsKey("y") ? (float)valueMap["y"] : 0; float y = valueMap.ContainsKey("y") ? (float)valueMap["y"] : 0;
timeline.SetFrame(frameIndex, time, (float)x * timelineScale, (float)y * timelineScale); timeline.SetFrame(frameIndex, time, (float)x * timelineScale, (float)y * timelineScale);
readCurve(timeline, frameIndex, valueMap); ReadCurve(timeline, frameIndex, valueMap);
frameIndex++; frameIndex++;
} }
timelines.Add(timeline); timelines.Add(timeline);
@ -256,8 +256,8 @@ namespace Spine {
foreach (Dictionary<String, Object> valueMap in values) { foreach (Dictionary<String, Object> valueMap in values) {
float time = (float)valueMap["time"]; float time = (float)valueMap["time"];
String c = (String)valueMap["color"]; String c = (String)valueMap["color"];
timeline.setFrame(frameIndex, time, toColor(c, 0), toColor(c, 1), toColor(c, 2), toColor(c, 3)); timeline.setFrame(frameIndex, time, ToColor(c, 0), ToColor(c, 1), ToColor(c, 2), ToColor(c, 3));
readCurve(timeline, frameIndex, valueMap); ReadCurve(timeline, frameIndex, valueMap);
frameIndex++; frameIndex++;
} }
timelines.Add(timeline); timelines.Add(timeline);
@ -285,14 +285,14 @@ namespace Spine {
skeletonData.AddAnimation(new Animation(name, timelines, duration)); skeletonData.AddAnimation(new Animation(name, timelines, duration));
} }
private void readCurve (CurveTimeline timeline, int frameIndex, Dictionary<String, Object> valueMap) { private void ReadCurve (CurveTimeline timeline, int frameIndex, Dictionary<String, Object> valueMap) {
if (!valueMap.ContainsKey("curve")) if (!valueMap.ContainsKey("curve"))
return; return;
Object curveObject = valueMap["curve"]; Object curveObject = valueMap["curve"];
if (curveObject.Equals("stepped")) if (curveObject.Equals("stepped"))
timeline.SetStepped(frameIndex); timeline.SetStepped(frameIndex);
else if (curveObject.GetType() == typeof(List<float>)) { else if (curveObject is List<Object>) {
List<float> curve = (List<float>)curveObject; List<Object> curve = (List<Object>)curveObject;
timeline.SetCurve(frameIndex, (float)curve[0], (float)curve[1], (float)curve[2], (float)curve[3]); timeline.SetCurve(frameIndex, (float)curve[0], (float)curve[1], (float)curve[2], (float)curve[3]);
} }
} }

10
spine-unity/Assets/Plugins/Editor/Spine/Menus.cs
View File

@ -24,6 +24,7 @@
******************************************************************************/ ******************************************************************************/
using System; using System;
using System.IO;
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using Spine; using Spine;
@ -31,15 +32,20 @@ using Spine;
public class SpineEditor { public class SpineEditor {
[MenuItem("Assets/Create/Spine Atlas")] [MenuItem("Assets/Create/Spine Atlas")]
static public void CreateAtlas () { static public void CreateAtlas () {
CreateAsset<AtlasAsset>("Assets/New Spine Atlas"); CreateAsset<AtlasAsset>("New Spine Atlas");
} }
[MenuItem("Assets/Create/Spine Skeleton Data")] [MenuItem("Assets/Create/Spine Skeleton Data")]
static public void CreateSkeletonData () { static public void CreateSkeletonData () {
CreateAsset<SkeletonDataAsset>("Assets/New Spine Skeleton Data"); CreateAsset<SkeletonDataAsset>("New Spine Skeleton Data");
} }
static private void CreateAsset <T> (String path) where T : ScriptableObject { static private void CreateAsset <T> (String path) where T : ScriptableObject {
try {
path = Path.GetDirectoryName(AssetDatabase.GetAssetPath(Selection.activeObject)) + "/" + path;
} catch (Exception) {
path = "Assets/" + path;
}
ScriptableObject asset = ScriptableObject.CreateInstance<T>(); ScriptableObject asset = ScriptableObject.CreateInstance<T>();
AssetDatabase.CreateAsset(asset, path + ".asset"); AssetDatabase.CreateAsset(asset, path + ".asset");
AssetDatabase.SaveAssets(); AssetDatabase.SaveAssets();

5
spine-unity/Assets/Plugins/Spine/SkeletonDataAsset.cs
View File

@ -22,7 +22,6 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/ ******************************************************************************/
using System; using System;
using System.IO; using System.IO;
using System.Collections.Generic; using System.Collections.Generic;
@ -72,9 +71,9 @@ public class SkeletonDataAsset : ScriptableObject {
json.Scale = scale; json.Scale = scale;
try { try {
skeletonData = json.ReadSkeletonData(new StringReader(skeletonJSON.text)); skeletonData = json.ReadSkeletonData(new StringReader(skeletonJSON.text));
} catch (Exception) { } catch (Exception ex) {
if (!quiet) if (!quiet)
Debug.LogException(new Exception("Error reading skeleton JSON file for skeleton data asset: " + name), this); Debug.LogException(new Exception("Error reading skeleton JSON file for skeleton data asset: " + name, ex), this);
return null; return null;
} }