Skip to content

Add ability to straighten bezier curves #1056

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add ability to straighten bezier curves #1056

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions ts/connector-bezier/bezier-connector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ export class BezierConnector extends AbstractBezierConnector {

majorAnchor:number
minorAnchor:number
straightMargin:number

constructor(public connection:Connection, params:BezierOptions) {
super(connection, params)
params = params || {}
this.majorAnchor = params.curviness || 150
this.minorAnchor = 10
this.straightMargin = params.margin || null
}

getCurviness ():number {
Expand All @@ -38,29 +40,29 @@ export class BezierConnector extends AbstractBezierConnector {

if (!perpendicular) {
if (soo[0] === 0) {
p.x = (sourceAnchorPosition.curX < targetAnchorPosition.curX ? point.x + this.minorAnchor : point.x - this.minorAnchor)
p.x = this._computeMinorPoint(sourceAnchorPosition.curX, targetAnchorPosition.curX, point.x)
}
else {
p.x = (point.x - (this.majorAnchor * soo[0]))
}

if (soo[1] === 0) {
p.y = (sourceAnchorPosition.curY < targetAnchorPosition.curY ? point.y + this.minorAnchor : point.y - this.minorAnchor)
p.y = this._computeMinorPoint(sourceAnchorPosition.curY, targetAnchorPosition.curY, point.y)
}
else {
p.y = (point.y + (this.majorAnchor * too[1]))
}
}
else {
if (too[0] === 0) {
p.x = (targetAnchorPosition.curX < sourceAnchorPosition.curX ? point.x + this.minorAnchor : point.x - this.minorAnchor)
p.x = this._computeMinorPoint(targetAnchorPosition.curX, sourceAnchorPosition.curX, point.x)
}
else {
p.x = (point.x + (this.majorAnchor * too[0]))
}

if (too[1] === 0) {
p.y = (targetAnchorPosition.curY < sourceAnchorPosition.curY ? point.y + this.minorAnchor : point.y - this.minorAnchor)
p.y = this._computeMinorPoint(targetAnchorPosition.curY, sourceAnchorPosition.curY, point.y)
}
else {
p.y = (point.y + (this.majorAnchor * soo[1]))
Expand All @@ -70,6 +72,15 @@ export class BezierConnector extends AbstractBezierConnector {
return p
}

_computeMinorPoint (sourcePosition:number, targetPosition :number, pointPosition:number):number {
// if the two points are very close to each other, don't offset the control point
if (this.straightMargin && Math.abs(sourcePosition - targetPosition) < this.straightMargin) {
return pointPosition
}

return sourcePosition < targetPosition ? pointPosition + this.minorAnchor : pointPosition - this.minorAnchor
}

_computeBezier (paintInfo:PaintGeometry, p:ConnectorComputeParams, sp:AnchorPlacement, tp:AnchorPlacement, _w:number, _h:number):void {

let _CP, _CP2,
Expand Down