Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix-11739: apply continuity line trail for effectline #11893

Merged
merged 3 commits into from
Jan 6, 2020
Merged

fix-11739: apply continuity line trail for effectline #11893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a3e581
fix-11739: apply continuity line trail for effectline
alex2wong Dec 22, 2019
2037a23
Merge branch 'master' into fix-11739
alex2wong Dec 23, 2019
8bd5c44
fix-11739 simplify logic, enhance behavior at first position in each …
alex2wong Dec 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion src/chart/helper/EffectLine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ effectLineProto._updateEffectSymbol = function (lineData, idx) {
symbol.attr('scale', size);

this._symbolType = symbolType;
this._symbolScale = size;

this._updateEffectAnimation(lineData, effectModel, idx);
};
Expand Down Expand Up @@ -177,6 +178,7 @@ effectLineProto.updateSymbolPosition = function (symbol) {
var cp1 = symbol.__cp1;
var t = symbol.__t;
var pos = symbol.position;
var lastPos = [pos[0], pos[1]];
var quadraticAt = curveUtil.quadraticAt;
var quadraticDerivativeAt = curveUtil.quadraticDerivativeAt;
pos[0] = quadraticAt(p1[0], cp1[0], p2[0], t);
Expand All @@ -187,7 +189,27 @@ effectLineProto.updateSymbolPosition = function (symbol) {
var ty = quadraticDerivativeAt(p1[1], cp1[1], p2[1], t);

symbol.rotation = -Math.atan2(ty, tx) - Math.PI / 2;

// enable continuity trail for 'line', 'rect', 'roundRect' symbolType
if (this._symbolType === 'line' || this._symbolType === 'rect' || this._symbolType === 'roundRect') {
if (symbol.__lastT !== undefined && symbol.__lastT < symbol.__t) {
var scaleY = vec2.dist(lastPos, pos) * 1.05;
symbol.attr('scale', [symbol.scale[0], scaleY]);
// make sure the last segment render within endPoint
if (t === 1) {
pos[0] = lastPos[0] + (pos[0] - lastPos[0]) / 2;
pos[1] = lastPos[1] + (pos[1] - lastPos[1]) / 2;
}
alex2wong marked this conversation as resolved.
Show resolved Hide resolved
}
else if (symbol.__lastT === 1) {
// After first loop, symbol.__t does NOT start with 0, so connect p1 to pos directly.
var scaleY = 2 * vec2.dist(p1, pos);
symbol.attr('scale', [symbol.scale[0], scaleY ]);
}
else {
symbol.attr('scale', this._symbolScale);
}
}
symbol.__lastT = symbol.__t;
symbol.ignore = false;
};

Expand Down
5 changes: 3 additions & 2 deletions test/geo-lines.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,10 @@
zlevel: 1,
effect: {
show: true,
period: 6,
period: 1,
trailLength: 0.7,
color: '#fff',
symbol: 'line',
symbolSize: 3
},
lineStyle: {
Expand All @@ -254,7 +255,7 @@
symbolSize: 10,
effect: {
show: true,
period: 6,
period: 1,
trailLength: 0,
symbol: planePath,
symbolSize: 15
Expand Down