From 1f8cad35eb6f29b9d6d915beaeb1b82e5fe756e5 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Tue, 28 May 2013 17:52:34 +0200 Subject: [PATCH] Fix up property name case. --- spine-csharp/src/Bone.cs | 10 +++++----- spine-csharp/src/BoneData.cs | 4 ++-- spine-csharp/src/SkeletonJson.cs | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spine-csharp/src/Bone.cs b/spine-csharp/src/Bone.cs index 41f1a9ef3..60860ec84 100644 --- a/spine-csharp/src/Bone.cs +++ b/spine-csharp/src/Bone.cs @@ -61,8 +61,8 @@ namespace Spine { if (parent != null) { WorldX = X * parent.M00 + Y * parent.M01 + parent.WorldX; WorldY = X * parent.M10 + Y * parent.M11 + parent.WorldY; - - if(Data.inheritScale) { + + if (Data.InheritScale) { WorldScaleX = parent.WorldScaleX * ScaleX; WorldScaleY = parent.WorldScaleY * ScaleY; } else { @@ -70,10 +70,10 @@ namespace Spine { WorldScaleY = ScaleY; } - WorldRotation = Data.inheritRotation ? parent.WorldRotation + Rotation : Rotation; - + WorldRotation = Data.InheritRotation ? parent.WorldRotation + Rotation : Rotation; + } else { - + WorldX = X; WorldY = Y; WorldScaleX = ScaleX; diff --git a/spine-csharp/src/BoneData.cs b/spine-csharp/src/BoneData.cs index 260b04b47..5986ce848 100644 --- a/spine-csharp/src/BoneData.cs +++ b/spine-csharp/src/BoneData.cs @@ -36,8 +36,8 @@ namespace Spine { public float Rotation { get; set; } public float ScaleX { get; set; } public float ScaleY { get; set; } - public bool inheritScale { get; set; } - public bool inheritRotation { get; set; } + public bool InheritScale { get; set; } + public bool InheritRotation { get; set; } /** @param parent May be null. */ public BoneData (String name, BoneData parent) { diff --git a/spine-csharp/src/SkeletonJson.cs b/spine-csharp/src/SkeletonJson.cs index 0756bbb42..19f71b8b4 100644 --- a/spine-csharp/src/SkeletonJson.cs +++ b/spine-csharp/src/SkeletonJson.cs @@ -83,8 +83,8 @@ namespace Spine { boneData.Rotation = GetFloat(boneMap, "rotation", 0); boneData.ScaleX = GetFloat(boneMap, "scaleX", 1); boneData.ScaleY = GetFloat(boneMap, "scaleY", 1); - boneData.inheritScale = GetBoolean (boneMap, "inheritScale", true); - boneData.inheritRotation = GetBoolean (boneMap, "inheritRotation", true); + boneData.InheritScale = GetBoolean (boneMap, "inheritScale", true); + boneData.InheritRotation = GetBoolean (boneMap, "inheritRotation", true); skeletonData.AddBone(boneData); }