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

增加customDrawCallback自定义绘制回调

Browse Source
This commit is contained in:
monitor1394
2019-10-01 13:31:34 +08:00
parent a1356e0d84
commit a220017d3d
13 changed files with 23670 additions and 18433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Demo/Scripts/Demo12_CustomDrawing.cs Normal file
View File

@@ -0,0 +1,29 @@
using UnityEngine;
using UnityEngine.UI;
using XCharts;
[DisallowMultipleComponent]
[ExecuteInEditMode]
public class Demo12_CustomDrawing : MonoBehaviour
{
LineChart chart;
void Awake()
{
chart = gameObject.GetComponent<LineChart>();
if (chart == null) return;
chart.customDrawCallback = delegate (VertexHelper vh)
{
var dataPoints = chart.series.series[0].dataPoints;
if (dataPoints.Count > 0)
{
var pos = dataPoints[3];
var zeroPos = new Vector3(chart.coordinateX, chart.coordinateY);
var startPos = new Vector3(pos.x, zeroPos.y);
var endPos = new Vector3(pos.x, zeroPos.y + chart.coordinateHig);
ChartDrawer.DrawLine(vh, startPos, endPos, 1, Color.blue);
ChartDrawer.DrawCricle(vh,pos,5,Color.blue);
}
};
}
}

11
Demo/Scripts/Demo12_CustomDrawing.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: fa5ea6ac5551141c78d4031bf2aa4140
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

41248
Demo/demo_xchart.unity
View File

File diff suppressed because it is too large Load Diff

33
Scripts/UI/Internal/BaseChart.cs
View File

@@ -39,7 +39,8 @@ namespace XCharts
[SerializeField] protected Tooltip m_Tooltip = Tooltip.defaultTooltip; [SerializeField] protected Tooltip m_Tooltip = Tooltip.defaultTooltip;
[SerializeField] protected Series m_Series = Series.defaultSeries; [SerializeField] protected Series m_Series = Series.defaultSeries;
[SerializeField] protected float m_Large = 1; [SerializeField] protected float m_Large = 1;
[SerializeField] [Range(1, 8)] private float m_LineSmoothStyle = 2f; [SerializeField] [Range(1, 8)] protected float m_LineSmoothStyle = 2f;
[SerializeField] protected Action<VertexHelper> m_CustomDrawCallback;
[NonSerialized] private Theme m_CheckTheme = 0; [NonSerialized] private Theme m_CheckTheme = 0;
[NonSerialized] private Title m_CheckTitle = Title.defaultTitle; [NonSerialized] private Title m_CheckTitle = Title.defaultTitle;
@@ -589,6 +590,10 @@ namespace XCharts
vh.Clear(); vh.Clear();
DrawBackground(vh); DrawBackground(vh);
DrawChart(vh); DrawChart(vh);
if (m_CustomDrawCallback != null)
{
m_CustomDrawCallback(vh);
}
DrawTooltip(vh); DrawTooltip(vh);
m_RefreshLabel = true; m_RefreshLabel = true;
} }
@@ -608,7 +613,7 @@ namespace XCharts
Vector3 p2 = new Vector3(chartWidth, chartHeight); Vector3 p2 = new Vector3(chartWidth, chartHeight);
Vector3 p3 = new Vector3(chartWidth, 0); Vector3 p3 = new Vector3(chartWidth, 0);
Vector3 p4 = new Vector3(0, 0); Vector3 p4 = new Vector3(0, 0);
ChartHelper.DrawPolygon(vh, p1, p2, p3, p4, m_ThemeInfo.backgroundColor); ChartDrawer.DrawPolygon(vh, p1, p2, p3, p4, m_ThemeInfo.backgroundColor);
} }
protected void DrawSymbol(VertexHelper vh, SerieSymbolType type, float symbolSize, protected void DrawSymbol(VertexHelper vh, SerieSymbolType type, float symbolSize,
@@ -619,15 +624,15 @@ namespace XCharts
case SerieSymbolType.None: case SerieSymbolType.None:
break; break;
case SerieSymbolType.Circle: case SerieSymbolType.Circle:
ChartHelper.DrawCricle(vh, pos, symbolSize, color, GetSymbolCricleSegment(symbolSize)); ChartDrawer.DrawCricle(vh, pos, symbolSize, color, GetSymbolCricleSegment(symbolSize));
break; break;
case SerieSymbolType.EmptyCircle: case SerieSymbolType.EmptyCircle:
int segment = GetSymbolCricleSegment(symbolSize); int segment = GetSymbolCricleSegment(symbolSize);
ChartHelper.DrawCricle(vh, pos, symbolSize, m_ThemeInfo.backgroundColor, segment); ChartDrawer.DrawCricle(vh, pos, symbolSize, m_ThemeInfo.backgroundColor, segment);
ChartHelper.DrawDoughnut(vh, pos, symbolSize - tickness, symbolSize, 0, 360, color, segment); ChartDrawer.DrawDoughnut(vh, pos, symbolSize - tickness, symbolSize, 0, 360, color, segment);
break; break;
case SerieSymbolType.Rect: case SerieSymbolType.Rect:
ChartHelper.DrawPolygon(vh, pos, symbolSize, color); ChartDrawer.DrawPolygon(vh, pos, symbolSize, color);
break; break;
case SerieSymbolType.Triangle: case SerieSymbolType.Triangle:
var x = symbolSize * Mathf.Cos(30 * Mathf.PI / 180); var x = symbolSize * Mathf.Cos(30 * Mathf.PI / 180);
@@ -635,14 +640,14 @@ namespace XCharts
var p1 = new Vector2(pos.x - x, pos.y - y); var p1 = new Vector2(pos.x - x, pos.y - y);
var p2 = new Vector2(pos.x, pos.y + symbolSize); var p2 = new Vector2(pos.x, pos.y + symbolSize);
var p3 = new Vector2(pos.x + x, pos.y - y); var p3 = new Vector2(pos.x + x, pos.y - y);
ChartHelper.DrawTriangle(vh, p1, p2, p3, color); ChartDrawer.DrawTriangle(vh, p1, p2, p3, color);
break; break;
case SerieSymbolType.Diamond: case SerieSymbolType.Diamond:
p1 = new Vector2(pos.x - symbolSize, pos.y); p1 = new Vector2(pos.x - symbolSize, pos.y);
p2 = new Vector2(pos.x, pos.y + symbolSize); p2 = new Vector2(pos.x, pos.y + symbolSize);
p3 = new Vector2(pos.x + symbolSize, pos.y); p3 = new Vector2(pos.x + symbolSize, pos.y);
var p4 = new Vector2(pos.x, pos.y - symbolSize); var p4 = new Vector2(pos.x, pos.y - symbolSize);
ChartHelper.DrawPolygon(vh, p1, p2, p3, p4, color); ChartDrawer.DrawPolygon(vh, p1, p2, p3, p4, color);
break; break;
} }
} }
@@ -665,7 +670,7 @@ namespace XCharts
p4 = ChartHelper.RotateRound(p4, centerPos, Vector3.forward, serie.label.rotate); p4 = ChartHelper.RotateRound(p4, centerPos, Vector3.forward, serie.label.rotate);
} }
ChartHelper.DrawPolygon(vh, p1, p2, p3, p4, serie.label.backgroundColor); ChartDrawer.DrawPolygon(vh, p1, p2, p3, p4, serie.label.backgroundColor);
if (serie.label.border) if (serie.label.border)
{ {
@@ -689,17 +694,17 @@ namespace XCharts
p7 = ChartHelper.RotateRound(p7, centerPos, Vector3.forward, serie.label.rotate); p7 = ChartHelper.RotateRound(p7, centerPos, Vector3.forward, serie.label.rotate);
p8 = ChartHelper.RotateRound(p8, centerPos, Vector3.forward, serie.label.rotate); p8 = ChartHelper.RotateRound(p8, centerPos, Vector3.forward, serie.label.rotate);
} }
ChartHelper.DrawLine(vh, p1, p2, borderWid, serie.label.borderColor); ChartDrawer.DrawLine(vh, p1, p2, borderWid, serie.label.borderColor);
ChartHelper.DrawLine(vh, p3, p4, borderWid, serie.label.borderColor); ChartDrawer.DrawLine(vh, p3, p4, borderWid, serie.label.borderColor);
ChartHelper.DrawLine(vh, p5, p6, borderWid, serie.label.borderColor); ChartDrawer.DrawLine(vh, p5, p6, borderWid, serie.label.borderColor);
ChartHelper.DrawLine(vh, p7, p8, borderWid, serie.label.borderColor); ChartDrawer.DrawLine(vh, p7, p8, borderWid, serie.label.borderColor);
} }
} }
private int GetSymbolCricleSegment(float radiu) private int GetSymbolCricleSegment(float radiu)
{ {
int max = 50; int max = 50;
int segent = (int)(2 * Mathf.PI * radiu / ChartHelper.CRICLE_SMOOTHNESS); int segent = (int)(2 * Mathf.PI * radiu / ChartDrawer.CRICLE_SMOOTHNESS);
if (segent > max) segent = max; if (segent > max) segent = max;
segent = (int)(segent / (1 + (m_Large - 1) / 10)); segent = (int)(segent / (1 + (m_Large - 1) / 10));
return segent; return segent;

21
Scripts/UI/Internal/BaseChart_API.cs
View File

@@ -1,5 +1,7 @@
using UnityEngine; using UnityEngine;
using System.Collections.Generic; using System.Collections.Generic;
using System;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {
@@ -47,7 +49,10 @@ namespace XCharts
/// </summary> /// </summary>
/// <value></value> /// <value></value>
public float lineSmoothStyle { get { return m_LineSmoothStyle; } set { m_LineSmoothStyle = value; } } public float lineSmoothStyle { get { return m_LineSmoothStyle; } set { m_LineSmoothStyle = value; } }
/// <summary>
/// 自定义绘制回调。
/// </summary>
public Action<VertexHelper> customDrawCallback { set { m_CustomDrawCallback = value; } }
/// <summary> /// <summary>
/// Set the size of chart. /// Set the size of chart.
/// 设置图表的大小。 /// 设置图表的大小。
@@ -236,9 +241,9 @@ namespace XCharts
/// <param name="serieName">the name of serie</param> /// <param name="serieName">the name of serie</param>
/// <param name="dataIndex">the index of data</param> /// <param name="dataIndex">the index of data</param>
/// <param name="value">the data will be update</param> /// <param name="value">the data will be update</param>
public virtual void UpdateData(string serieName,int dataIndex, float value) public virtual void UpdateData(string serieName, int dataIndex, float value)
{ {
m_Series.UpdateData(serieName,dataIndex, value); m_Series.UpdateData(serieName, dataIndex, value);
RefreshChart(); RefreshChart();
} }
@@ -249,9 +254,9 @@ namespace XCharts
/// <param name="serieIndex">the index of serie</param> /// <param name="serieIndex">the index of serie</param>
/// <param name="dataIndex">the index of data</param> /// <param name="dataIndex">the index of data</param>
/// <param name="value">the data will be update</param> /// <param name="value">the data will be update</param>
public virtual void UpdateData(int serieIndex,int dataIndex, float value) public virtual void UpdateData(int serieIndex, int dataIndex, float value)
{ {
m_Series.UpdateData(serieIndex, dataIndex,value); m_Series.UpdateData(serieIndex, dataIndex, value);
RefreshChart(); RefreshChart();
} }
@@ -262,9 +267,9 @@ namespace XCharts
/// <param name="serieName"></param> /// <param name="serieName"></param>
/// <param name="dataIndex"></param> /// <param name="dataIndex"></param>
/// <param name="dataName"></param> /// <param name="dataName"></param>
public virtual void UpdateDataName(string serieName,int dataIndex, string dataName) public virtual void UpdateDataName(string serieName, int dataIndex, string dataName)
{ {
m_Series.UpdateDataName(serieName,dataIndex, dataName); m_Series.UpdateDataName(serieName, dataIndex, dataName);
} }
/// <summary> /// <summary>
@@ -276,7 +281,7 @@ namespace XCharts
/// <param name="dataIndex"></param> /// <param name="dataIndex"></param>
public virtual void UpdateDataName(int serieIndex, int dataIndex, string dataName) public virtual void UpdateDataName(int serieIndex, int dataIndex, string dataName)
{ {
m_Series.UpdateDataName(serieIndex, dataIndex,dataName); m_Series.UpdateDataName(serieIndex, dataIndex, dataName);
} }
/// <summary> /// <summary>

50
Scripts/UI/Internal/CoordinateChart.cs
View File

@@ -762,7 +762,7 @@ namespace XCharts
var p2 = new Vector2(coordinateX, coordinateY + coordinateHig); var p2 = new Vector2(coordinateX, coordinateY + coordinateHig);
var p3 = new Vector2(coordinateX + coordinateWid, coordinateY + coordinateHig); var p3 = new Vector2(coordinateX + coordinateWid, coordinateY + coordinateHig);
var p4 = new Vector2(coordinateX + coordinateWid, coordinateY); var p4 = new Vector2(coordinateX + coordinateWid, coordinateY);
ChartHelper.DrawPolygon(vh, p1, p2, p3, p4, m_Grid.backgroundColor); ChartDrawer.DrawPolygon(vh, p1, p2, p3, p4, m_Grid.backgroundColor);
} }
} }
@@ -783,7 +783,7 @@ namespace XCharts
} }
if (yAxis.splitArea.show && i < size - 1) if (yAxis.splitArea.show && i < size - 1)
{ {
ChartHelper.DrawPolygon(vh, new Vector2(coordinateX, pY), ChartDrawer.DrawPolygon(vh, new Vector2(coordinateX, pY),
new Vector2(coordinateX + coordinateWid, pY), new Vector2(coordinateX + coordinateWid, pY),
new Vector2(coordinateX + coordinateWid, pY + scaleWidth), new Vector2(coordinateX + coordinateWid, pY + scaleWidth),
new Vector2(coordinateX, pY + scaleWidth), new Vector2(coordinateX, pY + scaleWidth),
@@ -802,7 +802,7 @@ namespace XCharts
{ {
pX += startX - yAxis.axisTick.length; pX += startX - yAxis.axisTick.length;
} }
ChartHelper.DrawLine(vh, new Vector3(startX, pY), new Vector3(pX, pY), ChartDrawer.DrawLine(vh, new Vector3(startX, pY), new Vector3(pX, pY),
yAxis.axisLine.width, m_ThemeInfo.axisLineColor); yAxis.axisLine.width, m_ThemeInfo.axisLineColor);
} }
if (yAxis.showSplitLine) if (yAxis.showSplitLine)
@@ -832,7 +832,7 @@ namespace XCharts
} }
if (xAxis.splitArea.show && i < size - 1) if (xAxis.splitArea.show && i < size - 1)
{ {
ChartHelper.DrawPolygon(vh, new Vector2(pX, coordinateY), ChartDrawer.DrawPolygon(vh, new Vector2(pX, coordinateY),
new Vector2(pX, coordinateY + coordinateHig), new Vector2(pX, coordinateY + coordinateHig),
new Vector2(pX + scaleWidth, coordinateY + coordinateHig), new Vector2(pX + scaleWidth, coordinateY + coordinateHig),
new Vector2(pX + scaleWidth, coordinateY), new Vector2(pX + scaleWidth, coordinateY),
@@ -851,7 +851,7 @@ namespace XCharts
{ {
pY += startY - xAxis.axisTick.length; pY += startY - xAxis.axisTick.length;
} }
ChartHelper.DrawLine(vh, new Vector3(pX, startY), new Vector3(pX, pY), ChartDrawer.DrawLine(vh, new Vector3(pX, startY), new Vector3(pX, pY),
xAxis.axisLine.width, m_ThemeInfo.axisLineColor); xAxis.axisLine.width, m_ThemeInfo.axisLineColor);
} }
if (xAxis.showSplitLine) if (xAxis.showSplitLine)
@@ -872,11 +872,11 @@ namespace XCharts
if (xAxis.IsValue() && xAxisIndex > 0) lineY += coordinateHig; if (xAxis.IsValue() && xAxisIndex > 0) lineY += coordinateHig;
var left = new Vector3(coordinateX - xAxis.axisLine.width, lineY); var left = new Vector3(coordinateX - xAxis.axisLine.width, lineY);
var top = new Vector3(coordinateX + coordinateWid + xAxis.axisLine.width, lineY); var top = new Vector3(coordinateX + coordinateWid + xAxis.axisLine.width, lineY);
ChartHelper.DrawLine(vh, left, top, xAxis.axisLine.width, m_ThemeInfo.axisLineColor); ChartDrawer.DrawLine(vh, left, top, xAxis.axisLine.width, m_ThemeInfo.axisLineColor);
if (xAxis.axisLine.symbol) if (xAxis.axisLine.symbol)
{ {
var axisLine = xAxis.axisLine; var axisLine = xAxis.axisLine;
ChartHelper.DrawArrow(vh, new Vector3(coordinateX, lineY), top, axisLine.symbolWidth, axisLine.symbolHeight, ChartDrawer.DrawArrow(vh, new Vector3(coordinateX, lineY), top, axisLine.symbolWidth, axisLine.symbolHeight,
axisLine.symbolOffset, axisLine.symbolDent, m_ThemeInfo.axisLineColor); axisLine.symbolOffset, axisLine.symbolDent, m_ThemeInfo.axisLineColor);
} }
} }
@@ -889,12 +889,12 @@ namespace XCharts
var lineX = coordinateX + (yAxis.axisLine.onZero ? m_XAxises[yAxisIndex].zeroXOffset : 0); var lineX = coordinateX + (yAxis.axisLine.onZero ? m_XAxises[yAxisIndex].zeroXOffset : 0);
if (yAxis.IsValue() && yAxisIndex > 0) lineX += coordinateWid; if (yAxis.IsValue() && yAxisIndex > 0) lineX += coordinateWid;
var top = new Vector3(lineX, coordinateY + coordinateHig + yAxis.axisLine.width); var top = new Vector3(lineX, coordinateY + coordinateHig + yAxis.axisLine.width);
ChartHelper.DrawLine(vh, new Vector3(lineX, coordinateY - yAxis.axisLine.width), ChartDrawer.DrawLine(vh, new Vector3(lineX, coordinateY - yAxis.axisLine.width),
top, yAxis.axisLine.width, m_ThemeInfo.axisLineColor); top, yAxis.axisLine.width, m_ThemeInfo.axisLineColor);
if (yAxis.axisLine.symbol) if (yAxis.axisLine.symbol)
{ {
var axisLine = yAxis.axisLine; var axisLine = yAxis.axisLine;
ChartHelper.DrawArrow(vh, new Vector3(lineX, coordinateX), top, axisLine.symbolWidth, axisLine.symbolHeight, ChartDrawer.DrawArrow(vh, new Vector3(lineX, coordinateX), top, axisLine.symbolWidth, axisLine.symbolHeight,
axisLine.symbolOffset, axisLine.symbolDent, m_ThemeInfo.axisLineColor); axisLine.symbolOffset, axisLine.symbolDent, m_ThemeInfo.axisLineColor);
} }
} }
@@ -908,10 +908,10 @@ namespace XCharts
var p3 = new Vector2(coordinateX + coordinateWid, m_DataZoom.bottom + m_DataZoom.height); var p3 = new Vector2(coordinateX + coordinateWid, m_DataZoom.bottom + m_DataZoom.height);
var p4 = new Vector2(coordinateX + coordinateWid, m_DataZoom.bottom); var p4 = new Vector2(coordinateX + coordinateWid, m_DataZoom.bottom);
var xAxis = xAxises[0]; var xAxis = xAxises[0];
ChartHelper.DrawLine(vh, p1, p2, xAxis.axisLine.width, m_ThemeInfo.dataZoomLineColor); ChartDrawer.DrawLine(vh, p1, p2, xAxis.axisLine.width, m_ThemeInfo.dataZoomLineColor);
ChartHelper.DrawLine(vh, p2, p3, xAxis.axisLine.width, m_ThemeInfo.dataZoomLineColor); ChartDrawer.DrawLine(vh, p2, p3, xAxis.axisLine.width, m_ThemeInfo.dataZoomLineColor);
ChartHelper.DrawLine(vh, p3, p4, xAxis.axisLine.width, m_ThemeInfo.dataZoomLineColor); ChartDrawer.DrawLine(vh, p3, p4, xAxis.axisLine.width, m_ThemeInfo.dataZoomLineColor);
ChartHelper.DrawLine(vh, p4, p1, xAxis.axisLine.width, m_ThemeInfo.dataZoomLineColor); ChartDrawer.DrawLine(vh, p4, p1, xAxis.axisLine.width, m_ThemeInfo.dataZoomLineColor);
if (m_DataZoom.showDataShadow && m_Series.Count > 0) if (m_DataZoom.showDataShadow && m_Series.Count > 0)
{ {
Serie serie = m_Series.series[0]; Serie serie = m_Series.series[0];
@@ -933,13 +933,13 @@ namespace XCharts
if (i > 0) if (i > 0)
{ {
Color color = m_ThemeInfo.dataZoomLineColor; Color color = m_ThemeInfo.dataZoomLineColor;
ChartHelper.DrawLine(vh, lp, np, xAxis.axisLine.width, color); ChartDrawer.DrawLine(vh, lp, np, xAxis.axisLine.width, color);
Vector3 alp = new Vector3(lp.x, lp.y - xAxis.axisLine.width); Vector3 alp = new Vector3(lp.x, lp.y - xAxis.axisLine.width);
Vector3 anp = new Vector3(np.x, np.y - xAxis.axisLine.width); Vector3 anp = new Vector3(np.x, np.y - xAxis.axisLine.width);
Color areaColor = new Color(color.r, color.g, color.b, color.a * 0.75f); Color areaColor = new Color(color.r, color.g, color.b, color.a * 0.75f);
Vector3 tnp = new Vector3(np.x, m_DataZoom.bottom + xAxis.axisLine.width); Vector3 tnp = new Vector3(np.x, m_DataZoom.bottom + xAxis.axisLine.width);
Vector3 tlp = new Vector3(lp.x, m_DataZoom.bottom + xAxis.axisLine.width); Vector3 tlp = new Vector3(lp.x, m_DataZoom.bottom + xAxis.axisLine.width);
ChartHelper.DrawPolygon(vh, alp, anp, tnp, tlp, areaColor); ChartDrawer.DrawPolygon(vh, alp, anp, tnp, tlp, areaColor);
} }
lp = np; lp = np;
} }
@@ -953,9 +953,9 @@ namespace XCharts
p2 = new Vector2(start, m_DataZoom.bottom + m_DataZoom.height); p2 = new Vector2(start, m_DataZoom.bottom + m_DataZoom.height);
p3 = new Vector2(end, m_DataZoom.bottom + m_DataZoom.height); p3 = new Vector2(end, m_DataZoom.bottom + m_DataZoom.height);
p4 = new Vector2(end, m_DataZoom.bottom); p4 = new Vector2(end, m_DataZoom.bottom);
ChartHelper.DrawPolygon(vh, p1, p2, p3, p4, m_ThemeInfo.dataZoomSelectedColor); ChartDrawer.DrawPolygon(vh, p1, p2, p3, p4, m_ThemeInfo.dataZoomSelectedColor);
ChartHelper.DrawLine(vh, p1, p2, xAxis.axisLine.width, m_ThemeInfo.dataZoomSelectedColor); ChartDrawer.DrawLine(vh, p1, p2, xAxis.axisLine.width, m_ThemeInfo.dataZoomSelectedColor);
ChartHelper.DrawLine(vh, p3, p4, xAxis.axisLine.width, m_ThemeInfo.dataZoomSelectedColor); ChartDrawer.DrawLine(vh, p3, p4, xAxis.axisLine.width, m_ThemeInfo.dataZoomSelectedColor);
break; break;
} }
} }
@@ -967,19 +967,19 @@ namespace XCharts
switch (type) switch (type)
{ {
case Axis.SplitLineType.Dashed: case Axis.SplitLineType.Dashed:
ChartHelper.DrawDashLine(vh, startPos, endPos, axis.axisLine.width, color); ChartDrawer.DrawDashLine(vh, startPos, endPos, axis.axisLine.width, color);
break; break;
case Axis.SplitLineType.Dotted: case Axis.SplitLineType.Dotted:
ChartHelper.DrawDotLine(vh, startPos, endPos, axis.axisLine.width, color); ChartDrawer.DrawDotLine(vh, startPos, endPos, axis.axisLine.width, color);
break; break;
case Axis.SplitLineType.Solid: case Axis.SplitLineType.Solid:
ChartHelper.DrawLine(vh, startPos, endPos, axis.axisLine.width, color); ChartDrawer.DrawLine(vh, startPos, endPos, axis.axisLine.width, color);
break; break;
case Axis.SplitLineType.DashDot: case Axis.SplitLineType.DashDot:
ChartHelper.DrawDashDotLine(vh, startPos, endPos, axis.axisLine.width, color); ChartDrawer.DrawDashDotLine(vh, startPos, endPos, axis.axisLine.width, color);
break; break;
case Axis.SplitLineType.DashDotDot: case Axis.SplitLineType.DashDotDot:
ChartHelper.DrawDashDotDotLine(vh, startPos, endPos, axis.axisLine.width, color); ChartDrawer.DrawDashDotDotLine(vh, startPos, endPos, axis.axisLine.width, color);
break; break;
} }
} }
@@ -1022,7 +1022,7 @@ namespace XCharts
Vector3 p2 = new Vector3(pX, pY); Vector3 p2 = new Vector3(pX, pY);
Vector3 p3 = new Vector3(pX + tooltipSplitWid, pY); Vector3 p3 = new Vector3(pX + tooltipSplitWid, pY);
Vector3 p4 = new Vector3(pX + tooltipSplitWid, coordinateY); Vector3 p4 = new Vector3(pX + tooltipSplitWid, coordinateY);
ChartHelper.DrawPolygon(vh, p1, p2, p3, p4, m_ThemeInfo.tooltipFlagAreaColor); ChartDrawer.DrawPolygon(vh, p1, p2, p3, p4, m_ThemeInfo.tooltipFlagAreaColor);
break; break;
} }
} }
@@ -1064,7 +1064,7 @@ namespace XCharts
Vector3 p2 = new Vector3(coordinateX, pY + tooltipSplitWid); Vector3 p2 = new Vector3(coordinateX, pY + tooltipSplitWid);
Vector3 p3 = new Vector3(pX, pY + tooltipSplitWid); Vector3 p3 = new Vector3(pX, pY + tooltipSplitWid);
Vector3 p4 = new Vector3(pX, pY); Vector3 p4 = new Vector3(pX, pY);
ChartHelper.DrawPolygon(vh, p1, p2, p3, p4, m_ThemeInfo.tooltipFlagAreaColor); ChartDrawer.DrawPolygon(vh, p1, p2, p3, p4, m_ThemeInfo.tooltipFlagAreaColor);
break; break;
} }
} }

4
Scripts/UI/Internal/CoordinateChart_DrawBar.cs
View File

@@ -64,7 +64,7 @@ namespace XCharts
{ {
Color areaColor = serie.GetAreaColor(m_ThemeInfo, colorIndex, highlight); Color areaColor = serie.GetAreaColor(m_ThemeInfo, colorIndex, highlight);
Color areaToColor = serie.GetAreaToColor(m_ThemeInfo, colorIndex, highlight); Color areaToColor = serie.GetAreaToColor(m_ThemeInfo, colorIndex, highlight);
ChartHelper.DrawPolygon(vh, p1, p2, p3, p4, areaColor, areaToColor); ChartDrawer.DrawPolygon(vh, p1, p2, p3, p4, areaColor, areaToColor);
} }
} }
if (!m_Series.IsStack(serie.stack, SerieType.Bar)) if (!m_Series.IsStack(serie.stack, SerieType.Bar))
@@ -151,7 +151,7 @@ namespace XCharts
{ {
Color areaColor = serie.GetAreaColor(m_ThemeInfo, colorIndex, highlight); Color areaColor = serie.GetAreaColor(m_ThemeInfo, colorIndex, highlight);
Color areaToColor = serie.GetAreaToColor(m_ThemeInfo, colorIndex, highlight); Color areaToColor = serie.GetAreaToColor(m_ThemeInfo, colorIndex, highlight);
ChartHelper.DrawPolygon(vh, p4, p1, p2, p3, areaColor, areaToColor); ChartDrawer.DrawPolygon(vh, p4, p1, p2, p3, areaColor, areaToColor);
} }
} }
if (!m_Series.IsStack(serie.stack, SerieType.Bar)) if (!m_Series.IsStack(serie.stack, SerieType.Bar))

144
Scripts/UI/Internal/CoordinateChart_DrawLine.cs
View File

@@ -52,7 +52,7 @@ namespace XCharts
if (dataPoints.Count < 2) dataPoints = serie.dataPoints; if (dataPoints.Count < 2) dataPoints = serie.dataPoints;
var startPos = dataPoints[dataPoints.Count - 2]; var startPos = dataPoints[dataPoints.Count - 2];
var arrowPos = dataPoints[dataPoints.Count - 1]; var arrowPos = dataPoints[dataPoints.Count - 1];
ChartHelper.DrawArrow(vh, startPos, arrowPos, serie.lineArrow.width, ChartDrawer.DrawArrow(vh, startPos, arrowPos, serie.lineArrow.width,
serie.lineArrow.height, serie.lineArrow.offset, serie.lineArrow.dent, lineColor); serie.lineArrow.height, serie.lineArrow.offset, serie.lineArrow.dent, lineColor);
break; break;
case LineArrow.Position.Start: case LineArrow.Position.Start:
@@ -60,7 +60,7 @@ namespace XCharts
if (dataPoints.Count < 2) dataPoints = serie.dataPoints; if (dataPoints.Count < 2) dataPoints = serie.dataPoints;
startPos = dataPoints[1]; startPos = dataPoints[1];
arrowPos = dataPoints[0]; arrowPos = dataPoints[0];
ChartHelper.DrawArrow(vh, startPos, arrowPos, serie.lineArrow.width, ChartDrawer.DrawArrow(vh, startPos, arrowPos, serie.lineArrow.width,
serie.lineArrow.height, serie.lineArrow.offset, serie.lineArrow.dent, lineColor); serie.lineArrow.height, serie.lineArrow.offset, serie.lineArrow.dent, lineColor);
break; break;
} }
@@ -181,19 +181,19 @@ namespace XCharts
areaColor, areaToColor, zeroPos); areaColor, areaToColor, zeroPos);
break; break;
case LineType.Dash: case LineType.Dash:
ChartHelper.DrawDashLine(vh, lp, np, serie.lineStyle.width, lineColor); ChartDrawer.DrawDashLine(vh, lp, np, serie.lineStyle.width, lineColor);
isFinish = true; isFinish = true;
break; break;
case LineType.Dot: case LineType.Dot:
ChartHelper.DrawDotLine(vh, lp, np, serie.lineStyle.width, lineColor); ChartDrawer.DrawDotLine(vh, lp, np, serie.lineStyle.width, lineColor);
isFinish = true; isFinish = true;
break; break;
case LineType.DashDot: case LineType.DashDot:
ChartHelper.DrawDashDotLine(vh, lp, np, serie.lineStyle.width, lineColor); ChartDrawer.DrawDashDotLine(vh, lp, np, serie.lineStyle.width, lineColor);
isFinish = true; isFinish = true;
break; break;
case LineType.DashDotDot: case LineType.DashDotDot:
ChartHelper.DrawDashDotDotLine(vh, lp, np, serie.lineStyle.width, lineColor); ChartDrawer.DrawDashDotDotLine(vh, lp, np, serie.lineStyle.width, lineColor);
isFinish = true; isFinish = true;
break; break;
} }
@@ -438,19 +438,19 @@ namespace XCharts
areaColor, areaToColor, zeroPos); areaColor, areaToColor, zeroPos);
break; break;
case LineType.Dash: case LineType.Dash:
ChartHelper.DrawDashLine(vh, lp, np, serie.lineStyle.width, lineColor); ChartDrawer.DrawDashLine(vh, lp, np, serie.lineStyle.width, lineColor);
isFinish = true; isFinish = true;
break; break;
case LineType.Dot: case LineType.Dot:
ChartHelper.DrawDotLine(vh, lp, np, serie.lineStyle.width, lineColor); ChartDrawer.DrawDotLine(vh, lp, np, serie.lineStyle.width, lineColor);
isFinish = true; isFinish = true;
break; break;
case LineType.DashDot: case LineType.DashDot:
ChartHelper.DrawDashDotLine(vh, lp, np, serie.lineStyle.width, lineColor); ChartDrawer.DrawDashDotLine(vh, lp, np, serie.lineStyle.width, lineColor);
isFinish = true; isFinish = true;
break; break;
case LineType.DashDotDot: case LineType.DashDotDot:
ChartHelper.DrawDashDotDotLine(vh, lp, np, serie.lineStyle.width, lineColor); ChartDrawer.DrawDashDotDotLine(vh, lp, np, serie.lineStyle.width, lineColor);
isFinish = true; isFinish = true;
break; break;
} }
@@ -480,7 +480,7 @@ namespace XCharts
if ((isYAxis && ySmall) || (!isYAxis && xSmall)) if ((isYAxis && ySmall) || (!isYAxis && xSmall))
{ {
if (serie.animation.CheckDetailBreak(np, isYAxis)) return false; if (serie.animation.CheckDetailBreak(np, isYAxis)) return false;
ChartHelper.DrawLine(vh, lp, np, serie.lineStyle.width, lineColor); ChartDrawer.DrawLine(vh, lp, np, serie.lineStyle.width, lineColor);
if (serie.areaStyle.show) if (serie.areaStyle.show)
{ {
DrawPolygonToZero(vh, lp, np, axis, zeroPos, areaColor, areaToColor, Vector3.zero); DrawPolygonToZero(vh, lp, np, axis, zeroPos, areaColor, areaToColor, Vector3.zero);
@@ -554,7 +554,7 @@ namespace XCharts
if ((isYAxis && tp1.y > lastDnPos.y) || (!isYAxis && tp1.x > lastDnPos.x) || dataIndex == 1 || IsValue()) if ((isYAxis && tp1.y > lastDnPos.y) || (!isYAxis && tp1.x > lastDnPos.x) || dataIndex == 1 || IsValue())
{ {
isStart = true; isStart = true;
ChartHelper.DrawPolygon(vh, stPos1, tp1, tp2, stPos2, lineColor); ChartDrawer.DrawPolygon(vh, stPos1, tp1, tp2, stPos2, lineColor);
} }
} }
else else
@@ -563,21 +563,21 @@ namespace XCharts
{ {
if (np != nnp) if (np != nnp)
{ {
ChartHelper.DrawPolygon(vh, ltp1, upPos1, dnPos, ltp2, lineColor); ChartDrawer.DrawPolygon(vh, ltp1, upPos1, dnPos, ltp2, lineColor);
ChartHelper.DrawTriangle(vh, upPos1, upPos2, dnPos, lineColor); ChartDrawer.DrawTriangle(vh, upPos1, upPos2, dnPos, lineColor);
} }
else ChartHelper.DrawPolygon(vh, ltp1, upPos1, upPos2, ltp2, lineColor); else ChartDrawer.DrawPolygon(vh, ltp1, upPos1, upPos2, ltp2, lineColor);
} }
else else
{ {
if ((isYAxis && tp2.y < dnPos.y) || (!isYAxis && tp2.x < dnPos.x) || IsValue()) if ((isYAxis && tp2.y < dnPos.y) || (!isYAxis && tp2.x < dnPos.x) || IsValue())
{ {
ChartHelper.DrawLine(vh, start, cp, serie.lineStyle.width, lineColor); ChartDrawer.DrawLine(vh, start, cp, serie.lineStyle.width, lineColor);
} }
else else
{ {
ChartHelper.DrawPolygon(vh, ltp1, upPos1, dnPos, ltp2, lineColor); ChartDrawer.DrawPolygon(vh, ltp1, upPos1, dnPos, ltp2, lineColor);
ChartHelper.DrawTriangle(vh, upPos1, upPos2, dnPos, lineColor); ChartDrawer.DrawTriangle(vh, upPos1, upPos2, dnPos, lineColor);
i = segment; i = segment;
} }
} }
@@ -604,7 +604,7 @@ namespace XCharts
if ((isYAxis && tp2.y > lastDnPos.y) || (!isYAxis && tp2.x > lastDnPos.x) || dataIndex == 1 || IsValue()) if ((isYAxis && tp2.y > lastDnPos.y) || (!isYAxis && tp2.x > lastDnPos.x) || dataIndex == 1 || IsValue())
{ {
isStart = true; isStart = true;
ChartHelper.DrawPolygon(vh, stPos1, tp1, tp2, stPos2, lineColor); ChartDrawer.DrawPolygon(vh, stPos1, tp1, tp2, stPos2, lineColor);
} }
} }
else else
@@ -613,19 +613,19 @@ namespace XCharts
{ {
if (np != nnp) if (np != nnp)
{ {
ChartHelper.DrawPolygon(vh, ltp1, dnPos, upPos1, ltp2, lineColor); ChartDrawer.DrawPolygon(vh, ltp1, dnPos, upPos1, ltp2, lineColor);
ChartHelper.DrawTriangle(vh, dnPos, upPos2, upPos1, lineColor); ChartDrawer.DrawTriangle(vh, dnPos, upPos2, upPos1, lineColor);
} }
else ChartHelper.DrawPolygon(vh, ltp1, upPos1, upPos2, ltp2, lineColor); else ChartDrawer.DrawPolygon(vh, ltp1, upPos1, upPos2, ltp2, lineColor);
} }
else else
{ {
if ((isYAxis && tp1.y < dnPos.y) || (!isYAxis && tp1.x < dnPos.x) || IsValue()) if ((isYAxis && tp1.y < dnPos.y) || (!isYAxis && tp1.x < dnPos.x) || IsValue())
ChartHelper.DrawLine(vh, start, cp, serie.lineStyle.width, lineColor); ChartDrawer.DrawLine(vh, start, cp, serie.lineStyle.width, lineColor);
else else
{ {
ChartHelper.DrawPolygon(vh, ltp1, dnPos, upPos1, ltp2, lineColor); ChartDrawer.DrawPolygon(vh, ltp1, dnPos, upPos1, ltp2, lineColor);
ChartHelper.DrawTriangle(vh, dnPos, upPos2, upPos1, lineColor); ChartDrawer.DrawTriangle(vh, dnPos, upPos2, upPos1, lineColor);
i = segment; i = segment;
} }
} }
@@ -739,7 +739,7 @@ namespace XCharts
if ((isYAxis && ep.y > luPos.y) || (!isYAxis && ep.x > luPos.x)) if ((isYAxis && ep.y > luPos.y) || (!isYAxis && ep.x > luPos.x))
{ {
var tp = isYAxis ? new Vector3(luPos.x, sp.y) : new Vector3(sp.x, luPos.y); var tp = isYAxis ? new Vector3(luPos.x, sp.y) : new Vector3(sp.x, luPos.y);
ChartHelper.DrawTriangle(vh, sp, luPos, tp, areaColor, areaToColor, areaToColor); ChartDrawer.DrawTriangle(vh, sp, luPos, tp, areaColor, areaToColor, areaToColor);
break; break;
} }
DrawPolygonToZero(vh, sp, ep, axis, zeroPos, areaColor, areaToColor, Vector3.zero); DrawPolygonToZero(vh, sp, ep, axis, zeroPos, areaColor, areaToColor, Vector3.zero);
@@ -761,7 +761,7 @@ namespace XCharts
{ {
first = true; first = true;
var tp = isYAxis ? new Vector3(rdPos.x, ep.y) : new Vector3(ep.x, rdPos.y); var tp = isYAxis ? new Vector3(rdPos.x, ep.y) : new Vector3(ep.x, rdPos.y);
ChartHelper.DrawTriangle(vh, rdPos, tp, ep, areaToColor, areaToColor, areaColor); ChartDrawer.DrawTriangle(vh, rdPos, tp, ep, areaToColor, areaToColor, areaColor);
sp = ep; sp = ep;
continue; continue;
} }
@@ -785,7 +785,7 @@ namespace XCharts
if ((isYAxis && ep.y > rdPos.y) || (!isYAxis && ep.x > rdPos.x)) if ((isYAxis && ep.y > rdPos.y) || (!isYAxis && ep.x > rdPos.x))
{ {
var tp = isYAxis ? new Vector3(rdPos.x, sp.y) : new Vector3(sp.x, rdPos.y); var tp = isYAxis ? new Vector3(rdPos.x, sp.y) : new Vector3(sp.x, rdPos.y);
ChartHelper.DrawTriangle(vh, sp, rdPos, tp, areaColor, areaToColor, areaToColor); ChartDrawer.DrawTriangle(vh, sp, rdPos, tp, areaColor, areaToColor, areaToColor);
break; break;
} }
if (rdPos != Vector3.zero) DrawPolygonToZero(vh, sp, ep, axis, zeroPos, areaColor, areaToColor, Vector3.zero); if (rdPos != Vector3.zero) DrawPolygonToZero(vh, sp, ep, axis, zeroPos, areaColor, areaToColor, Vector3.zero);
@@ -807,7 +807,7 @@ namespace XCharts
{ {
first = true; first = true;
var tp = isYAxis ? new Vector3(luPos.x, ep.y) : new Vector3(ep.x, luPos.y); var tp = isYAxis ? new Vector3(luPos.x, ep.y) : new Vector3(ep.x, luPos.y);
ChartHelper.DrawTriangle(vh, ep, luPos, tp, areaColor, areaToColor, areaToColor); ChartDrawer.DrawTriangle(vh, ep, luPos, tp, areaColor, areaToColor, areaToColor);
sp = ep; sp = ep;
continue; continue;
} }
@@ -834,7 +834,7 @@ namespace XCharts
var isLessthan0 = (sp.x < zeroPos.x || ep.x < zeroPos.x); var isLessthan0 = (sp.x < zeroPos.x || ep.x < zeroPos.x);
diff = isLessthan0 ? -axis.axisLine.width : axis.axisLine.width; diff = isLessthan0 ? -axis.axisLine.width : axis.axisLine.width;
if (isLessthan0) areaDiff = -areaDiff; if (isLessthan0) areaDiff = -areaDiff;
ChartHelper.DrawPolygon(vh, new Vector3(zeroPos.x + diff, sp.y), new Vector3(zeroPos.x + diff, ep.y), ep + areaDiff, sp + areaDiff, areaToColor, areaColor); ChartDrawer.DrawPolygon(vh, new Vector3(zeroPos.x + diff, sp.y), new Vector3(zeroPos.x + diff, ep.y), ep + areaDiff, sp + areaDiff, areaToColor, areaColor);
} }
else else
{ {
@@ -843,11 +843,11 @@ namespace XCharts
if (isLessthan0) areaDiff = -areaDiff; if (isLessthan0) areaDiff = -areaDiff;
if (isLessthan0) if (isLessthan0)
{ {
ChartHelper.DrawPolygon(vh, ep + areaDiff, sp + areaDiff, new Vector3(sp.x, zeroPos.y + diff), new Vector3(ep.x, zeroPos.y + diff), areaColor, areaToColor); ChartDrawer.DrawPolygon(vh, ep + areaDiff, sp + areaDiff, new Vector3(sp.x, zeroPos.y + diff), new Vector3(ep.x, zeroPos.y + diff), areaColor, areaToColor);
} }
else else
{ {
ChartHelper.DrawPolygon(vh, sp + areaDiff, ep + areaDiff, new Vector3(ep.x, zeroPos.y + diff), new Vector3(sp.x, zeroPos.y + diff), areaColor, areaToColor); ChartDrawer.DrawPolygon(vh, sp + areaDiff, ep + areaDiff, new Vector3(ep.x, zeroPos.y + diff), new Vector3(sp.x, zeroPos.y + diff), areaColor, areaToColor);
} }
} }
} }
@@ -874,7 +874,7 @@ namespace XCharts
{ {
start = bezierPoints[i]; start = bezierPoints[i];
to = bezierPoints[i + 1]; to = bezierPoints[i + 1];
ChartHelper.DrawLine(vh, start, to, lineWidth, lineColor); ChartDrawer.DrawLine(vh, start, to, lineWidth, lineColor);
} }
return true; return true;
} }
@@ -891,8 +891,8 @@ namespace XCharts
bool isFinish = true; bool isFinish = true;
if (dataIndex > 1) if (dataIndex > 1)
{ {
ChartHelper.DrawTriangle(vh, smoothStartPosUp, startUp, lp, lineColor); ChartDrawer.DrawTriangle(vh, smoothStartPosUp, startUp, lp, lineColor);
ChartHelper.DrawTriangle(vh, smoothStartPosDn, startDn, lp, lineColor); ChartDrawer.DrawTriangle(vh, smoothStartPosDn, startDn, lp, lineColor);
} }
for (int k = 1; k < bezierPoints.Count; k++) for (int k = 1; k < bezierPoints.Count; k++)
{ {
@@ -907,8 +907,8 @@ namespace XCharts
diff = dir1v * lineWidth; diff = dir1v * lineWidth;
toUp = to - diff; toUp = to - diff;
toDn = to + diff; toDn = to + diff;
if (isYAxis) ChartHelper.DrawPolygon(vh, startDn, toDn, toUp, startUp, lineColor); if (isYAxis) ChartDrawer.DrawPolygon(vh, startDn, toDn, toUp, startUp, lineColor);
else ChartHelper.DrawPolygon(vh, startUp, toUp, toDn, startDn, lineColor); else ChartDrawer.DrawPolygon(vh, startUp, toUp, toDn, startDn, lineColor);
smoothPoints.Add(toUp); smoothPoints.Add(toUp);
smoothDownPoints.Add(toDn); smoothDownPoints.Add(toDn);
if (k == bezierPoints.Count - 1) if (k == bezierPoints.Count - 1)
@@ -924,13 +924,13 @@ namespace XCharts
{ {
tnp = new Vector3(zeroPos.x + xAxis.axisLine.width, toDn.y); tnp = new Vector3(zeroPos.x + xAxis.axisLine.width, toDn.y);
tlp = new Vector3(zeroPos.x + xAxis.axisLine.width, startDn.y); tlp = new Vector3(zeroPos.x + xAxis.axisLine.width, startDn.y);
ChartHelper.DrawPolygon(vh, startDn, toDn, tnp, tlp, areaColor, areaToColor); ChartDrawer.DrawPolygon(vh, startDn, toDn, tnp, tlp, areaColor, areaToColor);
} }
else if (start.x < zeroPos.x && to.x < zeroPos.x) else if (start.x < zeroPos.x && to.x < zeroPos.x)
{ {
tnp = new Vector3(zeroPos.x - xAxis.axisLine.width, toUp.y); tnp = new Vector3(zeroPos.x - xAxis.axisLine.width, toUp.y);
tlp = new Vector3(zeroPos.x - xAxis.axisLine.width, startUp.y); tlp = new Vector3(zeroPos.x - xAxis.axisLine.width, startUp.y);
ChartHelper.DrawPolygon(vh, tnp, tlp, startUp, toUp, areaToColor, areaColor); ChartDrawer.DrawPolygon(vh, tnp, tlp, startUp, toUp, areaToColor, areaColor);
} }
} }
else else
@@ -939,13 +939,13 @@ namespace XCharts
{ {
tnp = new Vector3(toDn.x, zeroPos.y + xAxis.axisLine.width); tnp = new Vector3(toDn.x, zeroPos.y + xAxis.axisLine.width);
tlp = new Vector3(startDn.x, zeroPos.y + xAxis.axisLine.width); tlp = new Vector3(startDn.x, zeroPos.y + xAxis.axisLine.width);
ChartHelper.DrawPolygon(vh, startDn, toDn, tnp, tlp, areaColor, areaToColor); ChartDrawer.DrawPolygon(vh, startDn, toDn, tnp, tlp, areaColor, areaToColor);
} }
else if (start.y < zeroPos.y && to.y < zeroPos.y) else if (start.y < zeroPos.y && to.y < zeroPos.y)
{ {
tnp = new Vector3(toUp.x, zeroPos.y - xAxis.axisLine.width); tnp = new Vector3(toUp.x, zeroPos.y - xAxis.axisLine.width);
tlp = new Vector3(startUp.x, zeroPos.y - xAxis.axisLine.width); tlp = new Vector3(startUp.x, zeroPos.y - xAxis.axisLine.width);
ChartHelper.DrawPolygon(vh, tlp, tnp, toUp, startUp, areaToColor, areaColor); ChartDrawer.DrawPolygon(vh, tlp, tnp, toUp, startUp, areaToColor, areaColor);
} }
} }
} }
@@ -985,12 +985,12 @@ namespace XCharts
if (k < lastSmoothPoints.Count - 1) if (k < lastSmoothPoints.Count - 1)
{ {
tnp = lastSmoothPoints[lastCount - 1]; tnp = lastSmoothPoints[lastCount - 1];
ChartHelper.DrawTriangle(vh, start, to, tnp, areaColor, areaColor, areaToColor); ChartDrawer.DrawTriangle(vh, start, to, tnp, areaColor, areaColor, areaToColor);
while (lastCount < lastSmoothPoints.Count) while (lastCount < lastSmoothPoints.Count)
{ {
tlp = lastSmoothPoints[lastCount]; tlp = lastSmoothPoints[lastCount];
if (serie.animation.CheckDetailBreak(tlp, isYAxis)) break; if (serie.animation.CheckDetailBreak(tlp, isYAxis)) break;
ChartHelper.DrawTriangle(vh, tnp, to, tlp, areaToColor, areaColor, areaToColor); ChartDrawer.DrawTriangle(vh, tnp, to, tlp, areaToColor, areaColor, areaToColor);
lastCount++; lastCount++;
tnp = tlp; tnp = tlp;
} }
@@ -1002,7 +1002,7 @@ namespace XCharts
{ {
tlp = lastSmoothPoints[lastSmoothPoints.Count - 1]; tlp = lastSmoothPoints[lastSmoothPoints.Count - 1];
if (serie.animation.CheckDetailBreak(tlp, isYAxis)) break; if (serie.animation.CheckDetailBreak(tlp, isYAxis)) break;
ChartHelper.DrawTriangle(vh, to, start, tlp, areaColor, areaColor, areaToColor); ChartDrawer.DrawTriangle(vh, to, start, tlp, areaColor, areaColor, areaToColor);
start = to; start = to;
continue; continue;
} }
@@ -1012,7 +1012,7 @@ namespace XCharts
{ {
tlp = lastSmoothPoints[lastCount - 1]; tlp = lastSmoothPoints[lastCount - 1];
if (serie.animation.CheckDetailBreak(tlp, isYAxis)) break; if (serie.animation.CheckDetailBreak(tlp, isYAxis)) break;
ChartHelper.DrawPolygon(vh, start, to, tnp, tlp, areaColor, areaToColor); ChartDrawer.DrawPolygon(vh, start, to, tnp, tlp, areaColor, areaToColor);
lastCount++; lastCount++;
} }
else else
@@ -1020,12 +1020,12 @@ namespace XCharts
if (diff < 0) if (diff < 0)
{ {
tnp = lastSmoothPoints[lastCount - 1]; tnp = lastSmoothPoints[lastCount - 1];
ChartHelper.DrawTriangle(vh, start, to, tnp, areaColor, areaColor, areaToColor); ChartDrawer.DrawTriangle(vh, start, to, tnp, areaColor, areaColor, areaToColor);
while (diff < 0 && lastCount < lastSmoothPoints.Count) while (diff < 0 && lastCount < lastSmoothPoints.Count)
{ {
tlp = lastSmoothPoints[lastCount]; tlp = lastSmoothPoints[lastCount];
if (serie.animation.CheckDetailBreak(tlp, isYAxis)) break; if (serie.animation.CheckDetailBreak(tlp, isYAxis)) break;
ChartHelper.DrawTriangle(vh, tnp, to, tlp, areaToColor, areaColor, areaToColor); ChartDrawer.DrawTriangle(vh, tnp, to, tlp, areaToColor, areaColor, areaToColor);
lastCount++; lastCount++;
diff = isYAxis ? tlp.y - to.y : tlp.x - to.x; diff = isYAxis ? tlp.y - to.y : tlp.x - to.x;
tnp = tlp; tnp = tlp;
@@ -1035,7 +1035,7 @@ namespace XCharts
{ {
tlp = lastSmoothPoints[lastCount - 1]; tlp = lastSmoothPoints[lastCount - 1];
if (serie.animation.CheckDetailBreak(tlp, isYAxis)) break; if (serie.animation.CheckDetailBreak(tlp, isYAxis)) break;
ChartHelper.DrawTriangle(vh, start, to, tlp, areaColor, areaColor, areaToColor); ChartDrawer.DrawTriangle(vh, start, to, tlp, areaColor, areaColor, areaToColor);
} }
} }
start = to; start = to;
@@ -1046,7 +1046,7 @@ namespace XCharts
var p2 = lastSmoothPoints[lastSmoothPoints.Count - 1]; var p2 = lastSmoothPoints[lastSmoothPoints.Count - 1];
if (!serie.animation.CheckDetailBreak(p1, isYAxis)) if (!serie.animation.CheckDetailBreak(p1, isYAxis))
{ {
ChartHelper.DrawTriangle(vh, p1, start, p2, areaToColor, areaColor, areaToColor); ChartDrawer.DrawTriangle(vh, p1, start, p2, areaToColor, areaColor, areaToColor);
} }
} }
} }
@@ -1077,15 +1077,15 @@ namespace XCharts
for (int i = 1; i < linePointList.Count; i++) for (int i = 1; i < linePointList.Count; i++)
{ {
ep = linePointList[i]; ep = linePointList[i];
ChartHelper.DrawLine(vh, sp, ep, lineWidth, lineColor); ChartDrawer.DrawLine(vh, sp, ep, lineWidth, lineColor);
sp = ep; sp = ep;
} }
ChartHelper.DrawPolygon(vh, middle, lineWidth, lineColor); ChartDrawer.DrawPolygon(vh, middle, lineWidth, lineColor);
} }
else else
{ {
if (dataIndex == 1) ChartHelper.DrawPolygon(vh, lp, lineWidth, lineColor); if (dataIndex == 1) ChartDrawer.DrawPolygon(vh, lp, lineWidth, lineColor);
ChartHelper.DrawLine(vh, lp + diff1, middle + diff1, lineWidth, lineColor); ChartDrawer.DrawLine(vh, lp + diff1, middle + diff1, lineWidth, lineColor);
} }
if (serie.areaStyle.show) if (serie.areaStyle.show)
{ {
@@ -1105,7 +1105,7 @@ namespace XCharts
{ {
ep = linePointList[i]; ep = linePointList[i];
if (serie.animation.CheckDetailBreak(ep, isYAxis)) return false; if (serie.animation.CheckDetailBreak(ep, isYAxis)) return false;
ChartHelper.DrawLine(vh, sp, ep, lineWidth, lineColor); ChartDrawer.DrawLine(vh, sp, ep, lineWidth, lineColor);
if (serie.areaStyle.show) if (serie.areaStyle.show)
{ {
DrawPolygonToZero(vh, sp, ep, axis, zeroPos, areaColor, areaToColor, areaDiff); DrawPolygonToZero(vh, sp, ep, axis, zeroPos, areaColor, areaToColor, areaDiff);
@@ -1116,7 +1116,7 @@ namespace XCharts
if (nnp != np) if (nnp != np)
{ {
if (serie.animation.CheckDetailBreak(np, isYAxis)) return false; if (serie.animation.CheckDetailBreak(np, isYAxis)) return false;
ChartHelper.DrawPolygon(vh, np, lineWidth, lineColor); ChartDrawer.DrawPolygon(vh, np, lineWidth, lineColor);
bool flag = ((isYAxis && nnp.x > np.x && np.x > zeroPos.x) || (!isYAxis && nnp.y > np.y && np.y > zeroPos.y)); bool flag = ((isYAxis && nnp.x > np.x && np.x > zeroPos.x) || (!isYAxis && nnp.y > np.y && np.y > zeroPos.y));
if (serie.areaStyle.show && flag) if (serie.areaStyle.show && flag)
{ {
@@ -1142,7 +1142,7 @@ namespace XCharts
{ {
ep = linePointList[i]; ep = linePointList[i];
if (serie.animation.CheckDetailBreak(ep, isYAxis)) return false; if (serie.animation.CheckDetailBreak(ep, isYAxis)) return false;
ChartHelper.DrawLine(vh, sp, ep, lineWidth, lineColor); ChartDrawer.DrawLine(vh, sp, ep, lineWidth, lineColor);
if (serie.areaStyle.show) if (serie.areaStyle.show)
{ {
DrawPolygonToZero(vh, sp, ep, axis, zeroPos, areaColor, areaToColor, areaDiff); DrawPolygonToZero(vh, sp, ep, axis, zeroPos, areaColor, areaToColor, areaDiff);
@@ -1150,7 +1150,7 @@ namespace XCharts
sp = ep; sp = ep;
} }
if (serie.animation.CheckDetailBreak(middle1, isYAxis)) return false; if (serie.animation.CheckDetailBreak(middle1, isYAxis)) return false;
ChartHelper.DrawPolygon(vh, middle1, lineWidth, lineColor); ChartDrawer.DrawPolygon(vh, middle1, lineWidth, lineColor);
if (serie.areaStyle.show && Vector3.Dot(middleZero - middle1, middle2 - middle1) <= 0) if (serie.areaStyle.show && Vector3.Dot(middleZero - middle1, middle2 - middle1) <= 0)
{ {
DrawPolygonToZero(vh, middle1 - diff1, middle1 + diff1, axis, zeroPos, areaColor, areaToColor, areaDiff); DrawPolygonToZero(vh, middle1 - diff1, middle1 + diff1, axis, zeroPos, areaColor, areaToColor, areaDiff);
@@ -1158,8 +1158,8 @@ namespace XCharts
} }
else else
{ {
if (dataIndex == 1) ChartHelper.DrawPolygon(vh, lp, lineWidth, lineColor); if (dataIndex == 1) ChartDrawer.DrawPolygon(vh, lp, lineWidth, lineColor);
ChartHelper.DrawLine(vh, lp + diff1, middle1 + diff1, lineWidth, lineColor); ChartDrawer.DrawLine(vh, lp + diff1, middle1 + diff1, lineWidth, lineColor);
} }
//draw middle1 to middle2 //draw middle1 to middle2
@@ -1170,10 +1170,10 @@ namespace XCharts
for (int i = 1; i < linePointList.Count; i++) for (int i = 1; i < linePointList.Count; i++)
{ {
ep = linePointList[i]; ep = linePointList[i];
ChartHelper.DrawLine(vh, sp, ep, lineWidth, lineColor); ChartDrawer.DrawLine(vh, sp, ep, lineWidth, lineColor);
sp = ep; sp = ep;
} }
ChartHelper.DrawPolygon(vh, middle2, lineWidth, lineColor); ChartDrawer.DrawPolygon(vh, middle2, lineWidth, lineColor);
if (serie.areaStyle.show && Vector3.Dot(middleZero - middle2, middle2 - middle1) >= 0) if (serie.areaStyle.show && Vector3.Dot(middleZero - middle2, middle2 - middle1) >= 0)
{ {
DrawPolygonToZero(vh, middle2 - diff1, middle2 + diff1, axis, zeroPos, areaColor, areaToColor, areaDiff); DrawPolygonToZero(vh, middle2 - diff1, middle2 + diff1, axis, zeroPos, areaColor, areaToColor, areaDiff);
@@ -1181,7 +1181,7 @@ namespace XCharts
} }
else else
{ {
ChartHelper.DrawLine(vh, middle1 + diff2, middle2 + diff2, lineWidth, lineColor); ChartDrawer.DrawLine(vh, middle1 + diff2, middle2 + diff2, lineWidth, lineColor);
} }
//draw middle2 to np //draw middle2 to np
if (Vector3.Distance(middle2, np) > 2 * lineWidth) if (Vector3.Distance(middle2, np) > 2 * lineWidth)
@@ -1192,7 +1192,7 @@ namespace XCharts
{ {
ep = linePointList[i]; ep = linePointList[i];
if (serie.animation.CheckDetailBreak(ep, isYAxis)) return false; if (serie.animation.CheckDetailBreak(ep, isYAxis)) return false;
ChartHelper.DrawLine(vh, sp, ep, lineWidth, lineColor); ChartDrawer.DrawLine(vh, sp, ep, lineWidth, lineColor);
if (serie.areaStyle.show) if (serie.areaStyle.show)
{ {
DrawPolygonToZero(vh, sp, ep, axis, zeroPos, areaColor, areaToColor, areaDiff); DrawPolygonToZero(vh, sp, ep, axis, zeroPos, areaColor, areaToColor, areaDiff);
@@ -1200,7 +1200,7 @@ namespace XCharts
sp = ep; sp = ep;
} }
if (serie.animation.CheckDetailBreak(np, isYAxis)) return false; if (serie.animation.CheckDetailBreak(np, isYAxis)) return false;
ChartHelper.DrawPolygon(vh, np, lineWidth, lineColor); ChartDrawer.DrawPolygon(vh, np, lineWidth, lineColor);
if (serie.areaStyle.show) if (serie.areaStyle.show)
{ {
DrawPolygonToZero(vh, np - diff1, np + diff1, axis, zeroPos, areaColor, areaToColor, areaDiff); DrawPolygonToZero(vh, np - diff1, np + diff1, axis, zeroPos, areaColor, areaToColor, areaDiff);
@@ -1208,7 +1208,7 @@ namespace XCharts
} }
else else
{ {
ChartHelper.DrawLine(vh, middle1 + diff1, middle1 + diff1, lineWidth, lineColor); ChartDrawer.DrawLine(vh, middle1 + diff1, middle1 + diff1, lineWidth, lineColor);
} }
break; break;
case LineType.StepEnd: case LineType.StepEnd:
@@ -1227,7 +1227,7 @@ namespace XCharts
{ {
ep = linePointList[i]; ep = linePointList[i];
if (serie.animation.CheckDetailBreak(ep, isYAxis)) return false; if (serie.animation.CheckDetailBreak(ep, isYAxis)) return false;
ChartHelper.DrawLine(vh, sp, ep, lineWidth, lineColor); ChartDrawer.DrawLine(vh, sp, ep, lineWidth, lineColor);
if (serie.areaStyle.show) if (serie.areaStyle.show)
{ {
DrawPolygonToZero(vh, sp, ep, axis, zeroPos, areaColor, areaToColor, areaDiff); DrawPolygonToZero(vh, sp, ep, axis, zeroPos, areaColor, areaToColor, areaDiff);
@@ -1235,7 +1235,7 @@ namespace XCharts
sp = ep; sp = ep;
} }
if (serie.animation.CheckDetailBreak(middle, isYAxis)) return false; if (serie.animation.CheckDetailBreak(middle, isYAxis)) return false;
ChartHelper.DrawPolygon(vh, middle, lineWidth, lineColor); ChartDrawer.DrawPolygon(vh, middle, lineWidth, lineColor);
if (serie.areaStyle.show && Vector3.Dot(np - middle, middleZero - middle) <= 0) if (serie.areaStyle.show && Vector3.Dot(np - middle, middleZero - middle) <= 0)
{ {
DrawPolygonToZero(vh, middle - diff1, middle + diff1, axis, zeroPos, areaColor, areaToColor, areaDiff); DrawPolygonToZero(vh, middle - diff1, middle + diff1, axis, zeroPos, areaColor, areaToColor, areaDiff);
@@ -1243,8 +1243,8 @@ namespace XCharts
} }
else else
{ {
if (dataIndex == 1) ChartHelper.DrawPolygon(vh, lp, lineWidth, lineColor); if (dataIndex == 1) ChartDrawer.DrawPolygon(vh, lp, lineWidth, lineColor);
ChartHelper.DrawLine(vh, lp + diff1, middle + diff1, lineWidth, lineColor); ChartDrawer.DrawLine(vh, lp + diff1, middle + diff1, lineWidth, lineColor);
} }
if (Vector3.Distance(middle, np) > 2 * lineWidth) if (Vector3.Distance(middle, np) > 2 * lineWidth)
@@ -1254,14 +1254,14 @@ namespace XCharts
for (int i = 1; i < linePointList.Count; i++) for (int i = 1; i < linePointList.Count; i++)
{ {
ep = linePointList[i]; ep = linePointList[i];
ChartHelper.DrawLine(vh, sp, ep, lineWidth, lineColor); ChartDrawer.DrawLine(vh, sp, ep, lineWidth, lineColor);
sp = ep; sp = ep;
} }
if (nnp != np) ChartHelper.DrawPolygon(vh, np, lineWidth, lineColor); if (nnp != np) ChartDrawer.DrawPolygon(vh, np, lineWidth, lineColor);
} }
else else
{ {
ChartHelper.DrawLine(vh, middle + diff2, np + diff2, lineWidth, lineColor); ChartDrawer.DrawLine(vh, middle + diff2, np + diff2, lineWidth, lineColor);
} }
bool flag2 = ((isYAxis && middle.x > np.x && np.x > zeroPos.x) || (!isYAxis && middle.y > np.y && np.y > zeroPos.y)); bool flag2 = ((isYAxis && middle.x > np.x && np.x > zeroPos.x) || (!isYAxis && middle.y > np.y && np.y > zeroPos.y));
if (serie.areaStyle.show && flag2) if (serie.areaStyle.show && flag2)

8
Scripts/UI/PieChart.cs
View File

@@ -175,12 +175,12 @@ namespace XCharts
var offestCenter = new Vector3(center.x + offsetRadius * currSin, var offestCenter = new Vector3(center.x + offsetRadius * currSin,
center.y + offsetRadius * currCos); center.y + offsetRadius * currCos);
ChartHelper.DrawDoughnut(vh, offestCenter, insideRadius, outsideRadius, ChartDrawer.DrawDoughnut(vh, offestCenter, insideRadius, outsideRadius,
startDegree, currDegree, color); startDegree, currDegree, color);
} }
else else
{ {
ChartHelper.DrawDoughnut(vh, center, tempData.insideRadius, outSideRadius, ChartDrawer.DrawDoughnut(vh, center, tempData.insideRadius, outSideRadius,
startDegree, currDegree, color); startDegree, currDegree, color);
} }
serieData.canShowLabel = currDegree >= currAngle; serieData.canShowLabel = currDegree >= currAngle;
@@ -268,8 +268,8 @@ namespace XCharts
pos3 = new Vector2(pos2.x + tx, pos2.y + ty - serie.label.lineWidth); pos3 = new Vector2(pos2.x + tx, pos2.y + ty - serie.label.lineWidth);
} }
var pos4 = new Vector2(currAngle > 180 ? pos3.x - serie.label.lineLength2 : pos3.x + serie.label.lineLength2, pos3.y); var pos4 = new Vector2(currAngle > 180 ? pos3.x - serie.label.lineLength2 : pos3.x + serie.label.lineLength2, pos3.y);
ChartHelper.DrawLine(vh, pos1, pos2, serie.label.lineWidth, color); ChartDrawer.DrawLine(vh, pos1, pos2, serie.label.lineWidth, color);
ChartHelper.DrawLine(vh, pos3, pos4, serie.label.lineWidth, color); ChartDrawer.DrawLine(vh, pos3, pos4, serie.label.lineWidth, color);
} }
} }

20
Scripts/UI/RadarChart.cs
View File

@@ -275,11 +275,11 @@ namespace XCharts
p.y + radius * Mathf.Cos(currAngle)); p.y + radius * Mathf.Cos(currAngle));
if (serie.areaStyle.show) if (serie.areaStyle.show)
{ {
ChartHelper.DrawTriangle(vh, p, startPoint, toPoint, areaColor); ChartDrawer.DrawTriangle(vh, p, startPoint, toPoint, areaColor);
} }
if (serie.lineStyle.show) if (serie.lineStyle.show)
{ {
ChartHelper.DrawLine(vh, startPoint, toPoint, serie.lineStyle.width, lineColor); ChartDrawer.DrawLine(vh, startPoint, toPoint, serie.lineStyle.width, lineColor);
} }
startPoint = toPoint; startPoint = toPoint;
} }
@@ -287,11 +287,11 @@ namespace XCharts
} }
if (serie.areaStyle.show) if (serie.areaStyle.show)
{ {
ChartHelper.DrawTriangle(vh, p, startPoint, firstPoint, areaColor); ChartDrawer.DrawTriangle(vh, p, startPoint, firstPoint, areaColor);
} }
if (serie.lineStyle.show) if (serie.lineStyle.show)
{ {
ChartHelper.DrawLine(vh, startPoint, firstPoint, serie.lineStyle.width, lineColor); ChartDrawer.DrawLine(vh, startPoint, firstPoint, serie.lineStyle.width, lineColor);
} }
if (serie.symbol.type != SerieSymbolType.None ) if (serie.symbol.type != SerieSymbolType.None )
{ {
@@ -336,11 +336,11 @@ namespace XCharts
p.y + insideRadius * Mathf.Cos(currAngle)); p.y + insideRadius * Mathf.Cos(currAngle));
if (radar.splitArea.show) if (radar.splitArea.show)
{ {
ChartHelper.DrawPolygon(vh, p1, p2, p3, p4, color); ChartDrawer.DrawPolygon(vh, p1, p2, p3, p4, color);
} }
if (radar.lineStyle.show) if (radar.lineStyle.show)
{ {
ChartHelper.DrawLine(vh, p2, p3, radar.lineStyle.width, lineColor); ChartDrawer.DrawLine(vh, p2, p3, radar.lineStyle.width, lineColor);
} }
p1 = p4; p1 = p4;
p2 = p3; p2 = p3;
@@ -354,7 +354,7 @@ namespace XCharts
p.y + outsideRadius * Mathf.Cos(currAngle)); p.y + outsideRadius * Mathf.Cos(currAngle));
if (radar.lineStyle.show) if (radar.lineStyle.show)
{ {
ChartHelper.DrawLine(vh, p, p3, radar.lineStyle.width / 2, lineColor); ChartDrawer.DrawLine(vh, p, p3, radar.lineStyle.width / 2, lineColor);
} }
} }
} }
@@ -378,11 +378,11 @@ namespace XCharts
outsideRadius = insideRadius + block; outsideRadius = insideRadius + block;
if (radar.splitArea.show) if (radar.splitArea.show)
{ {
ChartHelper.DrawDoughnut(vh, p, insideRadius, outsideRadius, 0, 360, color); ChartDrawer.DrawDoughnut(vh, p, insideRadius, outsideRadius, 0, 360, color);
} }
if (radar.lineStyle.show) if (radar.lineStyle.show)
{ {
ChartHelper.DrawCicleNotFill(vh, p, outsideRadius, radar.lineStyle.width, lineColor); ChartDrawer.DrawCicleNotFill(vh, p, outsideRadius, radar.lineStyle.width, lineColor);
} }
insideRadius = outsideRadius; insideRadius = outsideRadius;
} }
@@ -393,7 +393,7 @@ namespace XCharts
p.y + outsideRadius * Mathf.Cos(currAngle)); p.y + outsideRadius * Mathf.Cos(currAngle));
if (radar.lineStyle.show) if (radar.lineStyle.show)
{ {
ChartHelper.DrawLine(vh, p, p1, radar.lineStyle.width / 2, lineColor); ChartDrawer.DrawLine(vh, p, p1, radar.lineStyle.width / 2, lineColor);
} }
} }
} }

268
Scripts/UI/Utility/ChartDrawer.cs Normal file
View File

@@ -0,0 +1,268 @@
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{
public static class ChartDrawer
{
public static float CRICLE_SMOOTHNESS = 2f;
private static UIVertex[] vertex = new UIVertex[4];
public static void DrawArrow(VertexHelper vh, Vector3 startPos, Vector3 arrowPos, float width,
float height, float offset, float dent, Color32 color)
{
var dir = (arrowPos - startPos).normalized;
var sharpPos = arrowPos + (offset + height / 2) * dir;
var middle = sharpPos + (dent - height) * dir;
var diff = Vector3.Cross(dir, Vector3.forward).normalized * width / 2;
var left = sharpPos - height * dir + diff;
var right = sharpPos - height * dir - diff;
DrawTriangle(vh, middle, sharpPos, left, color);
DrawTriangle(vh, middle, sharpPos, right, color);
}
public static void DrawLine(VertexHelper vh, Vector3 p1, Vector3 p2, float size, Color32 color)
{
if (p1 == p2) return;
Vector3 v = Vector3.Cross(p2 - p1, Vector3.forward).normalized * size;
vertex[0].position = p1 - v;
vertex[1].position = p2 - v;
vertex[2].position = p2 + v;
vertex[3].position = p1 + v;
for (int j = 0; j < 4; j++)
{
vertex[j].color = color;
vertex[j].uv0 = Vector2.zero;
}
vh.AddUIVertexQuad(vertex);
}
public static void DrawDashLine(VertexHelper vh, Vector3 p1, Vector3 p2, float size, Color32 color,
float dashLen = 15f, float blankLen = 7f)
{
float dist = Vector3.Distance(p1, p2);
if (dist < 0.1f) return;
int segment = Mathf.CeilToInt(dist / (dashLen + blankLen));
Vector3 dir = (p2 - p1).normalized;
Vector3 sp = p1, np;
for (int i = 1; i <= segment; i++)
{
np = p1 + dir * dist * i / segment;
var dashep = np - dir * blankLen;
DrawLine(vh, sp, dashep, size, color);
sp = np;
}
DrawLine(vh, sp, p2, size, color);
}
public static void DrawDotLine(VertexHelper vh, Vector3 p1, Vector3 p2, float size, Color32 color,
float dotLen = 5f, float blankLen = 5f)
{
float dist = Vector3.Distance(p1, p2);
if (dist < 0.1f) return;
int segment = Mathf.CeilToInt(dist / (dotLen + blankLen));
Vector3 dir = (p2 - p1).normalized;
Vector3 sp = p1, np;
for (int i = 1; i <= segment; i++)
{
np = p1 + dir * dist * i / segment;
var dashep = np - dir * blankLen;
DrawLine(vh, sp, dashep, size, color);
sp = np;
}
DrawLine(vh, sp, p2, size, color);
}
public static void DrawDashDotLine(VertexHelper vh, Vector3 p1, Vector3 p2, float size, Color32 color,
float dashLen = 15f, float blankDotLen = 15f)
{
float dist = Vector3.Distance(p1, p2);
if (dist < 0.1f) return;
int segment = Mathf.CeilToInt(dist / (dashLen + blankDotLen));
Vector3 dir = (p2 - p1).normalized;
Vector3 sp = p1, np;
for (int i = 1; i <= segment; i++)
{
np = p1 + dir * dist * i / segment;
var dashep = np - dir * blankDotLen;
DrawLine(vh, sp, dashep, size, color);
var dotsp = dashep + (blankDotLen - 2 * size) / 2 * dir;
var dotep = dotsp + 2 * size * dir;
DrawLine(vh, dotsp, dotep, size, color);
sp = np;
}
DrawLine(vh, sp, p2, size, color);
}
public static void DrawDashDotDotLine(VertexHelper vh, Vector3 p1, Vector3 p2, float size,
Color32 color, float dashLen = 15f, float blankDotLen = 20f)
{
float dist = Vector3.Distance(p1, p2);
if (dist < 0.1f) return;
int segment = Mathf.CeilToInt(dist / (dashLen + blankDotLen));
Vector3 dir = (p2 - p1).normalized;
Vector3 sp = p1, np;
for (int i = 1; i <= segment; i++)
{
np = p1 + dir * dist * i / segment;
var dashep = np - dir * blankDotLen;
DrawLine(vh, sp, dashep, size, color);
var dotsp = dashep + (blankDotLen / 2 - 2 * size) / 2 * dir;
var dotep = dotsp + 2 * size * dir;
DrawLine(vh, dotsp, dotep, size, color);
var dotsp2 = dashep + blankDotLen / 2 * dir;
dotsp2 = dotsp2 + (blankDotLen / 4 - 2 * size) / 2 * dir;
var dotep2 = dotsp2 + 2 * size * dir;
DrawLine(vh, dotsp2, dotep2, size, color);
sp = np;
}
DrawLine(vh, sp, p2, size, color);
}
public static void DrawPolygon(VertexHelper vh, Vector3 p, float size, Color32 color)
{
Vector3 p1 = new Vector3(p.x - size, p.y - size);
Vector3 p2 = new Vector3(p.x + size, p.y - size);
Vector3 p3 = new Vector3(p.x + size, p.y + size);
Vector3 p4 = new Vector3(p.x - size, p.y + size);
DrawPolygon(vh, p1, p2, p3, p4, color, color);
}
public static void DrawPolygon(VertexHelper vh, Vector3 p1, Vector3 p2, Vector3 p3, Vector3 p4,
Color32 color)
{
DrawPolygon(vh, p1, p2, p3, p4, color, color);
}
public static void DrawPolygon(VertexHelper vh, Vector3 p1, Vector3 p2, Vector3 p3, Vector3 p4,
Color32 startColor, Color32 toColor)
{
vertex[0].position = p1;
vertex[1].position = p2;
vertex[2].position = p3;
vertex[3].position = p4;
for (int j = 0; j < 4; j++)
{
vertex[j].color = j >= 2 ? toColor : startColor;
vertex[j].uv0 = Vector2.zero;
}
vh.AddUIVertexQuad(vertex);
}
public static void DrawTriangle(VertexHelper vh, Vector3 p1,
Vector3 p2, Vector3 p3, Color32 color)
{
DrawTriangle(vh, p1, p2, p3, color, color, color);
}
public static void DrawTriangle(VertexHelper vh, Vector3 p1,
Vector3 p2, Vector3 p3, Color32 color, Color32 color2, Color32 color3)
{
UIVertex v1 = new UIVertex();
v1.position = p1;
v1.color = color;
v1.uv0 = Vector3.zero;
UIVertex v2 = new UIVertex();
v2.position = p2;
v2.color = color2;
v2.uv0 = Vector3.zero;
UIVertex v3 = new UIVertex();
v3.position = p3;
v3.color = color3;
v3.uv0 = Vector3.zero;
int startIndex = vh.currentVertCount;
vh.AddVert(v1);
vh.AddVert(v2);
vh.AddVert(v3);
vh.AddTriangle(startIndex, startIndex + 1, startIndex + 2);
}
public static void DrawCricle(VertexHelper vh, Vector3 p, float radius, Color32 color,
int segments = 0)
{
if (segments <= 0)
{
segments = (int)((2 * Mathf.PI * radius) / CRICLE_SMOOTHNESS);
}
if (segments < 3) segments = 3;
DrawSector(vh, p, radius, color, 0, 360, segments);
}
public static void DrawCicleNotFill(VertexHelper vh, Vector3 p, float radius, float tickness,
Color32 color, int segments = 0)
{
if (segments <= 0)
{
segments = (int)((2 * Mathf.PI * radius) / CRICLE_SMOOTHNESS);
}
float startDegree = 0, toDegree = 360;
Vector3 p2, p3;
float startAngle = startDegree * Mathf.Deg2Rad;
float angle = (toDegree - startDegree) * Mathf.Deg2Rad / segments;
p2 = new Vector3(p.x + radius * Mathf.Sin(startAngle), p.y + radius * Mathf.Cos(startAngle));
for (int i = 0; i <= segments; i++)
{
float currAngle = startAngle + i * angle;
p3 = new Vector3(p.x + radius * Mathf.Sin(currAngle), p.y + radius * Mathf.Cos(currAngle));
DrawLine(vh, p2, p3, tickness, color);
p2 = p3;
}
}
public static void DrawSector(VertexHelper vh, Vector3 p, float radius, Color32 color,
float startDegree, float toDegree, int segments = 0)
{
if (segments <= 0)
{
segments = (int)((2 * Mathf.PI * radius) / CRICLE_SMOOTHNESS);
}
Vector3 p2, p3;
float startAngle = startDegree * Mathf.Deg2Rad;
float angle = (toDegree - startDegree) * Mathf.Deg2Rad / segments;
p2 = new Vector3(p.x + radius * Mathf.Sin(startAngle), p.y + radius * Mathf.Cos(startAngle));
for (int i = 0; i <= segments; i++)
{
float currAngle = startAngle + i * angle;
p3 = new Vector3(p.x + radius * Mathf.Sin(currAngle),
p.y + radius * Mathf.Cos(currAngle));
DrawTriangle(vh, p, p2, p3, color);
p2 = p3;
}
}
public static void DrawDoughnut(VertexHelper vh, Vector3 p, float insideRadius, float outsideRadius,
float startDegree, float toDegree, Color32 color, int segments = 0)
{
if (insideRadius <= 0)
{
DrawSector(vh, p, outsideRadius, color, startDegree, toDegree, segments);
return;
}
if (segments <= 0)
{
segments = (int)((2 * Mathf.PI * outsideRadius) / CRICLE_SMOOTHNESS);
}
Vector3 p1, p2, p3, p4;
float startAngle = startDegree * Mathf.Deg2Rad;
float angle = (toDegree - startDegree) * Mathf.Deg2Rad / segments;
p1 = new Vector3(p.x + insideRadius * Mathf.Sin(startAngle),
p.y + insideRadius * Mathf.Cos(startAngle));
p2 = new Vector3(p.x + outsideRadius * Mathf.Sin(startAngle),
p.y + outsideRadius * Mathf.Cos(startAngle));
for (int i = 0; i <= segments; i++)
{
float currAngle = startAngle + i * angle;
p3 = new Vector3(p.x + outsideRadius * Mathf.Sin(currAngle),
p.y + outsideRadius * Mathf.Cos(currAngle));
p4 = new Vector3(p.x + insideRadius * Mathf.Sin(currAngle),
p.y + insideRadius * Mathf.Cos(currAngle));
DrawPolygon(vh, p1, p2, p3, p4, color);
p1 = p4;
p2 = p3;
}
}
}
}

11
Scripts/UI/Utility/ChartDrawer.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5cad3b43e9b364dc5981eca5b85e75c9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

254
Scripts/UI/Utility/ChartHelper.cs
View File

@@ -8,13 +8,10 @@ using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {
public static class ChartHelper internal static class ChartHelper
{ {
public static float CRICLE_SMOOTHNESS = 2f;
private static UIVertex[] vertex = new UIVertex[4];
private static StringBuilder s_Builder = new StringBuilder(); private static StringBuilder s_Builder = new StringBuilder();
public static string Cancat(string str1, string str2) public static string Cancat(string str1, string str2)
{ {
s_Builder.Length = 0; s_Builder.Length = 0;
@@ -239,255 +236,6 @@ namespace XCharts
return labelObj; return labelObj;
} }
public static void DrawArrow(VertexHelper vh, Vector3 startPos, Vector3 arrowPos, float width,
float height, float offset, float dent, Color32 color)
{
var dir = (arrowPos - startPos).normalized;
var sharpPos = arrowPos + (offset + height / 2) * dir;
var middle = sharpPos + (dent - height) * dir;
var diff = Vector3.Cross(dir, Vector3.forward).normalized * width / 2;
var left = sharpPos - height * dir + diff;
var right = sharpPos - height * dir - diff;
ChartHelper.DrawTriangle(vh, middle, sharpPos, left, color);
ChartHelper.DrawTriangle(vh, middle, sharpPos, right, color);
}
public static void DrawLine(VertexHelper vh, Vector3 p1, Vector3 p2, float size, Color32 color)
{
if (p1 == p2) return;
Vector3 v = Vector3.Cross(p2 - p1, Vector3.forward).normalized * size;
vertex[0].position = p1 - v;
vertex[1].position = p2 - v;
vertex[2].position = p2 + v;
vertex[3].position = p1 + v;
for (int j = 0; j < 4; j++)
{
vertex[j].color = color;
vertex[j].uv0 = Vector2.zero;
}
vh.AddUIVertexQuad(vertex);
}
public static void DrawDashLine(VertexHelper vh, Vector3 p1, Vector3 p2, float size, Color32 color, float dashLen = 15f, float blankLen = 7f)
{
float dist = Vector3.Distance(p1, p2);
if (dist < 0.1f) return;
int segment = Mathf.CeilToInt(dist / (dashLen + blankLen));
Vector3 dir = (p2 - p1).normalized;
Vector3 sp = p1, np;
for (int i = 1; i <= segment; i++)
{
np = p1 + dir * dist * i / segment;
var dashep = np - dir * blankLen;
DrawLine(vh, sp, dashep, size, color);
sp = np;
}
DrawLine(vh, sp, p2, size, color);
}
public static void DrawDotLine(VertexHelper vh, Vector3 p1, Vector3 p2, float size, Color32 color, float dotLen = 5f, float blankLen = 5f)
{
float dist = Vector3.Distance(p1, p2);
if (dist < 0.1f) return;
int segment = Mathf.CeilToInt(dist / (dotLen + blankLen));
Vector3 dir = (p2 - p1).normalized;
Vector3 sp = p1, np;
for (int i = 1; i <= segment; i++)
{
np = p1 + dir * dist * i / segment;
var dashep = np - dir * blankLen;
DrawLine(vh, sp, dashep, size, color);
sp = np;
}
DrawLine(vh, sp, p2, size, color);
}
public static void DrawDashDotLine(VertexHelper vh, Vector3 p1, Vector3 p2, float size, Color32 color, float dashLen = 15f, float blankDotLen = 15f)
{
float dist = Vector3.Distance(p1, p2);
if (dist < 0.1f) return;
int segment = Mathf.CeilToInt(dist / (dashLen + blankDotLen));
Vector3 dir = (p2 - p1).normalized;
Vector3 sp = p1, np;
for (int i = 1; i <= segment; i++)
{
np = p1 + dir * dist * i / segment;
var dashep = np - dir * blankDotLen;
DrawLine(vh, sp, dashep, size, color);
var dotsp = dashep + (blankDotLen - 2 * size) / 2 * dir;
var dotep = dotsp + 2 * size * dir;
DrawLine(vh, dotsp, dotep, size, color);
sp = np;
}
DrawLine(vh, sp, p2, size, color);
}
public static void DrawDashDotDotLine(VertexHelper vh, Vector3 p1, Vector3 p2, float size, Color32 color, float dashLen = 15f, float blankDotLen = 20f)
{
float dist = Vector3.Distance(p1, p2);
if (dist < 0.1f) return;
int segment = Mathf.CeilToInt(dist / (dashLen + blankDotLen));
Vector3 dir = (p2 - p1).normalized;
Vector3 sp = p1, np;
for (int i = 1; i <= segment; i++)
{
np = p1 + dir * dist * i / segment;
var dashep = np - dir * blankDotLen;
DrawLine(vh, sp, dashep, size, color);
var dotsp = dashep + (blankDotLen / 2 - 2 * size) / 2 * dir;
var dotep = dotsp + 2 * size * dir;
DrawLine(vh, dotsp, dotep, size, color);
var dotsp2 = dashep + blankDotLen / 2 * dir;
dotsp2 = dotsp2 + (blankDotLen / 4 - 2 * size) / 2 * dir;
var dotep2 = dotsp2 + 2 * size * dir;
DrawLine(vh, dotsp2, dotep2, size, color);
sp = np;
}
DrawLine(vh, sp, p2, size, color);
}
public static void DrawPolygon(VertexHelper vh, Vector3 p, float size, Color32 color)
{
Vector3 p1 = new Vector3(p.x - size, p.y - size);
Vector3 p2 = new Vector3(p.x + size, p.y - size);
Vector3 p3 = new Vector3(p.x + size, p.y + size);
Vector3 p4 = new Vector3(p.x - size, p.y + size);
DrawPolygon(vh, p1, p2, p3, p4, color, color);
}
public static void DrawPolygon(VertexHelper vh, Vector3 p1, Vector3 p2, Vector3 p3, Vector3 p4,
Color32 color)
{
DrawPolygon(vh, p1, p2, p3, p4, color, color);
}
public static void DrawPolygon(VertexHelper vh, Vector3 p1, Vector3 p2, Vector3 p3, Vector3 p4,
Color32 startColor, Color32 toColor)
{
vertex[0].position = p1;
vertex[1].position = p2;
vertex[2].position = p3;
vertex[3].position = p4;
for (int j = 0; j < 4; j++)
{
vertex[j].color = j >= 2 ? toColor : startColor;
vertex[j].uv0 = Vector2.zero;
}
vh.AddUIVertexQuad(vertex);
}
public static void DrawTriangle(VertexHelper vh, Vector3 p1,
Vector3 p2, Vector3 p3, Color32 color)
{
DrawTriangle(vh, p1, p2, p3, color, color, color);
}
public static void DrawTriangle(VertexHelper vh, Vector3 p1,
Vector3 p2, Vector3 p3, Color32 color, Color32 color2, Color32 color3)
{
UIVertex v1 = new UIVertex();
v1.position = p1;
v1.color = color;
v1.uv0 = Vector3.zero;
UIVertex v2 = new UIVertex();
v2.position = p2;
v2.color = color2;
v2.uv0 = Vector3.zero;
UIVertex v3 = new UIVertex();
v3.position = p3;
v3.color = color3;
v3.uv0 = Vector3.zero;
int startIndex = vh.currentVertCount;
vh.AddVert(v1);
vh.AddVert(v2);
vh.AddVert(v3);
vh.AddTriangle(startIndex, startIndex + 1, startIndex + 2);
}
public static void DrawCricle(VertexHelper vh, Vector3 p, float radius, Color32 color, int segments = 0)
{
if (segments <= 0)
{
segments = (int)((2 * Mathf.PI * radius) / CRICLE_SMOOTHNESS);
}
if (segments < 3) segments = 3;
DrawSector(vh, p, radius, color, 0, 360, segments);
}
public static void DrawCicleNotFill(VertexHelper vh, Vector3 p, float radius, float tickness,
Color32 color, int segments = 0)
{
if (segments <= 0)
{
segments = (int)((2 * Mathf.PI * radius) / CRICLE_SMOOTHNESS);
}
float startDegree = 0, toDegree = 360;
Vector3 p2, p3;
float startAngle = startDegree * Mathf.Deg2Rad;
float angle = (toDegree - startDegree) * Mathf.Deg2Rad / segments;
p2 = new Vector3(p.x + radius * Mathf.Sin(startAngle), p.y + radius * Mathf.Cos(startAngle));
for (int i = 0; i <= segments; i++)
{
float currAngle = startAngle + i * angle;
p3 = new Vector3(p.x + radius * Mathf.Sin(currAngle), p.y + radius * Mathf.Cos(currAngle));
DrawLine(vh, p2, p3, tickness, color);
p2 = p3;
}
}
public static void DrawSector(VertexHelper vh, Vector3 p, float radius, Color32 color,
float startDegree, float toDegree, int segments = 0)
{
if (segments <= 0)
{
segments = (int)((2 * Mathf.PI * radius) / CRICLE_SMOOTHNESS);
}
Vector3 p2, p3;
float startAngle = startDegree * Mathf.Deg2Rad;
float angle = (toDegree - startDegree) * Mathf.Deg2Rad / segments;
p2 = new Vector3(p.x + radius * Mathf.Sin(startAngle), p.y + radius * Mathf.Cos(startAngle));
for (int i = 0; i <= segments; i++)
{
float currAngle = startAngle + i * angle;
p3 = new Vector3(p.x + radius * Mathf.Sin(currAngle),
p.y + radius * Mathf.Cos(currAngle));
DrawTriangle(vh, p, p2, p3, color);
p2 = p3;
}
}
public static void DrawDoughnut(VertexHelper vh, Vector3 p, float insideRadius, float outsideRadius,
float startDegree, float toDegree, Color32 color, int segments = 0)
{
if (insideRadius <= 0)
{
DrawSector(vh, p, outsideRadius, color, startDegree, toDegree, segments);
return;
}
if (segments <= 0)
{
segments = (int)((2 * Mathf.PI * outsideRadius) / CRICLE_SMOOTHNESS);
}
Vector3 p1, p2, p3, p4;
float startAngle = startDegree * Mathf.Deg2Rad;
float angle = (toDegree - startDegree) * Mathf.Deg2Rad / segments;
p1 = new Vector3(p.x + insideRadius * Mathf.Sin(startAngle),
p.y + insideRadius * Mathf.Cos(startAngle));
p2 = new Vector3(p.x + outsideRadius * Mathf.Sin(startAngle),
p.y + outsideRadius * Mathf.Cos(startAngle));
for (int i = 0; i <= segments; i++)
{
float currAngle = startAngle + i * angle;
p3 = new Vector3(p.x + outsideRadius * Mathf.Sin(currAngle),
p.y + outsideRadius * Mathf.Cos(currAngle));
p4 = new Vector3(p.x + insideRadius * Mathf.Sin(currAngle),
p.y + insideRadius * Mathf.Cos(currAngle));
DrawPolygon(vh, p1, p2, p3, p4, color);
p1 = p4;
p2 = p3;
}
}
public static void GetPointList(ref List<Vector3> posList, Vector3 sp, Vector3 ep, float k = 30f) public static void GetPointList(ref List<Vector3> posList, Vector3 sp, Vector3 ep, float k = 30f)
{ {