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

完善Pie饼图的交互动画效果

Browse Source
This commit is contained in:
monitor1394
2023-07-19 13:23:57 +08:00
parent f5e8ba4082
commit b27f0ec6ec
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -538,7 +538,8 @@ namespace XCharts.Runtime
return 0; return 0;
} }
public float GetInteractionRadius(float radius){ public float GetInteractionRadius(float radius)
{
if (m_Enable && m_Interaction.enable) if (m_Enable && m_Interaction.enable)
return m_Interaction.GetRadius(radius); return m_Interaction.GetRadius(radius);
@@ -550,5 +551,15 @@ namespace XCharts.Runtime
{ {
return enable && m_FadeOut.context.end; return enable && m_FadeOut.context.end;
} }
public bool IsFadeIn()
{
return enable && m_FadeIn.context.start;
}
public bool IsFadeOut()
{
return enable && m_FadeOut.context.start;
}
} }
} }

15
Runtime/Component/Interaction/InteractData.cs
View File

@@ -33,7 +33,11 @@ namespace XCharts.Runtime
public void SetValue(ref bool needInteract, float size) public void SetValue(ref bool needInteract, float size)
{ {
if (m_TargetValue != size) if (m_PreviousValue == float.NaN)
{
m_PreviousValue = size;
}
else if (m_TargetValue != size)
{ {
needInteract = true; needInteract = true;
m_UpdateFlag = true; m_UpdateFlag = true;
@@ -100,7 +104,9 @@ namespace XCharts.Runtime
{ {
if (!IsValueEnable() || m_PreviousValue == 0 || animationDuration == 0) if (!IsValueEnable() || m_PreviousValue == 0 || animationDuration == 0)
return false; return false;
if (m_UpdateFlag) if (float.IsNaN(m_TargetValue))
return false;
if (m_UpdateFlag && !float.IsNaN(m_PreviousValue))
{ {
var time = Time.time - m_UpdateTime; var time = Time.time - m_UpdateTime;
var total = animationDuration / 1000; var total = animationDuration / 1000;
@@ -176,7 +182,9 @@ namespace XCharts.Runtime
{ {
if (!IsValueEnable() || animationDuration == 0) if (!IsValueEnable() || animationDuration == 0)
return false; return false;
if (m_UpdateFlag) if (float.IsNaN(m_TargetValue))
return false;
if (m_UpdateFlag && !float.IsNaN(m_PreviousValue))
{ {
var time = Time.time - m_UpdateTime; var time = Time.time - m_UpdateTime;
var total = animationDuration / 1000; var total = animationDuration / 1000;
@@ -205,6 +213,7 @@ namespace XCharts.Runtime
{ {
m_UpdateFlag = false; m_UpdateFlag = false;
m_ValueEnable = false; m_ValueEnable = false;
m_TargetValue = float.NaN;
m_PreviousValue = float.NaN; m_PreviousValue = float.NaN;
m_TargetColor = ColorUtil.clearColor32; m_TargetColor = ColorUtil.clearColor32;
m_TargetToColor = ColorUtil.clearColor32; m_TargetToColor = ColorUtil.clearColor32;

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

@@ -343,7 +343,8 @@ namespace XCharts.Runtime
var color = ColorUtil.clearColor32; var color = ColorUtil.clearColor32;
var toColor = ColorUtil.clearColor32; var toColor = ColorUtil.clearColor32;
var interactDuration = serie.animation.GetInteractionDuration(); var interactDuration = serie.animation.GetInteractionDuration();
var interactEnable = serie.animation.enable && serie.animation.interaction.enable; var interactEnable = serie.animation.enable && serie.animation.interaction.enable
&& !serie.animation.IsFadeIn() && !serie.animation.IsFadeOut();
var data = serie.data; var data = serie.data;
serie.animation.InitProgress(0, 360); serie.animation.InitProgress(0, 360);
for (int n = 0; n < data.Count; n++) for (int n = 0; n < data.Count; n++)