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

增加BarChart的Animation初始化动画配置支持

Browse Source
This commit is contained in:
monitor1394
2019-09-03 09:49:21 +08:00
parent 8049d1141b
commit 585da7ea18
6 changed files with 4487 additions and 4453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Scripts/UI/BarChart.cs
View File

@@ -71,11 +71,14 @@ namespace XCharts
float barHig = (xAxis.minValue > 0 ? value - xAxis.minValue : value)
/ (xAxis.maxValue - xAxis.minValue) * coordinateWid;
seriesHig[i] += barHig;
float currHig = CheckAnimation(serie,i,barHig);
Vector3 p1 = new Vector3(pX, pY + space + barWidth);
Vector3 p2 = new Vector3(pX + barHig, pY + space + barWidth);
Vector3 p3 = new Vector3(pX + barHig, pY + space);
Vector3 p2 = new Vector3(pX + currHig, pY + space + barWidth);
Vector3 p3 = new Vector3(pX + currHig, pY + space);
Vector3 p4 = new Vector3(pX, pY + space);
serie.dataPoints.Add(new Vector3(pX + barHig, pY + space + barWidth / 2));
serie.dataPoints.Add(new Vector3(pX + currHig, pY + space + barWidth / 2));
var highlight = (m_Tooltip.show && m_Tooltip.IsSelected(i))
|| serie.data[i].highlighted
|| serie.highlighted;
@@ -92,6 +95,28 @@ namespace XCharts
}
}
private float CheckAnimation(Serie serie, int dataIndex, float barHig)
{
float currHig = barHig;
if (!serie.animation.IsFinish())
{
if (serie.animation.IsInDelay()) currHig = 0;
else
{
var speed = serie.animation.duration > 0 ? barHig / serie.animation.duration * 1000 : barHig;
currHig = serie.animation.GetDataState(dataIndex) + speed * Time.deltaTime;
serie.animation.SetDataState(dataIndex, currHig);
if (Mathf.Abs(currHig) >= Mathf.Abs(barHig))
{
serie.animation.End();
currHig = barHig;
}
}
RefreshChart();
}
return currHig;
}
private void DrawXBarSerie(VertexHelper vh, int serieIndex, int stackCount,
Serie serie, int colorIndex, ref List<float> seriesHig)
{
@@ -133,11 +158,13 @@ namespace XCharts
/ (yAxis.maxValue - yAxis.minValue) * coordinateHig;
seriesHig[i] += barHig;
float currHig = CheckAnimation(serie,i,barHig);
Vector3 p1 = new Vector3(pX + space, pY);
Vector3 p2 = new Vector3(pX + space, pY + barHig);
Vector3 p3 = new Vector3(pX + space + barWidth, pY + barHig);
Vector3 p2 = new Vector3(pX + space, pY + currHig);
Vector3 p3 = new Vector3(pX + space + barWidth, pY + currHig);
Vector3 p4 = new Vector3(pX + space + barWidth, pY);
serie.dataPoints.Add(new Vector3(pX + space + barWidth / 2, pY + barHig));
serie.dataPoints.Add(new Vector3(pX + space + barWidth / 2, pY + currHig));
var highlight = (m_Tooltip.show && m_Tooltip.IsSelected(i))
|| serie.data[i].highlighted
|| serie.highlighted;