foldcc/XCharts
1
0
Fork 0
mirror of https://github.com/XCharts-Team/XCharts.git synced 2026-05-14 20:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

优化Animation的新增动画表现

Browse Source
This commit is contained in:
monitor1394
2025-03-07 22:32:27 +08:00
parent aea4aa7c8d
commit e7aae593bf
4 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/Component/Animation/AnimationInfo.cs
View File

@@ -147,6 +147,7 @@ namespace XCharts.Runtime
{
if (!enable) return;
if (!context.start || context.end) return;
context.init = false;
context.start = false;
context.end = true;
context.currPointIndex = context.destPointIndex;
@@ -168,20 +169,19 @@ namespace XCharts.Runtime
public bool Init(float curr, float dest, int totalPointIndex)
{
if (!enable || !context.start) return false;
if (context.init || context.end) return false;
context.init = true;
context.totalProgress = dest - curr;
context.destPointIndex = totalPointIndex;
if (reverse)
{
context.currProgress = dest;
if (!context.init) context.currProgress = dest;
context.destProgress = curr;
}
else
{
context.currProgress = curr;
if (!context.init) context.currProgress = curr;
context.destProgress = dest;
}
context.init = true;
return true;
}

28
Runtime/Component/Animation/AnimationStyle.cs
View File

@@ -306,7 +306,7 @@ namespace XCharts.Runtime
startIndex = anim.context.currPointIndex == paths.Count - 1 ?
paths.Count - 2 :
anim.context.currPointIndex;
if (startIndex < 0 || startIndex > paths.Count - 2) startIndex = 0;
if (startIndex < 0 || startIndex >= paths.Count - 1) return;
}
else
{
@@ -336,9 +336,12 @@ namespace XCharts.Runtime
{
return;
}
anim.context.currPoint = sp;
anim.context.destPoint = ep;
anim.Init(currDetailProgress, totalDetailProgress, paths.Count - 1);
if (anim.Init(currDetailProgress, totalDetailProgress, paths.Count - 1))
{
anim.context.currPoint = sp;
anim.context.destPoint = ep;
}
}
public bool IsEnd()
@@ -362,12 +365,23 @@ namespace XCharts.Runtime
return true;
var animation = activedAnimation;
if (animation != null && animation.context.end)
{
return true;
}
if (IsSerieAnimation())
{
if (m_FadeOut.context.start) return m_FadeOut.context.currProgress <= m_FadeOut.context.destProgress;
else if (m_Addition.context.start) return m_Addition.context.currProgress >= m_Addition.context.destProgress;
else return m_FadeIn.context.currProgress >= m_FadeIn.context.destProgress;
if (m_FadeOut.context.start)
{
return m_FadeOut.context.currProgress <= m_FadeOut.context.destProgress;
}
else if (m_Addition.context.start)
{
return m_Addition.context.currProgress >= m_Addition.context.destProgress;
}
else
{
return m_FadeIn.context.currProgress >= m_FadeIn.context.destProgress;
}
}
else if (IsDataAnimation())
{

6
Runtime/Serie/Serie.cs
View File

@@ -2029,6 +2029,7 @@ namespace XCharts.Runtime
/// </summary>
public void AnimationFadeIn()
{
if (dataCount <= 0) return;
ResetInteract();
if (animation.enable) animation.FadeIn();
SetVerticesDirty();
@@ -2039,6 +2040,7 @@ namespace XCharts.Runtime
/// </summary>
public void AnimationFadeOut()
{
if (dataCount <= 0) return;
ResetInteract();
if (animation.enable) animation.FadeOut();
SetVerticesDirty();
@@ -2049,6 +2051,7 @@ namespace XCharts.Runtime
/// </summary>
public void AnimationPause()
{
if (dataCount <= 0) return;
if (animation.enable) animation.Pause();
SetVerticesDirty();
}
@@ -2058,6 +2061,7 @@ namespace XCharts.Runtime
/// </summary>
public void AnimationResume()
{
if (dataCount <= 0) return;
if (animation.enable) animation.Resume();
SetVerticesDirty();
}
@@ -2067,6 +2071,7 @@ namespace XCharts.Runtime
/// </summary>
public void AnimationReset()
{
if (dataCount <= 0) return;
if (animation.enable) animation.Reset();
SetVerticesDirty();
}
@@ -2076,6 +2081,7 @@ namespace XCharts.Runtime
/// </summary>
public void AnimationRestart()
{
if (dataCount <= 0) return;
if (animation.enable) animation.Restart();
SetVerticesDirty();
}