Backup_Repos/jsketcher
1
0
Fork 0
mirror of https://github.com/xibyte/jsketcher synced 2025-12-15 21:05:22 +01:00
Code Issues Projects Releases Wiki Activity

fix arc picking

Browse source
This commit is contained in:
Val Erastov 2016-05-26 22:23:48 -07:00
parent 3a6b3b08aa
commit 1c4135578d
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
web/app/sketcher/shapes/arc.js
View file

@ -81,11 +81,31 @@ TCAD.TWO.Arc.prototype.drawImpl = function(ctx, scale) {
}
};
TCAD.TWO.Arc.prototype.normalDistance = function(aim) {
var aimAngle = Math.atan2(this.c.y - aim.y, this.c.x - aim.x);
if (aimAngle <= this.getStartAngle() && aimAngle >= this.getEndAngle()) {
return Math.abs(TCAD.math.distance(aim.x, aim.y, this.c.x, this.c.y) - this.radiusForDrawing());
var ca = new TCAD.Vector(this.a.x - this.c.x, this.a.y - this.c.y);
var cb = new TCAD.Vector(this.b.x - this.c.x, this.b.y - this.c.y);
var ct = new TCAD.Vector(aim.x - this.c.x, aim.y - this.c.y);
ca._normalize();
cb._normalize();
ct._normalize();
var cosAB = ca.dot(cb);
var cosAT = ca.dot(ct);
var isInside = cosAT >= cosAB;
var abInverse = ca.cross(cb).z < 0;
var atInverse = ca.cross(ct).z < 0;
var result;
if (abInverse) {
result = !atInverse || !isInside;
} else {
result = !atInverse && isInside;
}
if (result) {
return Math.abs(TCAD.math.distance(aim.x, aim.y, this.c.x, this.c.y) - this.radiusForDrawing());
} else {
return Math.min(
TCAD.math.distance(aim.x, aim.y, this.a.x, this.a.y),