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

Merge branch '3.8-beta' of https://github.com/EsotericSoftware/spine-runtimes into 3.8-beta

Browse Source
This commit is contained in:
badlogic 2019-06-24 16:18:32 +02:00
commit 942e1c722a
12 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,7 +150,7 @@ namespace Spine {
Bone parent = this.parent; Bone parent = this.parent;
if (parent == null) { // Root bone. if (parent == null) { // Root bone.
float rotationY = rotation + 90 + shearY, sx = skeleton.scaleX, sy = skeleton.scaleY; float rotationY = rotation + 90 + shearY, sx = skeleton.ScaleX, sy = skeleton.ScaleY;
a = MathUtils.CosDeg(rotation + shearX) * scaleX * sx; a = MathUtils.CosDeg(rotation + shearX) * scaleX * sx;
b = MathUtils.CosDeg(rotationY) * scaleY * sx; b = MathUtils.CosDeg(rotationY) * scaleY * sx;
c = MathUtils.SinDeg(rotation + shearX) * scaleX * sy; c = MathUtils.SinDeg(rotation + shearX) * scaleX * sy;
@ -212,15 +212,15 @@ namespace Spine {
case TransformMode.NoScale: case TransformMode.NoScale:
case TransformMode.NoScaleOrReflection: { case TransformMode.NoScaleOrReflection: {
float cos = MathUtils.CosDeg(rotation), sin = MathUtils.SinDeg(rotation); float cos = MathUtils.CosDeg(rotation), sin = MathUtils.SinDeg(rotation);
float za = (pa * cos + pb * sin) / skeleton.scaleX; float za = (pa * cos + pb * sin) / skeleton.ScaleX;
float zc = (pc * cos + pd * sin) / skeleton.scaleY; float zc = (pc * cos + pd * sin) / skeleton.ScaleY;
float s = (float)Math.Sqrt(za * za + zc * zc); float s = (float)Math.Sqrt(za * za + zc * zc);
if (s > 0.00001f) s = 1 / s; if (s > 0.00001f) s = 1 / s;
za *= s; za *= s;
zc *= s; zc *= s;
s = (float)Math.Sqrt(za * za + zc * zc); s = (float)Math.Sqrt(za * za + zc * zc);
if (data.transformMode == TransformMode.NoScale if (data.transformMode == TransformMode.NoScale
&& (pa * pd - pb * pc < 0) != (skeleton.scaleX < 0 != skeleton.scaleY < 0)) s = -s; && (pa * pd - pb * pc < 0) != (skeleton.ScaleX < 0 != skeleton.ScaleY < 0)) s = -s;
float r = MathUtils.PI / 2 + MathUtils.Atan2(zc, za); float r = MathUtils.PI / 2 + MathUtils.Atan2(zc, za);
float zb = MathUtils.Cos(r) * s; float zb = MathUtils.Cos(r) * s;
@ -237,10 +237,10 @@ namespace Spine {
} }
} }
a *= skeleton.scaleX; a *= skeleton.ScaleX;
b *= skeleton.scaleX; b *= skeleton.ScaleX;
c *= skeleton.scaleY; c *= skeleton.ScaleY;
d *= skeleton.scaleY; d *= skeleton.ScaleY;
} }
public void SetToSetupPose () { public void SetToSetupPose () {

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

@ -44,7 +44,7 @@ namespace Spine {
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;
internal float time; internal float time;
internal float scaleX = 1, scaleY = 1; private float scaleX = 1, scaleY = 1;
internal float x, y; internal float x, y;
public SkeletonData Data { get { return data; } } public SkeletonData Data { get { return data; } }
@ -64,7 +64,7 @@ namespace Spine {
public float X { get { return x; } set { x = value; } } public float X { get { return x; } set { x = value; } }
public float Y { get { return y; } set { y = value; } } public float Y { get { return y; } set { y = value; } }
public float ScaleX { get { return scaleX; } set { scaleX = value; } } public float ScaleX { get { return scaleX; } set { scaleX = value; } }
public float ScaleY { get { return scaleY; } set { scaleY = value; } } public float ScaleY { get { return scaleY * (Bone.yDown ? -1 : 1); } set { scaleY = value; } }
[Obsolete("Use ScaleX instead. FlipX is when ScaleX is negative.")] [Obsolete("Use ScaleX instead. FlipX is when ScaleX is negative.")]
public bool FlipX { get { return scaleX < 0; } set { scaleX = value ? -1f : 1f; } } public bool FlipX { get { return scaleX < 0; } set { scaleX = value ? -1f : 1f; } }

6
spine-monogame/example/ExampleGame.cs
View File

@ -77,8 +77,7 @@ namespace Spine {
AnimationStateData stateData = new AnimationStateData(skeleton.Data); AnimationStateData stateData = new AnimationStateData(skeleton.Data);
state = new AnimationState(stateData); state = new AnimationState(stateData);
// Flip the skeleton on the y-axis and center it within the viewport // Center within the viewport
skeleton.ScaleY = -1;
skeleton.X = game.GraphicsDevice.Viewport.Width / 2; skeleton.X = game.GraphicsDevice.Viewport.Width / 2;
skeleton.Y = game.GraphicsDevice.Viewport.Height; skeleton.Y = game.GraphicsDevice.Viewport.Height;
@ -135,7 +134,6 @@ namespace Spine {
AnimationStateData stateData = new AnimationStateData(skeleton.Data); AnimationStateData stateData = new AnimationStateData(skeleton.Data);
state = new AnimationState(stateData); state = new AnimationState(stateData);
skeleton.ScaleY = -1;
skeleton.X = game.GraphicsDevice.Viewport.Width / 2 + 200; skeleton.X = game.GraphicsDevice.Viewport.Width / 2 + 200;
skeleton.Y = game.GraphicsDevice.Viewport.Height; skeleton.Y = game.GraphicsDevice.Viewport.Height;
@ -182,7 +180,6 @@ namespace Spine {
AnimationStateData stateData = new AnimationStateData(skeleton.Data); AnimationStateData stateData = new AnimationStateData(skeleton.Data);
state = new AnimationState(stateData); state = new AnimationState(stateData);
skeleton.ScaleY = -1;
skeleton.X = game.GraphicsDevice.Viewport.Width / 2; skeleton.X = game.GraphicsDevice.Viewport.Width / 2;
skeleton.Y = game.GraphicsDevice.Viewport.Height; skeleton.Y = game.GraphicsDevice.Viewport.Height;
@ -237,7 +234,6 @@ namespace Spine {
AnimationStateData stateData = new AnimationStateData(skeleton.Data); AnimationStateData stateData = new AnimationStateData(skeleton.Data);
state = new AnimationState(stateData); state = new AnimationState(stateData);
skeleton.ScaleY = -1;
skeleton.X = game.GraphicsDevice.Viewport.Width / 2; skeleton.X = game.GraphicsDevice.Viewport.Width / 2;
skeleton.Y = game.GraphicsDevice.Viewport.Height; skeleton.Y = game.GraphicsDevice.Viewport.Height;

2
spine-unity/Assets/Spine/Runtime/spine-unity/Components/BoneFollower.cs
View File

@ -177,7 +177,7 @@ namespace Spine.Unity {
} }
Vector3 localScale = followLocalScale ? new Vector3(bone.scaleX, bone.scaleY, 1f) : new Vector3(1f, 1f, 1f); Vector3 localScale = followLocalScale ? new Vector3(bone.scaleX, bone.scaleY, 1f) : new Vector3(1f, 1f, 1f);
if (followSkeletonFlip) localScale.y *= Mathf.Sign(bone.skeleton.scaleX * bone.skeleton.scaleY); if (followSkeletonFlip) localScale.y *= Mathf.Sign(bone.skeleton.ScaleX * bone.skeleton.ScaleY);
thisTransform.localScale = localScale; thisTransform.localScale = localScale;
} }
} }

2
spine-unity/Assets/Spine/Runtime/spine-unity/Components/PointFollower.cs
View File

@ -150,7 +150,7 @@ namespace Spine.Unity {
if (followSkeletonFlip) { if (followSkeletonFlip) {
Vector3 localScale = thisTransform.localScale; Vector3 localScale = thisTransform.localScale;
localScale.y = Mathf.Abs(localScale.y) * Mathf.Sign(bone.skeleton.scaleX * bone.skeleton.scaleY); localScale.y = Mathf.Abs(localScale.y) * Mathf.Sign(bone.skeleton.ScaleX * bone.skeleton.ScaleY);
thisTransform.localScale = localScale; thisTransform.localScale = localScale;
} }
} }

4
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs
View File

@ -291,8 +291,8 @@ namespace Spine.Unity {
rendererBuffers.Initialize(); rendererBuffers.Initialize();
skeleton = new Skeleton(skeletonData) { skeleton = new Skeleton(skeletonData) {
scaleX = initialFlipX ? -1 : 1, ScaleX = initialFlipX ? -1 : 1,
scaleY = initialFlipY ? -1 : 1 ScaleY = initialFlipY ? -1 : 1
}; };
if (!string.IsNullOrEmpty(initialSkinName) && !string.Equals(initialSkinName, "default", System.StringComparison.Ordinal)) if (!string.IsNullOrEmpty(initialSkinName) && !string.Equals(initialSkinName, "default", System.StringComparison.Ordinal))

2
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/BoneFollowerGraphic.cs
View File

@ -159,7 +159,7 @@ namespace Spine.Unity {
} }
Vector3 localScale = followLocalScale ? new Vector3(bone.scaleX, bone.scaleY, 1f) : new Vector3(1f, 1f, 1f); Vector3 localScale = followLocalScale ? new Vector3(bone.scaleX, bone.scaleY, 1f) : new Vector3(1f, 1f, 1f);
if (followSkeletonFlip) localScale.y *= Mathf.Sign(bone.skeleton.scaleX * bone.skeleton.scaleY); if (followSkeletonFlip) localScale.y *= Mathf.Sign(bone.skeleton.ScaleX * bone.skeleton.ScaleY);
thisTransform.localScale = localScale; thisTransform.localScale = localScale;
} }

8
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs
View File

@ -89,8 +89,8 @@ namespace Spine.Unity {
// Only provide visual feedback to inspector changes in Unity Editor Edit mode. // Only provide visual feedback to inspector changes in Unity Editor Edit mode.
if (!Application.isPlaying) { if (!Application.isPlaying) {
skeleton.scaleX = this.initialFlipX ? -1 : 1; skeleton.ScaleX = this.initialFlipX ? -1 : 1;
skeleton.scaleY = this.initialFlipY ? -1 : 1; skeleton.ScaleY = this.initialFlipY ? -1 : 1;
state.ClearTrack(0); state.ClearTrack(0);
skeleton.SetToSetupPose(); skeleton.SetToSetupPose();
@ -267,8 +267,8 @@ namespace Spine.Unity {
} }
this.skeleton = new Skeleton(skeletonData) { this.skeleton = new Skeleton(skeletonData) {
scaleX = this.initialFlipX ? -1 : 1, ScaleX = this.initialFlipX ? -1 : 1,
scaleY = this.initialFlipY ? -1 : 1 ScaleY = this.initialFlipY ? -1 : 1
}; };
meshBuffers = new DoubleBuffered<MeshRendererBuffers.SmartMesh>(); meshBuffers = new DoubleBuffered<MeshRendererBuffers.SmartMesh>();

12
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Timeline/SpineSkeletonFlip/SpineSkeletonFlipMixerBehaviour.cs
View File

@ -82,14 +82,14 @@ namespace Spine.Unity.Playables {
} }
if (currentInputs != 1 && 1f - totalWeight > greatestWeight) { if (currentInputs != 1 && 1f - totalWeight > greatestWeight) {
skeleton.scaleX = originalScaleX; skeleton.ScaleX = originalScaleX;
skeleton.scaleY = originalScaleY; skeleton.ScaleY = originalScaleY;
} }
} }
public void SetSkeletonScaleFromFlip (Skeleton skeleton, bool flipX, bool flipY) { public void SetSkeletonScaleFromFlip (Skeleton skeleton, bool flipX, bool flipY) {
skeleton.scaleX = flipX ? -baseScaleX : baseScaleX; skeleton.ScaleX = flipX ? -baseScaleX : baseScaleX;
skeleton.scaleY = flipY ? -baseScaleY : baseScaleY; skeleton.ScaleY = flipY ? -baseScaleY : baseScaleY;
} }
public override void OnGraphStop (Playable playable) { public override void OnGraphStop (Playable playable) {
@ -99,8 +99,8 @@ namespace Spine.Unity.Playables {
return; return;
var skeleton = playableHandle.Skeleton; var skeleton = playableHandle.Skeleton;
skeleton.scaleX = originalScaleX; skeleton.ScaleX = originalScaleX;
skeleton.scaleY = originalScaleY; skeleton.ScaleY = originalScaleY;
} }
} }

6
spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonExtensions.cs
View File

@ -100,8 +100,8 @@ namespace Spine.Unity {
#region Skeleton #region Skeleton
/// <summary>Sets the Skeleton's local scale using a UnityEngine.Vector2. If only individual components need to be set, set Skeleton.ScaleX or Skeleton.ScaleY.</summary> /// <summary>Sets the Skeleton's local scale using a UnityEngine.Vector2. If only individual components need to be set, set Skeleton.ScaleX or Skeleton.ScaleY.</summary>
public static void SetLocalScale (this Skeleton skeleton, Vector2 scale) { public static void SetLocalScale (this Skeleton skeleton, Vector2 scale) {
skeleton.scaleX = scale.x; skeleton.ScaleX = scale.x;
skeleton.scaleY = scale.y; skeleton.ScaleY = scale.y;
} }
/// <summary>Gets the internal bone matrix as a Unity bonespace-to-skeletonspace transformation matrix.</summary> /// <summary>Gets the internal bone matrix as a Unity bonespace-to-skeletonspace transformation matrix.</summary>
@ -171,7 +171,7 @@ namespace Spine.Unity {
/// <summary>Returns the Skeleton's local scale as a UnityEngine.Vector2. If only individual components are needed, use Skeleton.ScaleX or Skeleton.ScaleY.</summary> /// <summary>Returns the Skeleton's local scale as a UnityEngine.Vector2. If only individual components are needed, use Skeleton.ScaleX or Skeleton.ScaleY.</summary>
public static Vector2 GetLocalScale (this Skeleton skeleton) { public static Vector2 GetLocalScale (this Skeleton skeleton) {
return new Vector2(skeleton.scaleX, skeleton.scaleY); return new Vector2(skeleton.ScaleX, skeleton.ScaleY);
} }
/// <summary>Calculates a 2x2 Transformation Matrix that can convert a skeleton-space position to a bone-local position.</summary> /// <summary>Calculates a 2x2 Transformation Matrix that can convert a skeleton-space position to a bone-local position.</summary>

2
spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonUtility/SkeletonUtility.cs
View File

@ -128,7 +128,7 @@ namespace Spine.Unity {
void Update () { void Update () {
var skeleton = skeletonRenderer.skeleton; var skeleton = skeletonRenderer.skeleton;
if (skeleton != null && boneRoot != null) { if (skeleton != null && boneRoot != null) {
boneRoot.localScale = new Vector3(skeleton.scaleX, skeleton.scaleY, 1f); boneRoot.localScale = new Vector3(skeleton.ScaleX, skeleton.ScaleY, 1f);
} }
} }

2
spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonUtility/SkeletonUtilityBone.cs
View File

@ -121,7 +121,7 @@ namespace Spine.Unity {
} }
var thisTransform = cachedTransform; var thisTransform = cachedTransform;
float skeletonFlipRotation = Mathf.Sign(skeleton.scaleX * skeleton.scaleY); float skeletonFlipRotation = Mathf.Sign(skeleton.ScaleX * skeleton.ScaleY);
if (mode == Mode.Follow) { if (mode == Mode.Follow) {
switch (phase) { switch (phase) {
case UpdatePhase.Local: case UpdatePhase.Local: