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

重构Animation动画系统，增加Addition新增动画支持

Browse Source
This commit is contained in:
monitor1394
2023-07-12 08:28:42 +08:00
parent eca0c6ea46
commit e515908f9b
19 changed files with 51 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Editor/ChildComponents/AnimationDrawer.cs
View File

@@ -62,8 +62,8 @@ namespace XCharts.Editor
++EditorGUI.indentLevel; ++EditorGUI.indentLevel;
PropertyField(prop, "m_Type"); PropertyField(prop, "m_Type");
PropertyField(prop, "m_UnscaledTime"); PropertyField(prop, "m_UnscaledTime");
PropertyField(prop, "m_Fadein"); PropertyField(prop, "m_FadeIn");
PropertyField(prop, "m_Fadeout"); PropertyField(prop, "m_FadeOut");
PropertyField(prop, "m_Change"); PropertyField(prop, "m_Change");
PropertyField(prop, "m_Addition"); PropertyField(prop, "m_Addition");
--EditorGUI.indentLevel; --EditorGUI.indentLevel;

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

@@ -380,7 +380,7 @@ namespace XCharts.Runtime
/// </summary> /// </summary>
[Since("v3.8.0")] [Since("v3.8.0")]
[System.Serializable] [System.Serializable]
public class AnimationFadeout : AnimationInfo public class AnimationFadeOut : AnimationInfo
{ {
} }

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

@@ -45,7 +45,7 @@ namespace XCharts.Runtime
/// <summary> /// <summary>
/// the animation of serie. support animation type: fadeIn, fadeOut, change, addition. /// the animation of serie. support animation type: fadeIn, fadeOut, change, addition.
/// |动画表现。支持配置四种动画表现：FadeIn（渐入动画），FadeOut（渐出动画），Change（变更动画），Addition（新增动画）。 /// |动画系统。支持配置四种动画表现：FadeIn（渐入动画），FadeOut（渐出动画），Change（变更动画），Addition（新增动画）。
/// </summary> /// </summary>
[System.Serializable] [System.Serializable]
public class AnimationStyle : ChildComponent public class AnimationStyle : ChildComponent
@@ -55,8 +55,8 @@ namespace XCharts.Runtime
[SerializeField] private AnimationEasing m_Easting; [SerializeField] private AnimationEasing m_Easting;
[SerializeField] private int m_Threshold = 2000; [SerializeField] private int m_Threshold = 2000;
[SerializeField][Since("v3.4.0")] private bool m_UnscaledTime; [SerializeField][Since("v3.4.0")] private bool m_UnscaledTime;
[SerializeField][Since("v3.8.0")] private AnimationFadeIn m_Fadein = new AnimationFadeIn(); [SerializeField][Since("v3.8.0")] private AnimationFadeIn m_FadeIn = new AnimationFadeIn();
[SerializeField][Since("v3.8.0")] private AnimationFadeout m_Fadeout = new AnimationFadeout() { reverse = true }; [SerializeField][Since("v3.8.0")] private AnimationFadeOut m_FadeOut = new AnimationFadeOut() { reverse = true };
[SerializeField][Since("v3.8.0")] private AnimationChange m_Change = new AnimationChange() { duration = 500 }; [SerializeField][Since("v3.8.0")] private AnimationChange m_Change = new AnimationChange() { duration = 500 };
[SerializeField][Since("v3.8.0")] private AnimationAddition m_Addition = new AnimationAddition() { duration = 500 }; [SerializeField][Since("v3.8.0")] private AnimationAddition m_Addition = new AnimationAddition() { duration = 500 };
@@ -98,12 +98,12 @@ namespace XCharts.Runtime
/// Fade in animation configuration. /// Fade in animation configuration.
/// |渐入动画配置。 /// |渐入动画配置。
/// </summary> /// </summary>
public AnimationFadeIn fadein { get { return m_Fadein; } } public AnimationFadeIn fadein { get { return m_FadeIn; } }
/// <summary> /// <summary>
/// Fade out animation configuration. /// Fade out animation configuration.
/// |渐出动画配置。 /// |渐出动画配置。
/// </summary> /// </summary>
public AnimationFadeout fadeout { get { return m_Fadeout; } } public AnimationFadeOut fadeout { get { return m_FadeOut; } }
/// <summary> /// <summary>
/// Update data animation configuration. /// Update data animation configuration.
/// |数据变更动画配置。 /// |数据变更动画配置。
@@ -124,8 +124,8 @@ namespace XCharts.Runtime
if (m_Animations == null) if (m_Animations == null)
{ {
m_Animations = new List<AnimationInfo>(); m_Animations = new List<AnimationInfo>();
m_Animations.Add(m_Fadein); m_Animations.Add(m_FadeIn);
m_Animations.Add(m_Fadeout); m_Animations.Add(m_FadeOut);
m_Animations.Add(m_Change); m_Animations.Add(m_Change);
m_Animations.Add(m_Addition); m_Animations.Add(m_Addition);
} }
@@ -153,10 +153,10 @@ namespace XCharts.Runtime
/// Start fadein animation. /// Start fadein animation.
/// |开始渐入动画。 /// |开始渐入动画。
/// </summary> /// </summary>
public void Fadein() public void FadeIn()
{ {
if (m_Fadeout.context.start) return; if (m_FadeOut.context.start) return;
m_Fadein.Start(); m_FadeIn.Start();
} }
/// <summary> /// <summary>
@@ -177,9 +177,9 @@ namespace XCharts.Runtime
/// Start fadeout animation. /// Start fadeout animation.
/// |开始渐出动画。 /// |开始渐出动画。
/// </summary> /// </summary>
public void Fadeout() public void FadeOut()
{ {
m_Fadeout.Start(); m_FadeOut.Start();
} }
/// <summary> /// <summary>
@@ -189,7 +189,7 @@ namespace XCharts.Runtime
public void Addition() public void Addition()
{ {
if (!enable) return; if (!enable) return;
if (!m_Fadein.context.start && !m_Fadeout.context.start) if (!m_FadeIn.context.start && !m_FadeOut.context.start)
{ {
m_Addition.Start(false); m_Addition.Start(false);
} }
@@ -312,7 +312,7 @@ namespace XCharts.Runtime
if (animation.context.start) if (animation.context.start)
return animation.context.end; return animation.context.end;
} }
return m_Fadein.context.end; return m_FadeIn.context.end;
} }
@@ -333,9 +333,9 @@ namespace XCharts.Runtime
} }
if (IsIndexAnimation()) if (IsIndexAnimation())
{ {
if (m_Fadeout.context.start) return m_Fadeout.context.currProgress <= m_Fadeout.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 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 return m_FadeIn.context.currProgress >= m_FadeIn.context.destProgress;
} }
else if (IsItemAnimation()) else if (IsItemAnimation())
{ {
@@ -434,8 +434,8 @@ namespace XCharts.Runtime
public void CheckSymbol(float dest) public void CheckSymbol(float dest)
{ {
m_Fadein.CheckSymbol(dest, m_UnscaledTime); m_FadeIn.CheckSymbol(dest, m_UnscaledTime);
m_Fadeout.CheckSymbol(dest, m_UnscaledTime); m_FadeOut.CheckSymbol(dest, m_UnscaledTime);
} }
public float GetSysmbolSize(float dest) public float GetSysmbolSize(float dest)
@@ -448,9 +448,9 @@ namespace XCharts.Runtime
return dest; return dest;
if (IsEnd()) if (IsEnd())
return m_Fadeout.context.start ? 0 : dest; return m_FadeOut.context.start ? 0 : dest;
return m_Fadeout.context.start ? m_Fadeout.context.sizeProgress : m_Fadein.context.sizeProgress; return m_FadeOut.context.start ? m_FadeOut.context.sizeProgress : m_FadeIn.context.sizeProgress;
} }
public float GetCurrDetail() public float GetCurrDetail()
@@ -470,7 +470,7 @@ namespace XCharts.Runtime
if (animation.context.start) if (animation.context.start)
return animation.context.currProgress; return animation.context.currProgress;
} }
return m_Fadein.context.currProgress; return m_FadeIn.context.currProgress;
} }
public float GetCurrRate() public float GetCurrRate()
@@ -481,7 +481,7 @@ namespace XCharts.Runtime
#endif #endif
if (!enable || IsEnd()) if (!enable || IsEnd())
return 1; return 1;
return m_Fadeout.context.start ? m_Fadeout.context.currProgress : m_Fadein.context.currProgress; return m_FadeOut.context.start ? m_FadeOut.context.currProgress : m_FadeIn.context.currProgress;
} }
public int GetCurrIndex() public int GetCurrIndex()
@@ -514,9 +514,9 @@ namespace XCharts.Runtime
return 0; return 0;
} }
public bool HasFadeout() public bool HasFadeOut()
{ {
return enable && m_Fadeout.context.end; return enable && m_FadeOut.context.end;
} }
} }
} }

16
Runtime/Internal/BaseChart.API.cs
View File

@@ -396,29 +396,19 @@ namespace XCharts.Runtime
/// |开始所有Serie的渐入动画。 /// |开始所有Serie的渐入动画。
/// </summary> /// </summary>
/// <param name="reset">reset animation</param> /// <param name="reset">reset animation</param>
public void AnimationFadein(bool reset = true)
{
if (reset) AnimationReset();
foreach (var serie in m_Series) serie.AnimationFadein();
}
[Obsolete("Use AnimationFadein() instead.", true)]
public void AnimationFadeIn(bool reset = true) public void AnimationFadeIn(bool reset = true)
{ {
if (reset) AnimationReset();
foreach (var serie in m_Series) serie.AnimationFadeIn();
} }
/// <summary> /// <summary>
/// Start all serie fadeout animations. /// Start all serie fadeout animations.
/// |开始所有Serie的渐出动画。 /// |开始所有Serie的渐出动画。
/// </summary> /// </summary>
public void AnimationFadeout()
{
foreach (var serie in m_Series) serie.AnimationFadeout();
}
[Obsolete("Use AnimationFadeout() instead.", true)]
public void AnimationFadeOut() public void AnimationFadeOut()
{ {
foreach (var serie in m_Series) serie.AnimationFadeOut();
} }
/// <summary> /// <summary>

2
Runtime/Internal/BaseChart.Serie.cs
View File

@@ -649,7 +649,7 @@ namespace XCharts.Runtime
serie.show = active; serie.show = active;
serie.RefreshLabel(); serie.RefreshLabel();
serie.AnimationReset(); serie.AnimationReset();
if (active) serie.AnimationFadein(); if (active) serie.AnimationFadeIn();
UpdateLegendColor(serie.serieName, active); UpdateLegendColor(serie.serieName, active);
} }

6
Runtime/Internal/BaseChart.cs
View File

@@ -136,7 +136,7 @@ namespace XCharts.Runtime
InitComponentHandlers(); InitComponentHandlers();
InitSerieHandlers(); InitSerieHandlers();
AnimationReset(); AnimationReset();
AnimationFadein(); AnimationFadeIn();
XChartsMgr.AddChart(this); XChartsMgr.AddChart(this);
} }
@@ -416,7 +416,7 @@ namespace XCharts.Runtime
if (!m_CheckAnimation) if (!m_CheckAnimation)
{ {
m_CheckAnimation = true; m_CheckAnimation = true;
AnimationFadein(); AnimationFadeIn();
} }
} }
@@ -590,7 +590,7 @@ namespace XCharts.Runtime
serie.context.dataIndexs.Clear(); serie.context.dataIndexs.Clear();
serie.context.dataIgnores.Clear(); serie.context.dataIgnores.Clear();
serie.animation.context.isAllItemAnimationEnd = true; serie.animation.context.isAllItemAnimationEnd = true;
if (serie.show && !serie.animation.HasFadeout()) if (serie.show && !serie.animation.HasFadeOut())
{ {
if (!serie.context.pointerEnter) if (!serie.context.pointerEnter)
serie.ResetInteract(); serie.ResetInteract();

2
Runtime/Serie/Bar/BarHandler.cs
View File

@@ -142,7 +142,7 @@ namespace XCharts.Runtime
private void DrawBarSerie(VertexHelper vh, Bar serie) private void DrawBarSerie(VertexHelper vh, Bar serie)
{ {
if (!serie.show || serie.animation.HasFadeout()) if (!serie.show || serie.animation.HasFadeOut())
return; return;
Axis axis; Axis axis;

2
Runtime/Serie/Bar/SimplifiedBarHandler.cs
View File

@@ -97,7 +97,7 @@ namespace XCharts.Runtime
private void DrawBarSerie(VertexHelper vh, SimplifiedBar serie, int colorIndex) private void DrawBarSerie(VertexHelper vh, SimplifiedBar serie, int colorIndex)
{ {
if (!serie.show || serie.animation.HasFadeout()) if (!serie.show || serie.animation.HasFadeOut())
return; return;
Axis axis; Axis axis;

2
Runtime/Serie/Candlestick/CandlestickHandler.cs
View File

@@ -81,7 +81,7 @@ namespace XCharts.Runtime
private void DrawCandlestickSerie(VertexHelper vh, Candlestick serie) private void DrawCandlestickSerie(VertexHelper vh, Candlestick serie)
{ {
if (!serie.show) return; if (!serie.show) return;
if (serie.animation.HasFadeout()) return; if (serie.animation.HasFadeOut()) return;
XAxis xAxis; XAxis xAxis;
YAxis yAxis; YAxis yAxis;
GridCoord grid; GridCoord grid;

2
Runtime/Serie/Candlestick/SimplifiedCandlestickHandler.cs
View File

@@ -81,7 +81,7 @@ namespace XCharts.Runtime
private void DrawCandlestickSerie(VertexHelper vh, SimplifiedCandlestick serie) private void DrawCandlestickSerie(VertexHelper vh, SimplifiedCandlestick serie)
{ {
if (!serie.show) return; if (!serie.show) return;
if (serie.animation.HasFadeout()) return; if (serie.animation.HasFadeOut()) return;
XAxis xAxis; XAxis xAxis;
YAxis yAxis; YAxis yAxis;
GridCoord grid; GridCoord grid;

4
Runtime/Serie/Heatmap/HeatmapHandler.cs
View File

@@ -185,7 +185,7 @@ namespace XCharts.Runtime
private void DrawDataHeatmapSerie(VertexHelper vh, Heatmap serie) private void DrawDataHeatmapSerie(VertexHelper vh, Heatmap serie)
{ {
if (!serie.show || serie.animation.HasFadeout()) return; if (!serie.show || serie.animation.HasFadeOut()) return;
XAxis xAxis; XAxis xAxis;
YAxis yAxis; YAxis yAxis;
if (!chart.TryGetChartComponent<XAxis>(out xAxis, serie.xAxisIndex)) return; if (!chart.TryGetChartComponent<XAxis>(out xAxis, serie.xAxisIndex)) return;
@@ -332,7 +332,7 @@ namespace XCharts.Runtime
private void DrawCountHeatmapSerie(VertexHelper vh, Heatmap serie) private void DrawCountHeatmapSerie(VertexHelper vh, Heatmap serie)
{ {
if (!serie.show || serie.animation.HasFadeout()) return; if (!serie.show || serie.animation.HasFadeOut()) return;
XAxis xAxis; XAxis xAxis;
YAxis yAxis; YAxis yAxis;
if (!chart.TryGetChartComponent<XAxis>(out xAxis, serie.xAxisIndex)) return; if (!chart.TryGetChartComponent<XAxis>(out xAxis, serie.xAxisIndex)) return;

2
Runtime/Serie/Line/LineHandler.GridCoord.cs
View File

@@ -248,7 +248,7 @@ namespace XCharts.Runtime
private void DrawLineSerie(VertexHelper vh, Line serie) private void DrawLineSerie(VertexHelper vh, Line serie)
{ {
if (serie.animation.HasFadeout()) if (serie.animation.HasFadeOut())
return; return;
Axis axis; Axis axis;

2
Runtime/Serie/Line/SimplifiedLineHandler.cs
View File

@@ -139,7 +139,7 @@ namespace XCharts.Runtime
{ {
if (!serie.show) if (!serie.show)
return; return;
if (serie.animation.HasFadeout()) if (serie.animation.HasFadeOut())
return; return;
Axis axis; Axis axis;

2
Runtime/Serie/Parallel/ParallelHandler.cs
View File

@@ -21,7 +21,7 @@ namespace XCharts.Runtime
private void DrawParallelSerie(VertexHelper vh, Parallel serie) private void DrawParallelSerie(VertexHelper vh, Parallel serie)
{ {
if (!serie.show) return; if (!serie.show) return;
if (serie.animation.HasFadeout()) return; if (serie.animation.HasFadeOut()) return;
var parallel = chart.GetChartComponent<ParallelCoord>(serie.parallelIndex); var parallel = chart.GetChartComponent<ParallelCoord>(serie.parallelIndex);
if (parallel == null) if (parallel == null)

2
Runtime/Serie/Pie/PieHandler.cs
View File

@@ -300,7 +300,7 @@ namespace XCharts.Runtime
private void DrawPie(VertexHelper vh, Serie serie) private void DrawPie(VertexHelper vh, Serie serie)
{ {
if (!serie.show || serie.animation.HasFadeout()) if (!serie.show || serie.animation.HasFadeOut())
{ {
return; return;
} }

4
Runtime/Serie/Radar/RadarHandler.cs
View File

@@ -230,7 +230,7 @@ namespace XCharts.Runtime
var angle = 2 * Mathf.PI / indicatorNum; var angle = 2 * Mathf.PI / indicatorNum;
var centerPos = m_RadarCoord.context.center; var centerPos = m_RadarCoord.context.center;
serie.animation.InitProgress(0, 1); serie.animation.InitProgress(0, 1);
if (!serie.show || serie.animation.HasFadeout()) if (!serie.show || serie.animation.HasFadeOut())
{ {
return; return;
} }
@@ -365,7 +365,7 @@ namespace XCharts.Runtime
var angle = 2 * Mathf.PI / indicatorNum; var angle = 2 * Mathf.PI / indicatorNum;
var centerPos = m_RadarCoord.context.center; var centerPos = m_RadarCoord.context.center;
serie.animation.InitProgress(0, 1); serie.animation.InitProgress(0, 1);
if (!serie.show || serie.animation.HasFadeout()) if (!serie.show || serie.animation.HasFadeOut())
{ {
return; return;
} }

2
Runtime/Serie/Ring/RingHandler.cs
View File

@@ -176,7 +176,7 @@ namespace XCharts.Runtime
public override void DrawSerie(VertexHelper vh) public override void DrawSerie(VertexHelper vh)
{ {
if (!serie.show || serie.animation.HasFadeout()) return; if (!serie.show || serie.animation.HasFadeOut()) return;
var data = serie.data; var data = serie.data;
serie.animation.InitProgress(serie.startAngle, serie.startAngle + 360); serie.animation.InitProgress(serie.startAngle, serie.startAngle + 360);
SerieHelper.UpdateCenter(serie, chart.chartPosition, chart.chartWidth, chart.chartHeight); SerieHelper.UpdateCenter(serie, chart.chartPosition, chart.chartWidth, chart.chartHeight);

4
Runtime/Serie/Scatter/BaseScatterHandler.cs
View File

@@ -106,7 +106,7 @@ namespace XCharts.Runtime
protected virtual void DrawScatterSerie(VertexHelper vh, BaseScatter serie) protected virtual void DrawScatterSerie(VertexHelper vh, BaseScatter serie)
{ {
if (serie.animation.HasFadeout()) if (serie.animation.HasFadeOut())
return; return;
if (!serie.show) if (!serie.show)
@@ -216,7 +216,7 @@ namespace XCharts.Runtime
protected virtual void DrawSingAxisScatterSerie(VertexHelper vh, BaseScatter serie) protected virtual void DrawSingAxisScatterSerie(VertexHelper vh, BaseScatter serie)
{ {
if (serie.animation.HasFadeout()) if (serie.animation.HasFadeOut())
return; return;
if (!serie.show) if (!serie.show)

18
Runtime/Serie/Serie.cs
View File

@@ -1907,32 +1907,18 @@ namespace XCharts.Runtime
/// <summary> /// <summary>
/// 渐入动画 /// 渐入动画
/// </summary> /// </summary>
public void AnimationFadein()
{
if (animation.enable) animation.Fadein();
SetVerticesDirty();
}
[Obsolete("Use Serie.AnimationFadein() instead.", true)]
public void AnimationFadeIn() public void AnimationFadeIn()
{ {
if (animation.enable) animation.Fadein(); if (animation.enable) animation.FadeIn();
SetVerticesDirty(); SetVerticesDirty();
} }
/// <summary> /// <summary>
/// 渐出动画 /// 渐出动画
/// </summary> /// </summary>
public void AnimationFadeout()
{
if (animation.enable) animation.Fadeout();
SetVerticesDirty();
}
[Obsolete("Use Serie.AnimationFadeout() instead.", true)]
public void AnimationFadeOut() public void AnimationFadeOut()
{ {
if (animation.enable) animation.Fadeout(); if (animation.enable) animation.FadeOut();
SetVerticesDirty(); SetVerticesDirty();
} }