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

[unity] Skeleton preview in 2018.1 and 2017.4.

Browse Source 
Special thanks to @GarlicDipping
Fixes https://github.com/EsotericSoftware/spine-runtimes/issues/1110
This commit is contained in:
John 2018-05-24 09:25:09 +08:00 committed by GitHub
parent 3598f51a65
commit d11ebfeded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spine-unity/Assets/spine-unity/Editor/SkeletonDataAssetInspector.cs
View File

@ -651,7 +651,12 @@ namespace Spine.Unity.Editor {
SkeletonAnimation skeletonAnimation; SkeletonAnimation skeletonAnimation;
GameObject previewGameObject; GameObject previewGameObject;
internal bool requiresRefresh; internal bool requiresRefresh;
#if !(UNITY_2017_4 || UNITY_2018)
float animationLastTime; float animationLastTime;
#endif
static float CurrentTime { get { return (float)EditorApplication.timeSinceStartup; } }
Action Repaint; Action Repaint;
public event Action<string> OnSkinChanged; public event Action<string> OnSkinChanged;
@ -742,7 +747,9 @@ namespace Spine.Unity.Editor {
if (previewRenderUtility == null) { if (previewRenderUtility == null) {
previewRenderUtility = new PreviewRenderUtility(true); previewRenderUtility = new PreviewRenderUtility(true);
animationLastTime = Time.realtimeSinceStartup; #if !(UNITY_2017_4 || UNITY_2018)
animationLastTime = CurrentTime;
#endif
const int PreviewLayer = 30; const int PreviewLayer = 30;
const int PreviewCameraCullingMask = 1 << PreviewLayer; const int PreviewCameraCullingMask = 1 << PreviewLayer;
@ -770,6 +777,10 @@ namespace Spine.Unity.Editor {
skeletonAnimation.initialSkinName = skinName; skeletonAnimation.initialSkinName = skinName;
skeletonAnimation.LateUpdate(); skeletonAnimation.LateUpdate();
previewGameObject.GetComponent<Renderer>().enabled = false; previewGameObject.GetComponent<Renderer>().enabled = false;
#if UNITY_2017_4 || UNITY_2018
previewRenderUtility.AddSingleGO(previewGameObject);
#endif
} }
if (this.ActiveTrack != null) cameraAdjustEndFrame = EditorApplication.timeSinceStartup + skeletonAnimation.AnimationState.GetCurrent(0).Alpha; if (this.ActiveTrack != null) cameraAdjustEndFrame = EditorApplication.timeSinceStartup + skeletonAnimation.AnimationState.GetCurrent(0).Alpha;
@ -813,6 +824,7 @@ namespace Spine.Unity.Editor {
previewRenderUtility.BeginStaticPreview(new Rect(0, 0, width, height)); previewRenderUtility.BeginStaticPreview(new Rect(0, 0, width, height));
DoRenderPreview(false); DoRenderPreview(false);
var tex = previewRenderUtility.EndStaticPreview(); var tex = previewRenderUtility.EndStaticPreview();
return tex; return tex;
} }
@ -825,10 +837,15 @@ namespace Spine.Unity.Editor {
var renderer = go.GetComponent<Renderer>(); var renderer = go.GetComponent<Renderer>();
renderer.enabled = true; renderer.enabled = true;
if (!EditorApplication.isPlaying) { if (!EditorApplication.isPlaying) {
skeletonAnimation.Update((Time.realtimeSinceStartup - animationLastTime)); #if !(UNITY_2017_4 || UNITY_2018)
float current = CurrentTime;
float deltaTime = (current - animationLastTime);
skeletonAnimation.Update(deltaTime);
animationLastTime = current;
#endif
skeletonAnimation.LateUpdate(); skeletonAnimation.LateUpdate();
animationLastTime = Time.realtimeSinceStartup;
} }
var thisPreviewUtilityCamera = this.PreviewUtilityCamera; var thisPreviewUtilityCamera = this.PreviewUtilityCamera;
@ -861,7 +878,7 @@ namespace Spine.Unity.Editor {
if (previewRenderUtility == null) if (previewRenderUtility == null)
return; return;
if (EditorApplication.timeSinceStartup < cameraAdjustEndFrame) if (CurrentTime < cameraAdjustEndFrame)
AdjustCameraGoals(); AdjustCameraGoals();
lastCameraPositionGoal = cameraPositionGoal; lastCameraPositionGoal = cameraPositionGoal;