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

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

Browse Source
This commit is contained in:
badlogic 2019-08-12 14:02:33 +02:00
commit f98afcebfe
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -696,11 +696,8 @@ namespace Spine.Unity.Editor {
SkeletonAnimation skeletonAnimation; SkeletonAnimation skeletonAnimation;
GameObject previewGameObject; GameObject previewGameObject;
internal bool requiresRefresh; internal bool requiresRefresh;
#if !SPINE_UNITY_2018_PREVIEW_API
float animationLastTime; float animationLastTime;
#endif
static float CurrentTime { get { return (float)EditorApplication.timeSinceStartup; } } static float CurrentTime { get { return (float)EditorApplication.timeSinceStartup; } }
Action Repaint; Action Repaint;
@ -793,10 +790,8 @@ namespace Spine.Unity.Editor {
if (previewRenderUtility == null) { if (previewRenderUtility == null) {
previewRenderUtility = new PreviewRenderUtility(true); previewRenderUtility = new PreviewRenderUtility(true);
#if !SPINE_UNITY_2018_PREVIEW_API
animationLastTime = CurrentTime; animationLastTime = CurrentTime;
#endif
const int PreviewLayer = 30; const int PreviewLayer = 30;
const int PreviewCameraCullingMask = 1 << PreviewLayer; const int PreviewCameraCullingMask = 1 << PreviewLayer;
@ -885,12 +880,10 @@ namespace Spine.Unity.Editor {
if (!EditorApplication.isPlaying) { if (!EditorApplication.isPlaying) {
#if !SPINE_UNITY_2018_PREVIEW_API
float current = CurrentTime; float current = CurrentTime;
float deltaTime = (current - animationLastTime); float deltaTime = (current - animationLastTime);
skeletonAnimation.Update(deltaTime); skeletonAnimation.Update(deltaTime);
animationLastTime = current; animationLastTime = current;
#endif
skeletonAnimation.LateUpdate(); skeletonAnimation.LateUpdate();
} }