Backup_Repos/jsketcher
1
0
Fork 0
mirror of https://github.com/xibyte/jsketcher synced 2025-12-08 01:13:27 +01:00
Code Issues Projects Releases Wiki Activity

fix fillet

Browse source
This commit is contained in:
Val Erastov (xibyte) 2020-03-03 00:41:52 -08:00
parent da18f09402
commit d022e12e96
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web/app/sketcher/constr/ANConstraints.js
View file

@ -320,7 +320,7 @@ export const ConstraintDefinitions = {
const a1 = segment1.params.ang.get();
const a2 = segment2.params.ang.get();
const ang = makeAngle0_360(a2 - a1);
return Math.abs(180 - ang) > Math.min(Math.abs(360 - ang), Math.abs(0 - ang)) ? 0 : 180;
return Math.abs(180 - ang) > Math.min(Math.abs(360 - ang), Math.abs(0 - ang)) ? 180 : 0;
},
transform: degree => degree * DEG_RAD
}

4
web/app/sketcher/tools/fillet.js
View file

@ -69,8 +69,8 @@ export class FilletTool extends Tool {
const s1 = point1.parent;
const s2 = point2.parent;
const inverted1 = Math.cos(s1.ang) * arc.c.x + Math.sin(s1.ang) * arc.c.y < s1.w;
const inverted2 = Math.cos(s2.ang) * arc.c.x + Math.sin(s2.ang) * arc.c.y < s2.w;
const inverted1 = s1.nx * arc.c.x + s1.ny * arc.c.y < s1.w;
const inverted2 = s2.nx * arc.c.x + s2.ny * arc.c.y < s2.w;
arc.stabilize(this.viewer);
pm.add(new AlgNumConstraint(ConstraintDefinitions.Fillet, [point1.parent, point2.parent, arc], {