From 720577c4d7e2c1b209ea616e793ac8827b72d6bd Mon Sep 17 00:00:00 2001 From: "Val Erastov (xibyte)" Date: Sun, 19 Jul 2020 22:40:38 -0700 Subject: [PATCH] move euclidean to geom --- modules/geom/curves/frenetFrame.js | 2 +- modules/{math => geom}/euclidean.ts | 2 +- modules/scene/objects/meshLine.js | 2 +- web/app/brep/brep-enclose.js | 2 +- web/app/brep/operations/evolve-face.js | 2 +- web/app/brep/topo/loop.ts | 2 +- web/app/brep/utils/pickPointInPolygon.js | 2 +- web/app/cad/assembly/dof/EEDOF.ts | 2 +- web/app/cad/cad-utils.js | 2 +- web/app/cad/legacy/mesh/workbench.js | 2 +- web/app/cad/scene/wrappers/brepSceneObject.js | 2 +- web/app/cad/sketch/sketchBoundaries.js | 2 +- web/app/cad/sketch/sketchModel.js | 2 +- web/app/cad/tess/nested-loops.js | 2 +- web/app/sketcher/shapes/bezier-curve.js | 2 +- web/app/sketcher/shapes/dim.js | 2 +- web/app/sketcher/shapes/textHelper.js | 2 +- web/app/sketcher/tools/bezier-curve.js | 2 +- web/app/sketcher/tools/offset.js | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) rename modules/{math => geom}/euclidean.ts (99%) diff --git a/modules/geom/curves/frenetFrame.js b/modules/geom/curves/frenetFrame.js index 9dbdd7c6..a4bdbda6 100644 --- a/modules/geom/curves/frenetFrame.js +++ b/modules/geom/curves/frenetFrame.js @@ -1,5 +1,5 @@ import * as vec from 'math/vec'; -import {perpendicularVector} from "../../math/euclidean"; +import {perpendicularVector} from "../euclidean"; export function frenetFrame(D1, D2) { let T = vec.normalize(D1); diff --git a/modules/math/euclidean.ts b/modules/geom/euclidean.ts similarity index 99% rename from modules/math/euclidean.ts rename to modules/geom/euclidean.ts index 21c6984c..6c435164 100644 --- a/modules/math/euclidean.ts +++ b/modules/geom/euclidean.ts @@ -1,4 +1,4 @@ -import BBox from "./bbox"; +import BBox from "../math/bbox"; import {TOLERANCE} from "math/equality"; import * as vec from "math/vec"; diff --git a/modules/scene/objects/meshLine.js b/modules/scene/objects/meshLine.js index 326cf128..8f4cf6d4 100644 --- a/modules/scene/objects/meshLine.js +++ b/modules/scene/objects/meshLine.js @@ -1,6 +1,6 @@ import * as vec from 'math/vec'; import {Face3, Geometry, Vector3} from 'three'; -import {perpendicularVector} from "../../math/euclidean"; +import {perpendicularVector} from "../../geom/euclidean"; export function createMeshLineGeometry(points, width) { const vThree = arr => new Vector3().fromArray(arr); diff --git a/web/app/brep/brep-enclose.js b/web/app/brep/brep-enclose.js index f771cea8..5202abdd 100644 --- a/web/app/brep/brep-enclose.js +++ b/web/app/brep/brep-enclose.js @@ -9,7 +9,7 @@ import NurbsSurface from '../../../modules/geom/surfaces/nurbsSurface'; import {BrepSurface} from '../../../modules/geom/surfaces/brepSurface'; import {Matrix3x4} from 'math/matrix'; import {BasisForPlane} from "math/basis"; -import {isCCW as isCCWtest} from "math/euclidean"; +import {isCCW as isCCWtest} from "geom/euclidean"; function isCCW(points, normal) { const tr2d = new Matrix3x4().setBasis(BasisForPlane(normal)).invert(); diff --git a/web/app/brep/operations/evolve-face.js b/web/app/brep/operations/evolve-face.js index e895325a..e35bee4e 100644 --- a/web/app/brep/operations/evolve-face.js +++ b/web/app/brep/operations/evolve-face.js @@ -2,7 +2,7 @@ import {Face} from '../topo/face'; import {Vertex} from '../topo/vertex'; import Vector from 'math/vector'; import PIP from '../../cad/tess/pip'; -import {isCCW} from "../../../../modules/math/euclidean"; +import {isCCW} from "../../../../modules/geom/euclidean"; export function evolveFace(originFace, loops) { let out = []; diff --git a/web/app/brep/topo/loop.ts b/web/app/brep/topo/loop.ts index ecb9d174..b7ce8673 100644 --- a/web/app/brep/topo/loop.ts +++ b/web/app/brep/topo/loop.ts @@ -2,7 +2,7 @@ import {TopoObject} from './topo-object' import {Face} from "./face"; import {BrepSurface} from "../../../../modules/geom/surfaces/brepSurface"; import {HalfEdge} from "./edge"; -import {findLowestLeftPoint} from "math/euclidean"; +import {findLowestLeftPoint} from "geom/euclidean"; export class Loop extends TopoObject { diff --git a/web/app/brep/utils/pickPointInPolygon.js b/web/app/brep/utils/pickPointInPolygon.js index 14cbd7b5..abde8c5d 100644 --- a/web/app/brep/utils/pickPointInPolygon.js +++ b/web/app/brep/utils/pickPointInPolygon.js @@ -1,5 +1,5 @@ import libtess from 'libtess' -import {area} from "../../../../modules/math/euclidean"; +import {area} from "../../../../modules/geom/euclidean"; export default function pickPointInside2dPolygon(polygon) { function vertexCallback(data, tr) { diff --git a/web/app/cad/assembly/dof/EEDOF.ts b/web/app/cad/assembly/dof/EEDOF.ts index a7567eec..c22b769b 100644 --- a/web/app/cad/assembly/dof/EEDOF.ts +++ b/web/app/cad/assembly/dof/EEDOF.ts @@ -8,7 +8,7 @@ import {PPEEDOF} from "./PPEEDOF"; import {EEEEDOF} from "./EEEEDOF"; import {Matrix3x4} from "math/matrix"; import {areEqual} from "math/equality"; -import {lineLineIntersection} from "math/euclidean"; +import {lineLineIntersection} from "geom/euclidean"; const ANGULAR_ALLOWANCE = 10 * DEG_RAD; diff --git a/web/app/cad/cad-utils.js b/web/app/cad/cad-utils.js index 42f583b1..ccd47c2e 100644 --- a/web/app/cad/cad-utils.js +++ b/web/app/cad/cad-utils.js @@ -3,7 +3,7 @@ import BBox from 'math/bbox' import {MeshSceneSolid} from './scene/wrappers/meshSceneObject' import {Matrix3x4} from 'math/matrix'; import {equal} from 'math/equality'; -import {area, isCCW, isPointInsidePolygon} from "math/euclidean"; +import {area, isCCW, isPointInsidePolygon} from "geom/euclidean"; export {area, isCCW, isPointInsidePolygon}; diff --git a/web/app/cad/legacy/mesh/workbench.js b/web/app/cad/legacy/mesh/workbench.js index dc703182..417254f1 100644 --- a/web/app/cad/legacy/mesh/workbench.js +++ b/web/app/cad/legacy/mesh/workbench.js @@ -6,7 +6,7 @@ import revolve from './revolve' import {Triangulate} from '../../tess/triangulation' import {distanceAB3} from "../../../../../modules/math/distance"; import {areEqual, equal, strictEqual} from "../../../../../modules/math/equality"; -import {isPointInsidePolygon} from "../../../../../modules/math/euclidean"; +import {isPointInsidePolygon} from "../../../../../modules/geom/euclidean"; export function sortPolygons(polygons) { function Loop(polygon) { diff --git a/web/app/cad/scene/wrappers/brepSceneObject.js b/web/app/cad/scene/wrappers/brepSceneObject.js index b8630f57..f85e5309 100644 --- a/web/app/cad/scene/wrappers/brepSceneObject.js +++ b/web/app/cad/scene/wrappers/brepSceneObject.js @@ -4,7 +4,7 @@ import brepTess from '../../tess/brep-tess'; import tessellateSurface from '../../../../../modules/geom/surfaces/surfaceTess'; import {setAttribute} from '../../../../../modules/scene/objectData'; import * as vec from 'math/vec'; -import {perpendicularVector} from "math/euclidean"; +import {perpendicularVector} from "geom/euclidean"; const SMOOTH_RENDERING = true; diff --git a/web/app/cad/sketch/sketchBoundaries.js b/web/app/cad/sketch/sketchBoundaries.js index e641cf0d..a4a632c8 100644 --- a/web/app/cad/sketch/sketchBoundaries.js +++ b/web/app/cad/sketch/sketchBoundaries.js @@ -5,7 +5,7 @@ import {veqXYZ} from '../../../../modules/geom/tolerance'; import curveTess, {curveTessParams} from '../../../../modules/geom/impl/curve/curve-tess'; import {distanceAB} from "math/distance"; import {areEqual, TOLERANCE} from "math/equality"; -import {circleFromPoints, radiusOfCurvature} from "../../../../modules/math/euclidean"; +import {circleFromPoints, radiusOfCurvature} from "../../../../modules/geom/euclidean"; export function getSketchBoundaries(sceneFace) { const boundary = {lines: [], arcs: [], circles: [], nurbses: []}; diff --git a/web/app/cad/sketch/sketchModel.js b/web/app/cad/sketch/sketchModel.js index 2fe00caa..d3a1d2b1 100644 --- a/web/app/cad/sketch/sketchModel.js +++ b/web/app/cad/sketch/sketchModel.js @@ -6,7 +6,7 @@ import {normalizeCurveEnds} from '../../../../modules/geom/impl/nurbs-ext'; import Vector from '../../../../modules/math/vector'; import CSys from "../../../../modules/math/csys"; import {distanceAB} from "../../../../modules/math/distance"; -import {isCCW} from "../../../../modules/math/euclidean"; +import {isCCW} from "../../../../modules/geom/euclidean"; const RESOLUTION = 20; diff --git a/web/app/cad/tess/nested-loops.js b/web/app/cad/tess/nested-loops.js index 7a9e7282..f850c518 100644 --- a/web/app/cad/tess/nested-loops.js +++ b/web/app/cad/tess/nested-loops.js @@ -1,5 +1,5 @@ import pip from "./pip"; -import {isCCW} from "../../../../modules/math/euclidean"; +import {isCCW} from "../../../../modules/geom/euclidean"; export default function(loops) { const loops = loops.map(loop => new NestedLoop(loop)); diff --git a/web/app/sketcher/shapes/bezier-curve.js b/web/app/sketcher/shapes/bezier-curve.js index 09383353..98cca71c 100644 --- a/web/app/sketcher/shapes/bezier-curve.js +++ b/web/app/sketcher/shapes/bezier-curve.js @@ -2,7 +2,7 @@ import {SketchObject} from './sketch-object' import {Segment} from './segment' import * as draw_utils from '../shapes/draw-utils' -import {isPointInsidePolygon, polygonOffset, ConvexHull2D} from "math/euclidean"; +import {isPointInsidePolygon, polygonOffset, ConvexHull2D} from "geom/euclidean"; import Vector from "math/vector"; diff --git a/web/app/sketcher/shapes/dim.js b/web/app/sketcher/shapes/dim.js index 1326b64c..338a0132 100644 --- a/web/app/sketcher/shapes/dim.js +++ b/web/app/sketcher/shapes/dim.js @@ -9,7 +9,7 @@ import {isInstanceOf} from "../actions/matchUtils"; import {Arc} from "./arc"; import {SketchObject} from "./sketch-object"; import {distance, distanceAB} from "../../../../modules/math/distance"; -import {lineLineIntersection2d, pointToLineSignedDistance} from "../../../../modules/math/euclidean"; +import {lineLineIntersection2d, pointToLineSignedDistance} from "../../../../modules/geom/euclidean"; const ARROW_W_PX = 15; const ARROW_H_PX = 4; diff --git a/web/app/sketcher/shapes/textHelper.js b/web/app/sketcher/shapes/textHelper.js index abdc6135..5057c3a3 100644 --- a/web/app/sketcher/shapes/textHelper.js +++ b/web/app/sketcher/shapes/textHelper.js @@ -1,6 +1,6 @@ import {_270, _90, makeAngle0_360} from "../../../../modules/math/commons"; import {_negate} from "math/vec"; -import {pointToLineSignedDistance} from "../../../../modules/math/euclidean"; +import {pointToLineSignedDistance} from "../../../../modules/geom/euclidean"; export class TextHelper { diff --git a/web/app/sketcher/tools/bezier-curve.js b/web/app/sketcher/tools/bezier-curve.js index 1be8d267..9602bd5e 100644 --- a/web/app/sketcher/tools/bezier-curve.js +++ b/web/app/sketcher/tools/bezier-curve.js @@ -2,7 +2,7 @@ import {Tool} from './tool' import {BezierCurve} from '../shapes/bezier-curve' import Vector from 'math/vector'; import {AlgNumConstraint, ConstraintDefinitions} from "../constr/ANConstraints"; -import {rotate} from "math/euclidean"; +import {rotate} from "geom/euclidean"; export class BezierCurveTool extends Tool { diff --git a/web/app/sketcher/tools/offset.js b/web/app/sketcher/tools/offset.js index e3d3668d..64d9f9e2 100644 --- a/web/app/sketcher/tools/offset.js +++ b/web/app/sketcher/tools/offset.js @@ -2,7 +2,7 @@ import {LoopPickTool} from './loop-pick' import {Constraints} from '../parametric' import Vector from 'math/vector'; import {Arc} from '../shapes/arc' -import {isCCW} from "../../../../modules/math/euclidean"; +import {isCCW} from "../../../../modules/geom/euclidean"; export class OffsetTool extends LoopPickTool {