From e515908f9b13925fcbc05d93aa6ca6afe2495175 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Wed, 12 Jul 2023 08:28:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84`Animation`=E5=8A=A8=E7=94=BB?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=EF=BC=8C=E5=A2=9E=E5=8A=A0`Addition`?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A8=E7=94=BB=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor/ChildComponents/AnimationDrawer.cs | 4 +- Runtime/Component/Animation/AnimationInfo.cs | 2 +- Runtime/Component/Animation/AnimationStyle.cs | 48 +++++++++---------- Runtime/Internal/BaseChart.API.cs | 16 ++----- Runtime/Internal/BaseChart.Serie.cs | 2 +- Runtime/Internal/BaseChart.cs | 6 +-- Runtime/Serie/Bar/BarHandler.cs | 2 +- Runtime/Serie/Bar/SimplifiedBarHandler.cs | 2 +- .../Serie/Candlestick/CandlestickHandler.cs | 2 +- .../SimplifiedCandlestickHandler.cs | 2 +- Runtime/Serie/Heatmap/HeatmapHandler.cs | 4 +- Runtime/Serie/Line/LineHandler.GridCoord.cs | 2 +- Runtime/Serie/Line/SimplifiedLineHandler.cs | 2 +- Runtime/Serie/Parallel/ParallelHandler.cs | 2 +- Runtime/Serie/Pie/PieHandler.cs | 2 +- Runtime/Serie/Radar/RadarHandler.cs | 4 +- Runtime/Serie/Ring/RingHandler.cs | 2 +- Runtime/Serie/Scatter/BaseScatterHandler.cs | 4 +- Runtime/Serie/Serie.cs | 18 +------ 19 files changed, 51 insertions(+), 75 deletions(-) diff --git a/Editor/ChildComponents/AnimationDrawer.cs b/Editor/ChildComponents/AnimationDrawer.cs index b7e723e4..0bc20ca3 100644 --- a/Editor/ChildComponents/AnimationDrawer.cs +++ b/Editor/ChildComponents/AnimationDrawer.cs @@ -62,8 +62,8 @@ namespace XCharts.Editor ++EditorGUI.indentLevel; PropertyField(prop, "m_Type"); PropertyField(prop, "m_UnscaledTime"); - PropertyField(prop, "m_Fadein"); - PropertyField(prop, "m_Fadeout"); + PropertyField(prop, "m_FadeIn"); + PropertyField(prop, "m_FadeOut"); PropertyField(prop, "m_Change"); PropertyField(prop, "m_Addition"); --EditorGUI.indentLevel; diff --git a/Runtime/Component/Animation/AnimationInfo.cs b/Runtime/Component/Animation/AnimationInfo.cs index f7a78b49..62a2e6b7 100644 --- a/Runtime/Component/Animation/AnimationInfo.cs +++ b/Runtime/Component/Animation/AnimationInfo.cs @@ -380,7 +380,7 @@ namespace XCharts.Runtime /// [Since("v3.8.0")] [System.Serializable] - public class AnimationFadeout : AnimationInfo + public class AnimationFadeOut : AnimationInfo { } diff --git a/Runtime/Component/Animation/AnimationStyle.cs b/Runtime/Component/Animation/AnimationStyle.cs index 5b55bda6..6704cf19 100644 --- a/Runtime/Component/Animation/AnimationStyle.cs +++ b/Runtime/Component/Animation/AnimationStyle.cs @@ -45,7 +45,7 @@ namespace XCharts.Runtime /// /// the animation of serie. support animation type: fadeIn, fadeOut, change, addition. - /// |动画表现。支持配置四种动画表现：FadeIn（渐入动画），FadeOut（渐出动画），Change（变更动画），Addition（新增动画）。 + /// |动画系统。支持配置四种动画表现：FadeIn（渐入动画），FadeOut（渐出动画），Change（变更动画），Addition（新增动画）。 /// [System.Serializable] public class AnimationStyle : ChildComponent @@ -55,8 +55,8 @@ namespace XCharts.Runtime [SerializeField] private AnimationEasing m_Easting; [SerializeField] private int m_Threshold = 2000; [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 AnimationFadeout m_Fadeout = new AnimationFadeout() { reverse = true }; + [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 AnimationChange m_Change = new AnimationChange() { 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. /// |渐入动画配置。 /// - public AnimationFadeIn fadein { get { return m_Fadein; } } + public AnimationFadeIn fadein { get { return m_FadeIn; } } /// /// Fade out animation configuration. /// |渐出动画配置。 /// - public AnimationFadeout fadeout { get { return m_Fadeout; } } + public AnimationFadeOut fadeout { get { return m_FadeOut; } } /// /// Update data animation configuration. /// |数据变更动画配置。 @@ -124,8 +124,8 @@ namespace XCharts.Runtime if (m_Animations == null) { m_Animations = new List(); - m_Animations.Add(m_Fadein); - m_Animations.Add(m_Fadeout); + m_Animations.Add(m_FadeIn); + m_Animations.Add(m_FadeOut); m_Animations.Add(m_Change); m_Animations.Add(m_Addition); } @@ -153,10 +153,10 @@ namespace XCharts.Runtime /// Start fadein animation. /// |开始渐入动画。 /// - public void Fadein() + public void FadeIn() { - if (m_Fadeout.context.start) return; - m_Fadein.Start(); + if (m_FadeOut.context.start) return; + m_FadeIn.Start(); } /// @@ -177,9 +177,9 @@ namespace XCharts.Runtime /// Start fadeout animation. /// |开始渐出动画。 /// - public void Fadeout() + public void FadeOut() { - m_Fadeout.Start(); + m_FadeOut.Start(); } /// @@ -189,7 +189,7 @@ namespace XCharts.Runtime public void Addition() { 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); } @@ -312,7 +312,7 @@ namespace XCharts.Runtime if (animation.context.start) return animation.context.end; } - return m_Fadein.context.end; + return m_FadeIn.context.end; } @@ -333,9 +333,9 @@ namespace XCharts.Runtime } 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 return m_Fadein.context.currProgress >= m_Fadein.context.destProgress; + else return m_FadeIn.context.currProgress >= m_FadeIn.context.destProgress; } else if (IsItemAnimation()) { @@ -434,8 +434,8 @@ namespace XCharts.Runtime public void CheckSymbol(float dest) { - m_Fadein.CheckSymbol(dest, m_UnscaledTime); - m_Fadeout.CheckSymbol(dest, m_UnscaledTime); + m_FadeIn.CheckSymbol(dest, m_UnscaledTime); + m_FadeOut.CheckSymbol(dest, m_UnscaledTime); } public float GetSysmbolSize(float dest) @@ -448,9 +448,9 @@ namespace XCharts.Runtime return dest; 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() @@ -470,7 +470,7 @@ namespace XCharts.Runtime if (animation.context.start) return animation.context.currProgress; } - return m_Fadein.context.currProgress; + return m_FadeIn.context.currProgress; } public float GetCurrRate() @@ -481,7 +481,7 @@ namespace XCharts.Runtime #endif if (!enable || IsEnd()) 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() @@ -514,9 +514,9 @@ namespace XCharts.Runtime return 0; } - public bool HasFadeout() + public bool HasFadeOut() { - return enable && m_Fadeout.context.end; + return enable && m_FadeOut.context.end; } } } \ No newline at end of file diff --git a/Runtime/Internal/BaseChart.API.cs b/Runtime/Internal/BaseChart.API.cs index 962ec9d4..43856068 100644 --- a/Runtime/Internal/BaseChart.API.cs +++ b/Runtime/Internal/BaseChart.API.cs @@ -396,29 +396,19 @@ namespace XCharts.Runtime /// |开始所有Serie的渐入动画。 /// /// reset animation - 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) { + if (reset) AnimationReset(); + foreach (var serie in m_Series) serie.AnimationFadeIn(); } /// /// Start all serie fadeout animations. /// |开始所有Serie的渐出动画。 /// - public void AnimationFadeout() - { - foreach (var serie in m_Series) serie.AnimationFadeout(); - } - - [Obsolete("Use AnimationFadeout() instead.", true)] public void AnimationFadeOut() { + foreach (var serie in m_Series) serie.AnimationFadeOut(); } /// diff --git a/Runtime/Internal/BaseChart.Serie.cs b/Runtime/Internal/BaseChart.Serie.cs index 402a3f18..282e5da5 100644 --- a/Runtime/Internal/BaseChart.Serie.cs +++ b/Runtime/Internal/BaseChart.Serie.cs @@ -649,7 +649,7 @@ namespace XCharts.Runtime serie.show = active; serie.RefreshLabel(); serie.AnimationReset(); - if (active) serie.AnimationFadein(); + if (active) serie.AnimationFadeIn(); UpdateLegendColor(serie.serieName, active); } diff --git a/Runtime/Internal/BaseChart.cs b/Runtime/Internal/BaseChart.cs index 538c7965..80964be9 100644 --- a/Runtime/Internal/BaseChart.cs +++ b/Runtime/Internal/BaseChart.cs @@ -136,7 +136,7 @@ namespace XCharts.Runtime InitComponentHandlers(); InitSerieHandlers(); AnimationReset(); - AnimationFadein(); + AnimationFadeIn(); XChartsMgr.AddChart(this); } @@ -416,7 +416,7 @@ namespace XCharts.Runtime if (!m_CheckAnimation) { m_CheckAnimation = true; - AnimationFadein(); + AnimationFadeIn(); } } @@ -590,7 +590,7 @@ namespace XCharts.Runtime serie.context.dataIndexs.Clear(); serie.context.dataIgnores.Clear(); serie.animation.context.isAllItemAnimationEnd = true; - if (serie.show && !serie.animation.HasFadeout()) + if (serie.show && !serie.animation.HasFadeOut()) { if (!serie.context.pointerEnter) serie.ResetInteract(); diff --git a/Runtime/Serie/Bar/BarHandler.cs b/Runtime/Serie/Bar/BarHandler.cs index bca989c2..ea46605e 100644 --- a/Runtime/Serie/Bar/BarHandler.cs +++ b/Runtime/Serie/Bar/BarHandler.cs @@ -142,7 +142,7 @@ namespace XCharts.Runtime private void DrawBarSerie(VertexHelper vh, Bar serie) { - if (!serie.show || serie.animation.HasFadeout()) + if (!serie.show || serie.animation.HasFadeOut()) return; Axis axis; diff --git a/Runtime/Serie/Bar/SimplifiedBarHandler.cs b/Runtime/Serie/Bar/SimplifiedBarHandler.cs index 0c3999e6..5b40dce2 100644 --- a/Runtime/Serie/Bar/SimplifiedBarHandler.cs +++ b/Runtime/Serie/Bar/SimplifiedBarHandler.cs @@ -97,7 +97,7 @@ namespace XCharts.Runtime private void DrawBarSerie(VertexHelper vh, SimplifiedBar serie, int colorIndex) { - if (!serie.show || serie.animation.HasFadeout()) + if (!serie.show || serie.animation.HasFadeOut()) return; Axis axis; diff --git a/Runtime/Serie/Candlestick/CandlestickHandler.cs b/Runtime/Serie/Candlestick/CandlestickHandler.cs index ae405e73..a262f509 100644 --- a/Runtime/Serie/Candlestick/CandlestickHandler.cs +++ b/Runtime/Serie/Candlestick/CandlestickHandler.cs @@ -81,7 +81,7 @@ namespace XCharts.Runtime private void DrawCandlestickSerie(VertexHelper vh, Candlestick serie) { if (!serie.show) return; - if (serie.animation.HasFadeout()) return; + if (serie.animation.HasFadeOut()) return; XAxis xAxis; YAxis yAxis; GridCoord grid; diff --git a/Runtime/Serie/Candlestick/SimplifiedCandlestickHandler.cs b/Runtime/Serie/Candlestick/SimplifiedCandlestickHandler.cs index 18bf8470..a49f6c19 100644 --- a/Runtime/Serie/Candlestick/SimplifiedCandlestickHandler.cs +++ b/Runtime/Serie/Candlestick/SimplifiedCandlestickHandler.cs @@ -81,7 +81,7 @@ namespace XCharts.Runtime private void DrawCandlestickSerie(VertexHelper vh, SimplifiedCandlestick serie) { if (!serie.show) return; - if (serie.animation.HasFadeout()) return; + if (serie.animation.HasFadeOut()) return; XAxis xAxis; YAxis yAxis; GridCoord grid; diff --git a/Runtime/Serie/Heatmap/HeatmapHandler.cs b/Runtime/Serie/Heatmap/HeatmapHandler.cs index 7b1a79fd..a4aefd14 100644 --- a/Runtime/Serie/Heatmap/HeatmapHandler.cs +++ b/Runtime/Serie/Heatmap/HeatmapHandler.cs @@ -185,7 +185,7 @@ namespace XCharts.Runtime private void DrawDataHeatmapSerie(VertexHelper vh, Heatmap serie) { - if (!serie.show || serie.animation.HasFadeout()) return; + if (!serie.show || serie.animation.HasFadeOut()) return; XAxis xAxis; YAxis yAxis; if (!chart.TryGetChartComponent(out xAxis, serie.xAxisIndex)) return; @@ -332,7 +332,7 @@ namespace XCharts.Runtime private void DrawCountHeatmapSerie(VertexHelper vh, Heatmap serie) { - if (!serie.show || serie.animation.HasFadeout()) return; + if (!serie.show || serie.animation.HasFadeOut()) return; XAxis xAxis; YAxis yAxis; if (!chart.TryGetChartComponent(out xAxis, serie.xAxisIndex)) return; diff --git a/Runtime/Serie/Line/LineHandler.GridCoord.cs b/Runtime/Serie/Line/LineHandler.GridCoord.cs index 7bd31df5..f6fc6db7 100644 --- a/Runtime/Serie/Line/LineHandler.GridCoord.cs +++ b/Runtime/Serie/Line/LineHandler.GridCoord.cs @@ -248,7 +248,7 @@ namespace XCharts.Runtime private void DrawLineSerie(VertexHelper vh, Line serie) { - if (serie.animation.HasFadeout()) + if (serie.animation.HasFadeOut()) return; Axis axis; diff --git a/Runtime/Serie/Line/SimplifiedLineHandler.cs b/Runtime/Serie/Line/SimplifiedLineHandler.cs index 83b9d0bb..75f411bb 100644 --- a/Runtime/Serie/Line/SimplifiedLineHandler.cs +++ b/Runtime/Serie/Line/SimplifiedLineHandler.cs @@ -139,7 +139,7 @@ namespace XCharts.Runtime { if (!serie.show) return; - if (serie.animation.HasFadeout()) + if (serie.animation.HasFadeOut()) return; Axis axis; diff --git a/Runtime/Serie/Parallel/ParallelHandler.cs b/Runtime/Serie/Parallel/ParallelHandler.cs index 3ae6acf0..5c957c1d 100644 --- a/Runtime/Serie/Parallel/ParallelHandler.cs +++ b/Runtime/Serie/Parallel/ParallelHandler.cs @@ -21,7 +21,7 @@ namespace XCharts.Runtime private void DrawParallelSerie(VertexHelper vh, Parallel serie) { if (!serie.show) return; - if (serie.animation.HasFadeout()) return; + if (serie.animation.HasFadeOut()) return; var parallel = chart.GetChartComponent(serie.parallelIndex); if (parallel == null) diff --git a/Runtime/Serie/Pie/PieHandler.cs b/Runtime/Serie/Pie/PieHandler.cs index bf890c56..a3207652 100644 --- a/Runtime/Serie/Pie/PieHandler.cs +++ b/Runtime/Serie/Pie/PieHandler.cs @@ -300,7 +300,7 @@ namespace XCharts.Runtime private void DrawPie(VertexHelper vh, Serie serie) { - if (!serie.show || serie.animation.HasFadeout()) + if (!serie.show || serie.animation.HasFadeOut()) { return; } diff --git a/Runtime/Serie/Radar/RadarHandler.cs b/Runtime/Serie/Radar/RadarHandler.cs index f16d7317..1ab840e0 100644 --- a/Runtime/Serie/Radar/RadarHandler.cs +++ b/Runtime/Serie/Radar/RadarHandler.cs @@ -230,7 +230,7 @@ namespace XCharts.Runtime var angle = 2 * Mathf.PI / indicatorNum; var centerPos = m_RadarCoord.context.center; serie.animation.InitProgress(0, 1); - if (!serie.show || serie.animation.HasFadeout()) + if (!serie.show || serie.animation.HasFadeOut()) { return; } @@ -365,7 +365,7 @@ namespace XCharts.Runtime var angle = 2 * Mathf.PI / indicatorNum; var centerPos = m_RadarCoord.context.center; serie.animation.InitProgress(0, 1); - if (!serie.show || serie.animation.HasFadeout()) + if (!serie.show || serie.animation.HasFadeOut()) { return; } diff --git a/Runtime/Serie/Ring/RingHandler.cs b/Runtime/Serie/Ring/RingHandler.cs index c24ae72e..dd921e2d 100644 --- a/Runtime/Serie/Ring/RingHandler.cs +++ b/Runtime/Serie/Ring/RingHandler.cs @@ -176,7 +176,7 @@ namespace XCharts.Runtime public override void DrawSerie(VertexHelper vh) { - if (!serie.show || serie.animation.HasFadeout()) return; + if (!serie.show || serie.animation.HasFadeOut()) return; var data = serie.data; serie.animation.InitProgress(serie.startAngle, serie.startAngle + 360); SerieHelper.UpdateCenter(serie, chart.chartPosition, chart.chartWidth, chart.chartHeight); diff --git a/Runtime/Serie/Scatter/BaseScatterHandler.cs b/Runtime/Serie/Scatter/BaseScatterHandler.cs index 4b46fbda..7228c29e 100644 --- a/Runtime/Serie/Scatter/BaseScatterHandler.cs +++ b/Runtime/Serie/Scatter/BaseScatterHandler.cs @@ -106,7 +106,7 @@ namespace XCharts.Runtime protected virtual void DrawScatterSerie(VertexHelper vh, BaseScatter serie) { - if (serie.animation.HasFadeout()) + if (serie.animation.HasFadeOut()) return; if (!serie.show) @@ -216,7 +216,7 @@ namespace XCharts.Runtime protected virtual void DrawSingAxisScatterSerie(VertexHelper vh, BaseScatter serie) { - if (serie.animation.HasFadeout()) + if (serie.animation.HasFadeOut()) return; if (!serie.show) diff --git a/Runtime/Serie/Serie.cs b/Runtime/Serie/Serie.cs index 88c83ce2..9f967eab 100644 --- a/Runtime/Serie/Serie.cs +++ b/Runtime/Serie/Serie.cs @@ -1907,32 +1907,18 @@ namespace XCharts.Runtime /// /// 渐入动画 /// - public void AnimationFadein() - { - if (animation.enable) animation.Fadein(); - SetVerticesDirty(); - } - - [Obsolete("Use Serie.AnimationFadein() instead.", true)] public void AnimationFadeIn() { - if (animation.enable) animation.Fadein(); + if (animation.enable) animation.FadeIn(); SetVerticesDirty(); } /// /// 渐出动画 /// - public void AnimationFadeout() - { - if (animation.enable) animation.Fadeout(); - SetVerticesDirty(); - } - - [Obsolete("Use Serie.AnimationFadeout() instead.", true)] public void AnimationFadeOut() { - if (animation.enable) animation.Fadeout(); + if (animation.enable) animation.FadeOut(); SetVerticesDirty(); }