UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.6' into 3.7-beta

Browse Source
This commit is contained in:
badlogic 2017-10-27 10:45:43 +02:00
commit e53a295dff
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spine-csharp/src/AnimationState.cs
View File

@ -258,13 +258,17 @@ namespace Spine {
break; break;
case Dip: case Dip:
pose = MixPose.Setup; pose = MixPose.Setup;
alpha = alphaDip; alpha = mix == 1 ? 0 : alphaDip;
break; break;
default: default:
pose = MixPose.Setup; pose = MixPose.Setup;
alpha = alphaDip; if (mix == 1) {
var dipMix = timelineDipMix[i]; alpha = 0;
alpha *= Math.Max(0, 1 - dipMix.mixTime / dipMix.mixDuration); } else {
alpha = alphaDip;
var dipMix = timelineDipMix[i];
alpha *= Math.Max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
}
break; break;
} }
from.totalAlpha += alpha; from.totalAlpha += alpha;

12
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
View File

@ -281,13 +281,17 @@ public class AnimationState {
break; break;
case DIP: case DIP:
pose = MixPose.setup; pose = MixPose.setup;
alpha = alphaDip; alpha = mix == 1 ? 0 : alphaDip;
break; break;
default: default:
pose = MixPose.setup; pose = MixPose.setup;
alpha = alphaDip; if (mix == 1)
TrackEntry dipMix = (TrackEntry)timelineDipMix[i]; alpha = 0;
alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration); else {
alpha = alphaDip;
TrackEntry dipMix = (TrackEntry)timelineDipMix[i];
alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
}
break; break;
} }
from.totalAlpha += alpha; from.totalAlpha += alpha;

3
spine-unity/Assets/spine-unity/Asset Types/Editor/SkeletonDataAssetInspector.cs
View File

@ -726,6 +726,9 @@ namespace Spine.Unity.Editor {
} }
void DoRenderPreview (bool drawHandles) { void DoRenderPreview (bool drawHandles) {
if (this.PreviewUtilityCamera.activeTexture == null || this.PreviewUtilityCamera.targetTexture == null )
return;
GameObject go = this.m_previewInstance; GameObject go = this.m_previewInstance;
if (m_requireRefresh && go != null) { if (m_requireRefresh && go != null) {

2
spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic.shader
View File

@ -91,7 +91,7 @@ Shader "Spine/SkeletonGraphic (Premultiply Alpha)"
OUT.vertex.xy += (_ScreenParams.zw-1.0) * float2(-1,1); OUT.vertex.xy += (_ScreenParams.zw-1.0) * float2(-1,1);
#endif #endif
OUT.color = IN.color * _Color; OUT.color = IN.color * float4(_Color.rgb * _Color.a, _Color.a); // Combine a PMA version of _Color with vertexColor.
return OUT; return OUT;
} }