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

Clean up.

Browse Source
This commit is contained in:
NathanSweet 2014-09-30 01:27:41 +02:00
parent 69a611fbf2
commit 57f24ff8cc
7 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-csharp/src/Animation.cs
View File

@ -637,10 +637,6 @@ namespace Spine {
frames = new float[frameCount * 3]; frames = new float[frameCount * 3];
} }
public float[] getFrames () {
return frames;
}
/** Sets the time, mix and bend direction of the specified keyframe. */ /** Sets the time, mix and bend direction of the specified keyframe. */
public void setFrame (int frameIndex, float time, float mix, int bendDirection) { public void setFrame (int frameIndex, float time, float mix, int bendDirection) {
frameIndex *= 3; frameIndex *= 3;

4
spine-csharp/src/Bone.cs
View File

@ -134,8 +134,8 @@ namespace Spine {
float m00 = this.m00, m10 = this.m10, m01 = this.m01, m11 = this.m11; float m00 = this.m00, m10 = this.m10, m01 = this.m01, m11 = this.m11;
Skeleton skeleton = this.skeleton; Skeleton skeleton = this.skeleton;
if (skeleton.flipX != (skeleton.flipY != yDown)) { if (skeleton.flipX != (skeleton.flipY != yDown)) {
m00 *= -1; m00 = -m00;
m11 *= -1; m11 = -m11;
} }
float invDet = 1 / (m00 * m11 - m01 * m10); float invDet = 1 / (m00 * m11 - m01 * m10);
localX = (dx * m00 * invDet - dy * m01 * invDet); localX = (dx * m00 * invDet - dy * m01 * invDet);

6
spine-csharp/src/IkConstraint.cs
View File

@ -38,8 +38,8 @@ namespace Spine {
internal IkConstraintData data; internal IkConstraintData data;
internal List<Bone> bones = new List<Bone>(); internal List<Bone> bones = new List<Bone>();
internal Bone target; internal Bone target;
internal int bendDirection = 1; internal int bendDirection;
internal float mix = 1; internal float mix;
public IkConstraintData Data { get { return data; } } public IkConstraintData Data { get { return data; } }
public List<Bone> Bones { get { return bones; } } public List<Bone> Bones { get { return bones; } }
@ -48,6 +48,8 @@ namespace Spine {
public float Mix { get { return mix; } set { mix = value; } } public float Mix { get { return mix; } set { mix = value; } }
public IkConstraint (IkConstraintData data, Skeleton skeleton) { public IkConstraint (IkConstraintData data, Skeleton skeleton) {
if (data == null) throw new ArgumentNullException("data cannot be null.");
if (skeleton == null) throw new ArgumentNullException("skeleton cannot be null.");
this.data = data; this.data = data;
mix = data.mix; mix = data.mix;
bendDirection = data.bendDirection; bendDirection = data.bendDirection;

11
spine-csharp/src/Skeleton.cs
View File

@ -37,7 +37,7 @@ namespace Spine {
internal List<Bone> bones; internal List<Bone> bones;
internal List<Slot> slots; internal List<Slot> slots;
internal List<Slot> drawOrder; internal List<Slot> drawOrder;
internal List<IkConstraint> ikConstraints = new List<IkConstraint>(); internal List<IkConstraint> ikConstraints;
private List<List<Bone>> boneCache = new List<List<Bone>>(); private List<List<Bone>> boneCache = new List<List<Bone>>();
internal Skin skin; internal Skin skin;
internal float r = 1, g = 1, b = 1, a = 1; internal float r = 1, g = 1, b = 1, a = 1;
@ -74,12 +74,9 @@ namespace Spine {
bones = new List<Bone>(data.bones.Count); bones = new List<Bone>(data.bones.Count);
foreach (BoneData boneData in data.bones) { foreach (BoneData boneData in data.bones) {
Bone parent = boneData.parent == null ? null : bones[data.bones.IndexOf(boneData.parent)]; Bone parent = boneData.parent == null ? null : bones[data.bones.IndexOf(boneData.parent)];
bones.Add(new Bone(boneData, this, parent)); Bone bone = new Bone(boneData, this, parent);
} if (parent != null) parent.children.Add(bone);
bones.Add(bone);
foreach(Bone b in bones){
if(b.Parent != null)
b.Parent.children.Add(b);
} }
slots = new List<Slot>(data.slots.Count); slots = new List<Slot>(data.slots.Count);

2
spine-csharp/src/SkeletonData.cs
View File

@ -136,7 +136,7 @@ namespace Spine {
return null; return null;
} }
// --- IK // --- IK constraints.
/// <returns>May be null.</returns> /// <returns>May be null.</returns>
public IkConstraintData FindIkConstraint (String ikConstraintName) { public IkConstraintData FindIkConstraint (String ikConstraintName) {

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

@ -96,7 +96,7 @@ namespace Spine {
skeletonData.hash = (String)skeletonMap["hash"]; skeletonData.hash = (String)skeletonMap["hash"];
skeletonData.version = (String)skeletonMap["spine"]; skeletonData.version = (String)skeletonMap["spine"];
skeletonData.width = GetFloat(skeletonMap, "width", 0); skeletonData.width = GetFloat(skeletonMap, "width", 0);
skeletonData.height = GetFloat(skeletonMap, "width", 1); skeletonData.height = GetFloat(skeletonMap, "height", 0);
} }
// Bones. // Bones.

4
spine-libgdx/src/com/esotericsoftware/spine/Bone.java
View File

@ -264,8 +264,8 @@ public class Bone {
float m00 = this.m00, m10 = this.m10, m01 = this.m01, m11 = this.m11; float m00 = this.m00, m10 = this.m10, m01 = this.m01, m11 = this.m11;
Skeleton skeleton = this.skeleton; Skeleton skeleton = this.skeleton;
if (skeleton.flipX != skeleton.flipY) { if (skeleton.flipX != skeleton.flipY) {
m00 *= -1; m00 = -m00;
m11 *= -1; m11 = -m11;
} }
float invDet = 1 / (m00 * m11 - m01 * m10); float invDet = 1 / (m00 * m11 - m01 * m10);
world.x = (x * m00 * invDet - y * m01 * invDet); world.x = (x * m00 * invDet - y * m01 * invDet);