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

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

Browse Source
This commit is contained in:
monitor1394
2023-07-25 13:19:06 +08:00
parent b27f0ec6ec
commit ea4dac65e1
5 changed files with 167 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -412,9 +412,9 @@ namespace XCharts.Runtime
[System.Serializable]
public class AnimationInteraction : AnimationInfo
{
[SerializeField][Since("v3.8.0")] private float m_WidthRate = 1.3f;
[SerializeField][Since("v3.8.0")] private float m_WidthRate = 1.1f;
[SerializeField][Since("v3.8.0")] private float m_RadiusRate = 1.1f;
[SerializeField][Since("v3.8.0")] private float m_Offset = 8f;
[SerializeField][Since("v3.8.0")] private float m_Offset = 5f;
/// <summary>
/// the size rate of the width.

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

@@ -540,7 +540,6 @@ namespace XCharts.Runtime
public float GetInteractionRadius(float radius)
{
if (m_Enable && m_Interaction.enable)
return m_Interaction.GetRadius(radius);
else

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

@@ -5,7 +5,10 @@ namespace XCharts.Runtime
public class InteractData
{
private float m_PreviousValue = 0;
private float m_CurrentValue = 0;
private float m_TargetValue = 0;
private Vector3 m_PreviousPosition;
private Vector3 m_TargetPosition;
private Color32 m_PreviousColor;
private Color32 m_TargetColor;
private Color32 m_PreviousToColor;
@@ -21,30 +24,27 @@ namespace XCharts.Runtime
public override string ToString()
{
return string.Format("m_PreviousValue:{0},m_TargetValue:{1},m_UpdateTime:{2},m_UpdateFlag:{3},m_ValueEnable:{4}",
m_PreviousValue, m_TargetValue, m_UpdateTime, m_UpdateFlag, m_ValueEnable);
return string.Format("m_PreviousValue:{0},m_TargetValue:{1},m_UpdateTime:{2},m_UpdateFlag:{3},m_ValueEnable:{4},m_PreviousPosition:{5},m_TargetPosition:{6}",
m_PreviousValue, m_TargetValue, m_UpdateTime, m_UpdateFlag, m_ValueEnable, m_PreviousPosition, m_TargetPosition);
}
public void SetValue(ref bool needInteract, float size, bool highlight, float rate = 1.3f)
public void SetValue(ref bool needInteract, float value, bool highlight, float rate = 1.3f)
{
size = highlight && rate != 0 ? size * rate : size;
SetValue(ref needInteract, size);
value = highlight && rate != 0 ? value * rate : value;
SetValue(ref needInteract, value);
}
public void SetValue(ref bool needInteract, float size)
public void SetValue(ref bool needInteract, float value)
{
if (m_PreviousValue == float.NaN)
{
m_PreviousValue = size;
}
else if (m_TargetValue != size)
if (m_TargetValue != value)
{
needInteract = true;
m_UpdateFlag = true;
m_ValueEnable = true;
m_UpdateTime = Time.time;
m_PreviousValue = m_TargetValue;
m_TargetValue = size;
if (!m_ValueEnable)
m_PreviousValue = value;
else
m_PreviousValue = m_CurrentValue;
UpdateStart();
m_TargetValue = value;
}
else if (m_UpdateFlag)
{
@@ -52,18 +52,24 @@ namespace XCharts.Runtime
}
}
public void SetPosition(ref bool needInteract, Vector3 pos)
{
if (m_TargetPosition != pos)
{
needInteract = true;
UpdateStart();
m_PreviousPosition = m_TargetPosition == Vector3.one ? pos : m_TargetPosition;
m_TargetPosition = pos;
}
}
public void SetColor(ref bool needInteract, Color32 color)
{
if (!ChartHelper.IsValueEqualsColor(color, m_TargetColor))
{
if (!ChartHelper.IsClearColor(m_TargetColor))
{
needInteract = true;
m_UpdateFlag = true;
m_ValueEnable = true;
m_UpdateTime = Time.time;
m_PreviousColor = m_TargetColor;
}
needInteract = true;
UpdateStart();
m_PreviousColor = ChartHelper.IsClearColor(m_TargetColor) ? color : m_TargetColor;
m_TargetColor = color;
}
else if (m_UpdateFlag)
@@ -76,14 +82,9 @@ namespace XCharts.Runtime
SetColor(ref needInteract, color);
if (!ChartHelper.IsValueEqualsColor(toColor, m_TargetToColor))
{
if (!ChartHelper.IsClearColor(m_TargetToColor))
{
needInteract = true;
m_UpdateFlag = true;
m_ValueEnable = true;
m_UpdateTime = Time.time;
m_PreviousToColor = m_TargetToColor;
}
needInteract = true;
UpdateStart();
m_PreviousToColor = ChartHelper.IsClearColor(m_TargetToColor) ? color : m_TargetToColor;
m_TargetToColor = toColor;
}
}
@@ -102,41 +103,62 @@ namespace XCharts.Runtime
public bool TryGetValue(ref float value, ref bool interacting, float animationDuration = 250)
{
if (!IsValueEnable() || m_PreviousValue == 0 || animationDuration == 0)
if (!IsValueEnable() || animationDuration == 0)
return false;
if (float.IsNaN(m_TargetValue))
return false;
if (m_UpdateFlag && !float.IsNaN(m_PreviousValue))
{
var time = Time.time - m_UpdateTime;
var total = animationDuration / 1000;
var rate = time / total;
if (rate > 1) rate = 1;
var rate = GetRate(animationDuration);
if (rate < 1)
{
interacting = true;
value = Mathf.Lerp(m_PreviousValue, m_TargetValue, rate);
m_CurrentValue = value;
return true;
}
else
{
m_UpdateFlag = false;
UpdateEnd();
}
}
value = m_TargetValue;
return true;
}
public bool TryGetPosition(ref Vector3 pos, ref bool interacting, float animationDuration = 250)
{
if (!IsValueEnable() || animationDuration == 0)
return false;
if (m_TargetPosition == Vector3.one)
{
return false;
}
if (m_UpdateFlag && m_PreviousPosition != Vector3.one)
{
var rate = GetRate(animationDuration);
if (rate < 1)
{
interacting = true;
pos = Vector3.Lerp(m_PreviousPosition, m_TargetPosition, rate);
return true;
}
else
{
UpdateEnd();
}
}
pos = m_TargetPosition;
return true;
}
public bool TryGetColor(ref Color32 color, ref bool interacting, float animationDuration = 250)
{
if (!IsValueEnable() || animationDuration == 0)
return false;
if (m_UpdateFlag)
{
var time = Time.time - m_UpdateTime;
var total = animationDuration / 1000;
var rate = time / total;
if (rate > 1) rate = 1;
var rate = GetRate(animationDuration);
if (rate < 1)
{
interacting = true;
@@ -145,7 +167,7 @@ namespace XCharts.Runtime
}
else
{
m_UpdateFlag = false;
UpdateEnd();
}
}
color = m_TargetColor;
@@ -158,10 +180,7 @@ namespace XCharts.Runtime
return false;
if (m_UpdateFlag)
{
var time = Time.time - m_UpdateTime;
var total = animationDuration / 1000;
var rate = time / total;
if (rate > 1) rate = 1;
var rate = GetRate(animationDuration);
if (rate < 1)
{
interacting = true;
@@ -171,7 +190,7 @@ namespace XCharts.Runtime
}
else
{
m_UpdateFlag = false;
UpdateEnd();
}
}
color = m_TargetColor;
@@ -186,21 +205,19 @@ namespace XCharts.Runtime
return false;
if (m_UpdateFlag && !float.IsNaN(m_PreviousValue))
{
var time = Time.time - m_UpdateTime;
var total = animationDuration / 1000;
var rate = time / total;
if (rate > 1) rate = 1;
var rate = GetRate(animationDuration);
if (rate < 1)
{
interacting = true;
value = Mathf.Lerp(m_PreviousValue, m_TargetValue, rate);
color = Color32.Lerp(m_PreviousColor, m_TargetColor, rate);
toColor = Color32.Lerp(m_PreviousToColor, m_TargetToColor, rate);
m_CurrentValue = value;
return true;
}
else
{
m_UpdateFlag = false;
UpdateEnd();
}
}
value = m_TargetValue;
@@ -209,12 +226,56 @@ namespace XCharts.Runtime
return true;
}
private float GetRate(float animationDuration)
{
var time = Time.time - m_UpdateTime;
var total = animationDuration / 1000;
var rate = time / total;
if (rate > 1) rate = 1;
return rate;
}
private void UpdateStart()
{
m_ValueEnable = true;
m_UpdateFlag = true;
m_UpdateTime = Time.time;
}
private void UpdateEnd()
{
if (!m_UpdateFlag) return;
m_UpdateFlag = false;
m_PreviousColor = m_TargetColor;
m_PreviousToColor = m_TargetToColor;
m_PreviousValue = m_TargetValue;
m_CurrentValue = m_TargetValue;
m_PreviousPosition = m_TargetPosition;
}
public bool TryGetValueAndColor(ref float value, ref Vector3 pos, ref Color32 color, ref Color32 toColor, ref bool interacting, float animationDuration = 250)
{
var flag = TryGetValueAndColor(ref value, ref color, ref toColor, ref interacting, animationDuration);
flag |= TryGetPosition(ref pos, ref interacting, animationDuration);
return flag;
}
public bool TryGetValueAndColor(ref float value, ref Vector3 pos, ref bool interacting, float animationDuration = 250)
{
var flag = TryGetValue(ref value, ref interacting, animationDuration);
flag |= TryGetPosition(ref pos, ref interacting, animationDuration);
return flag;
}
public void Reset()
{
m_UpdateFlag = false;
m_ValueEnable = false;
m_TargetValue = float.NaN;
m_PreviousValue = float.NaN;
m_CurrentValue = float.NaN;
m_PreviousPosition = Vector3.one;
m_TargetPosition = Vector3.one;
m_TargetColor = ColorUtil.clearColor32;
m_TargetToColor = ColorUtil.clearColor32;
m_PreviousColor = ColorUtil.clearColor32;

13
Runtime/Component/Label/SerieLabelHelper.cs
View File

@@ -82,6 +82,9 @@ namespace XCharts.Runtime
var outsideRadius = serieData.context.outsideRadius;
var serieLabel = SerieHelper.GetSerieLabel(serie, serieData);
var labelLine = SerieHelper.GetSerieLabelLine(serie, serieData);
var center = serieData.context.offsetCenter;
var interact = false;
serieData.interact.TryGetValueAndColor(ref outsideRadius, ref center, ref interact, serie.animation.GetInteractionDuration());
switch (serieLabel.position)
{
case LabelStyle.Position.Center:
@@ -89,8 +92,8 @@ namespace XCharts.Runtime
break;
case LabelStyle.Position.Inside:
var labelRadius = offsetRadius + insideRadius + (outsideRadius - insideRadius) / 2 + serieLabel.distance;
var labelCenter = new Vector2(serie.context.center.x + labelRadius * Mathf.Sin(currRad),
serie.context.center.y + labelRadius * Mathf.Cos(currRad));
var labelCenter = new Vector2(center.x + labelRadius * Mathf.Sin(currRad),
center.y + labelRadius * Mathf.Cos(currRad));
serieData.context.labelPosition = labelCenter;
break;
default:
@@ -101,7 +104,7 @@ namespace XCharts.Runtime
var radius3 = insideRadius + (outsideRadius - insideRadius) / 2;
var currSin = Mathf.Sin(currRad);
var currCos = Mathf.Cos(currRad);
var pos0 = new Vector3(serie.context.center.x + radius3 * currSin, serie.context.center.y + radius3 * currCos);
var pos0 = new Vector3(center.x + radius3 * currSin, center.y + radius3 * currCos);
if ((currAngle - startAngle) % 360 > 180)
{
currSin = Mathf.Sin((360 - currAngle) * Mathf.Deg2Rad);
@@ -115,8 +118,8 @@ namespace XCharts.Runtime
else
{
labelRadius = serie.context.outsideRadius + (labelLine == null ? 0 : labelLine.lineLength1);
labelCenter = new Vector2(serie.context.center.x + labelRadius * Mathf.Sin(currRad),
serie.context.center.y + labelRadius * Mathf.Cos(currRad));
labelCenter = new Vector2(center.x + labelRadius * Mathf.Sin(currRad),
center.y + labelRadius * Mathf.Cos(currRad));
serieData.context.labelPosition = labelCenter;
}
break;