From e11c1f7f4a74700b167ee97e4de904f00e622aea Mon Sep 17 00:00:00 2001 From: "Val Erastov (xibyte)" Date: Sun, 19 Jul 2020 22:37:24 -0700 Subject: [PATCH] geom module --- {web/app/brep => modules}/geom/curves/IsoCurve.ts | 0 {web/app/brep => modules}/geom/curves/basicCurve.js | 0 {web/app/brep => modules}/geom/curves/bezierCubic.js | 0 .../app/brep => modules}/geom/curves/boundedCurve.ts | 0 {web/app/brep => modules}/geom/curves/brepCurve.ts | 2 +- .../app/brep => modules}/geom/curves/closestPoint.js | 0 .../geom/curves/cubicHermiteIntepolation.js | 0 {web/app/brep => modules}/geom/curves/frenetFrame.js | 2 +- .../geom/curves/intersectionCurve.js | 0 .../brep => modules}/geom/curves/invertedCurve.ts | 0 .../brep => modules}/geom/curves/newtonIterations.js | 0 {web/app/brep => modules}/geom/curves/nurbsCurve.ts | 0 .../brep => modules}/geom/curves/parametricCurve.ts | 0 {web/app/brep => modules}/geom/impl/cache.js | 0 .../brep => modules}/geom/impl/curve/curve-tess.js | 0 .../brep => modules}/geom/impl/curve/curves-isec.js | 2 +- {web/app/brep => modules}/geom/impl/line.ts | 0 {web/app/brep => modules}/geom/impl/nurbs-ext.ts | 0 {web/app/brep => modules}/geom/impl/plane.ts | 0 {web/app/brep => modules}/geom/impl/uv.js | 0 .../geom/intersection/surfaceSurface.js | 0 .../geom/intersection/surfaceSurfaceStablePoints.js | 0 {web/app/brep => modules}/geom/path.js | 2 +- {web/app/brep => modules}/geom/point.ts | 0 {web/app/brep => modules}/geom/pointOnSurface.js | 0 .../brep => modules}/geom/surfaces/brepSurface.ts | 0 .../brep => modules}/geom/surfaces/nullSurface.ts | 0 .../brep => modules}/geom/surfaces/nurbsSurface.ts | 0 .../geom/surfaces/parametricSurface.ts | 0 .../brep => modules}/geom/surfaces/surfaceTess.js | 0 {web/app/brep => modules}/geom/tolerance.ts | 0 modules/math/euclidean.ts | 2 +- modules/math/vectorFactory.js | 2 +- modules/scene/objects/scalableLine.js | 2 +- web/app/brep/brep-builder.js | 8 ++++---- web/app/brep/brep-enclose.js | 8 ++++---- web/app/brep/brep-primitives.js | 4 ++-- web/app/brep/edgeIndex.js | 2 +- web/app/brep/io/brepIO.ts | 12 ++++++------ web/app/brep/operations/boolean.js | 2 +- web/app/brep/operations/polyhedronify.js | 2 +- web/app/brep/topo/edge.ts | 2 +- web/app/brep/topo/face.ts | 4 ++-- web/app/brep/topo/loop.ts | 2 +- web/app/brep/utils/ray.js | 2 +- web/app/brep/vertexFactory.js | 4 ++-- web/app/cad/assembly/dof/EEEEDOF.ts | 2 +- web/app/cad/assembly/dof/PPDOF.ts | 4 ++-- web/app/cad/assembly/dof/PPEEDOF.ts | 2 +- web/app/cad/assembly/dof/PPPPDOF.ts | 2 +- web/app/cad/assembly/dof/sixDOF.ts | 2 +- web/app/cad/craft/cutExtrude/previewer.js | 2 +- web/app/cad/craft/primitives/plane/planeOperation.js | 2 +- .../primitives/simplePlane/simplePlaneOperation.js | 2 +- web/app/cad/debugPlugin.js | 2 +- web/app/cad/exposure/exposure.js | 8 ++++---- web/app/cad/model/surfacePrototype.js | 4 ++-- web/app/cad/sandbox.js | 8 ++++---- web/app/cad/scene/wrappers/brepSceneObject.js | 2 +- web/app/cad/sketch/sketchBoundaries.js | 6 +++--- web/app/cad/sketch/sketchModel.js | 6 +++--- web/app/cad/tess/brep-tess.js | 2 +- web/app/cad/tess/triangulation.js | 2 +- web/app/sketcher/actions/objectToolActions.js | 2 +- web/app/sketcher/constr/ANConstraints.ts | 4 ++-- web/app/sketcher/constr/AlgNumSystem.ts | 2 +- web/app/sketcher/constr/polynomial.ts | 2 +- web/app/sketcher/generators/boundaryGenerator.js | 2 +- .../sketcher/generators/groundObjectsGenerator.ts | 2 +- web/app/sketcher/shapes/nurbsObject.js | 2 +- web/app/sketcher/tools/point.js | 2 +- web/app/sketcher/tools/segment.js | 2 +- 72 files changed, 72 insertions(+), 72 deletions(-) rename {web/app/brep => modules}/geom/curves/IsoCurve.ts (100%) rename {web/app/brep => modules}/geom/curves/basicCurve.js (100%) rename {web/app/brep => modules}/geom/curves/bezierCubic.js (100%) rename {web/app/brep => modules}/geom/curves/boundedCurve.ts (100%) rename {web/app/brep => modules}/geom/curves/brepCurve.ts (98%) rename {web/app/brep => modules}/geom/curves/closestPoint.js (100%) rename {web/app/brep => modules}/geom/curves/cubicHermiteIntepolation.js (100%) rename {web/app/brep => modules}/geom/curves/frenetFrame.js (86%) rename {web/app/brep => modules}/geom/curves/intersectionCurve.js (100%) rename {web/app/brep => modules}/geom/curves/invertedCurve.ts (100%) rename {web/app/brep => modules}/geom/curves/newtonIterations.js (100%) rename {web/app/brep => modules}/geom/curves/nurbsCurve.ts (100%) rename {web/app/brep => modules}/geom/curves/parametricCurve.ts (100%) rename {web/app/brep => modules}/geom/impl/cache.js (100%) rename {web/app/brep => modules}/geom/impl/curve/curve-tess.js (100%) rename {web/app/brep => modules}/geom/impl/curve/curves-isec.js (97%) rename {web/app/brep => modules}/geom/impl/line.ts (100%) rename {web/app/brep => modules}/geom/impl/nurbs-ext.ts (100%) rename {web/app/brep => modules}/geom/impl/plane.ts (100%) rename {web/app/brep => modules}/geom/impl/uv.js (100%) rename {web/app/brep => modules}/geom/intersection/surfaceSurface.js (100%) rename {web/app/brep => modules}/geom/intersection/surfaceSurfaceStablePoints.js (100%) rename {web/app/brep => modules}/geom/path.js (94%) rename {web/app/brep => modules}/geom/point.ts (100%) rename {web/app/brep => modules}/geom/pointOnSurface.js (100%) rename {web/app/brep => modules}/geom/surfaces/brepSurface.ts (100%) rename {web/app/brep => modules}/geom/surfaces/nullSurface.ts (100%) rename {web/app/brep => modules}/geom/surfaces/nurbsSurface.ts (100%) rename {web/app/brep => modules}/geom/surfaces/parametricSurface.ts (100%) rename {web/app/brep => modules}/geom/surfaces/surfaceTess.js (100%) rename {web/app/brep => modules}/geom/tolerance.ts (100%) diff --git a/web/app/brep/geom/curves/IsoCurve.ts b/modules/geom/curves/IsoCurve.ts similarity index 100% rename from web/app/brep/geom/curves/IsoCurve.ts rename to modules/geom/curves/IsoCurve.ts diff --git a/web/app/brep/geom/curves/basicCurve.js b/modules/geom/curves/basicCurve.js similarity index 100% rename from web/app/brep/geom/curves/basicCurve.js rename to modules/geom/curves/basicCurve.js diff --git a/web/app/brep/geom/curves/bezierCubic.js b/modules/geom/curves/bezierCubic.js similarity index 100% rename from web/app/brep/geom/curves/bezierCubic.js rename to modules/geom/curves/bezierCubic.js diff --git a/web/app/brep/geom/curves/boundedCurve.ts b/modules/geom/curves/boundedCurve.ts similarity index 100% rename from web/app/brep/geom/curves/boundedCurve.ts rename to modules/geom/curves/boundedCurve.ts diff --git a/web/app/brep/geom/curves/brepCurve.ts b/modules/geom/curves/brepCurve.ts similarity index 98% rename from web/app/brep/geom/curves/brepCurve.ts rename to modules/geom/curves/brepCurve.ts index 2507383e..2ed362b4 100644 --- a/web/app/brep/geom/curves/brepCurve.ts +++ b/modules/geom/curves/brepCurve.ts @@ -6,7 +6,7 @@ import curveTess from "../impl/curve/curve-tess"; import Point from 'math/vector'; import Vector from 'math/vector'; import cache from "../impl/cache"; -import {Tessellation1D} from "../../../cad/craft/engine/tessellation"; +import {Tessellation1D} from "../../../web/app/cad/craft/engine/tessellation"; import {Matrix3x4} from "math/matrix"; import {areEqual} from "math/equality"; import {Vec3} from "math/vec"; diff --git a/web/app/brep/geom/curves/closestPoint.js b/modules/geom/curves/closestPoint.js similarity index 100% rename from web/app/brep/geom/curves/closestPoint.js rename to modules/geom/curves/closestPoint.js diff --git a/web/app/brep/geom/curves/cubicHermiteIntepolation.js b/modules/geom/curves/cubicHermiteIntepolation.js similarity index 100% rename from web/app/brep/geom/curves/cubicHermiteIntepolation.js rename to modules/geom/curves/cubicHermiteIntepolation.js diff --git a/web/app/brep/geom/curves/frenetFrame.js b/modules/geom/curves/frenetFrame.js similarity index 86% rename from web/app/brep/geom/curves/frenetFrame.js rename to modules/geom/curves/frenetFrame.js index 0bf35abf..9dbdd7c6 100644 --- a/web/app/brep/geom/curves/frenetFrame.js +++ b/modules/geom/curves/frenetFrame.js @@ -1,5 +1,5 @@ import * as vec from 'math/vec'; -import {perpendicularVector} from "../../../../../modules/math/euclidean"; +import {perpendicularVector} from "../../math/euclidean"; export function frenetFrame(D1, D2) { let T = vec.normalize(D1); diff --git a/web/app/brep/geom/curves/intersectionCurve.js b/modules/geom/curves/intersectionCurve.js similarity index 100% rename from web/app/brep/geom/curves/intersectionCurve.js rename to modules/geom/curves/intersectionCurve.js diff --git a/web/app/brep/geom/curves/invertedCurve.ts b/modules/geom/curves/invertedCurve.ts similarity index 100% rename from web/app/brep/geom/curves/invertedCurve.ts rename to modules/geom/curves/invertedCurve.ts diff --git a/web/app/brep/geom/curves/newtonIterations.js b/modules/geom/curves/newtonIterations.js similarity index 100% rename from web/app/brep/geom/curves/newtonIterations.js rename to modules/geom/curves/newtonIterations.js diff --git a/web/app/brep/geom/curves/nurbsCurve.ts b/modules/geom/curves/nurbsCurve.ts similarity index 100% rename from web/app/brep/geom/curves/nurbsCurve.ts rename to modules/geom/curves/nurbsCurve.ts diff --git a/web/app/brep/geom/curves/parametricCurve.ts b/modules/geom/curves/parametricCurve.ts similarity index 100% rename from web/app/brep/geom/curves/parametricCurve.ts rename to modules/geom/curves/parametricCurve.ts diff --git a/web/app/brep/geom/impl/cache.js b/modules/geom/impl/cache.js similarity index 100% rename from web/app/brep/geom/impl/cache.js rename to modules/geom/impl/cache.js diff --git a/web/app/brep/geom/impl/curve/curve-tess.js b/modules/geom/impl/curve/curve-tess.js similarity index 100% rename from web/app/brep/geom/impl/curve/curve-tess.js rename to modules/geom/impl/curve/curve-tess.js diff --git a/web/app/brep/geom/impl/curve/curves-isec.js b/modules/geom/impl/curve/curves-isec.js similarity index 97% rename from web/app/brep/geom/impl/curve/curves-isec.js rename to modules/geom/impl/curve/curves-isec.js index 43c5eab7..bed4c17a 100644 --- a/web/app/brep/geom/impl/curve/curves-isec.js +++ b/modules/geom/impl/curve/curves-isec.js @@ -1,7 +1,7 @@ import * as vec from "math/vec"; import {TOLERANCE, TOLERANCE_SQ} from '../../tolerance'; import {fmin_bfgs} from 'math/optim/bfgs'; -import {areEqual} from "../../../../../../modules/math/equality"; +import {areEqual} from "../../../math/equality"; export default function curveIntersect(curve1, curve2, isecRange1, isecRange2, tesselator) { diff --git a/web/app/brep/geom/impl/line.ts b/modules/geom/impl/line.ts similarity index 100% rename from web/app/brep/geom/impl/line.ts rename to modules/geom/impl/line.ts diff --git a/web/app/brep/geom/impl/nurbs-ext.ts b/modules/geom/impl/nurbs-ext.ts similarity index 100% rename from web/app/brep/geom/impl/nurbs-ext.ts rename to modules/geom/impl/nurbs-ext.ts diff --git a/web/app/brep/geom/impl/plane.ts b/modules/geom/impl/plane.ts similarity index 100% rename from web/app/brep/geom/impl/plane.ts rename to modules/geom/impl/plane.ts diff --git a/web/app/brep/geom/impl/uv.js b/modules/geom/impl/uv.js similarity index 100% rename from web/app/brep/geom/impl/uv.js rename to modules/geom/impl/uv.js diff --git a/web/app/brep/geom/intersection/surfaceSurface.js b/modules/geom/intersection/surfaceSurface.js similarity index 100% rename from web/app/brep/geom/intersection/surfaceSurface.js rename to modules/geom/intersection/surfaceSurface.js diff --git a/web/app/brep/geom/intersection/surfaceSurfaceStablePoints.js b/modules/geom/intersection/surfaceSurfaceStablePoints.js similarity index 100% rename from web/app/brep/geom/intersection/surfaceSurfaceStablePoints.js rename to modules/geom/intersection/surfaceSurfaceStablePoints.js diff --git a/web/app/brep/geom/path.js b/modules/geom/path.js similarity index 94% rename from web/app/brep/geom/path.js rename to modules/geom/path.js index 55bcd339..c35f3d56 100644 --- a/web/app/brep/geom/path.js +++ b/modules/geom/path.js @@ -1,5 +1,5 @@ import {Point} from './point' -import {defineIterable} from '../../utils/utils' +import {defineIterable} from '../../web/app/utils/utils' class Path { diff --git a/web/app/brep/geom/point.ts b/modules/geom/point.ts similarity index 100% rename from web/app/brep/geom/point.ts rename to modules/geom/point.ts diff --git a/web/app/brep/geom/pointOnSurface.js b/modules/geom/pointOnSurface.js similarity index 100% rename from web/app/brep/geom/pointOnSurface.js rename to modules/geom/pointOnSurface.js diff --git a/web/app/brep/geom/surfaces/brepSurface.ts b/modules/geom/surfaces/brepSurface.ts similarity index 100% rename from web/app/brep/geom/surfaces/brepSurface.ts rename to modules/geom/surfaces/brepSurface.ts diff --git a/web/app/brep/geom/surfaces/nullSurface.ts b/modules/geom/surfaces/nullSurface.ts similarity index 100% rename from web/app/brep/geom/surfaces/nullSurface.ts rename to modules/geom/surfaces/nullSurface.ts diff --git a/web/app/brep/geom/surfaces/nurbsSurface.ts b/modules/geom/surfaces/nurbsSurface.ts similarity index 100% rename from web/app/brep/geom/surfaces/nurbsSurface.ts rename to modules/geom/surfaces/nurbsSurface.ts diff --git a/web/app/brep/geom/surfaces/parametricSurface.ts b/modules/geom/surfaces/parametricSurface.ts similarity index 100% rename from web/app/brep/geom/surfaces/parametricSurface.ts rename to modules/geom/surfaces/parametricSurface.ts diff --git a/web/app/brep/geom/surfaces/surfaceTess.js b/modules/geom/surfaces/surfaceTess.js similarity index 100% rename from web/app/brep/geom/surfaces/surfaceTess.js rename to modules/geom/surfaces/surfaceTess.js diff --git a/web/app/brep/geom/tolerance.ts b/modules/geom/tolerance.ts similarity index 100% rename from web/app/brep/geom/tolerance.ts rename to modules/geom/tolerance.ts diff --git a/modules/math/euclidean.ts b/modules/math/euclidean.ts index 5e84141c..21c6984c 100644 --- a/modules/math/euclidean.ts +++ b/modules/math/euclidean.ts @@ -3,7 +3,7 @@ import BBox from "./bbox"; import {TOLERANCE} from "math/equality"; import * as vec from "math/vec"; import {perp2d} from "math/vec"; -import {eqTol} from "../../web/app/brep/geom/tolerance"; +import {eqTol} from "geom/tolerance"; import {distance} from "math/distance"; import {IDENTITY_BASIS3} from "math/basis"; import Vector from "math/vector"; diff --git a/modules/math/vectorFactory.js b/modules/math/vectorFactory.js index 11fbec4b..1527f285 100644 --- a/modules/math/vectorFactory.js +++ b/modules/math/vectorFactory.js @@ -1,4 +1,4 @@ -import {veqXYZ} from '../../web/app/brep/geom/tolerance'; +import {veqXYZ} from '../geom/tolerance'; import Vector from './vector'; export default class VectorFactory { diff --git a/modules/scene/objects/scalableLine.js b/modules/scene/objects/scalableLine.js index 25c28541..90eadcf0 100644 --- a/modules/scene/objects/scalableLine.js +++ b/modules/scene/objects/scalableLine.js @@ -1,5 +1,5 @@ import {Face3, FaceColors, Geometry, Mesh, MeshBasicMaterial, MeshPhongMaterial} from 'three'; -import {advancePseudoFrenetFrame, frenetFrame, pseudoFrenetFrame} from '../../../web/app/brep/geom/curves/frenetFrame'; +import {advancePseudoFrenetFrame, frenetFrame, pseudoFrenetFrame} from '../../geom/curves/frenetFrame'; import * as vec from 'math/vec'; import {viewScaleFactor} from '../scaleHelper'; import {arrToThree} from 'math/vectorAdapters'; diff --git a/web/app/brep/brep-builder.js b/web/app/brep/brep-builder.js index 29ff26e0..f9876715 100644 --- a/web/app/brep/brep-builder.js +++ b/web/app/brep/brep-builder.js @@ -1,13 +1,13 @@ -import {Plane} from './geom/impl/plane'; -import {Point} from './geom/point'; +import {Plane} from '../../../modules/geom/impl/plane'; +import {Point} from '../../../modules/geom/point'; import {Shell} from './topo/shell'; import {Face} from './topo/face'; import {Loop} from './topo/loop'; import {Vertex} from './topo/vertex'; import {normalOfCCWSeq} from '../cad/cad-utils'; import BBox from '../../../modules/math/bbox'; -import NurbsSurface from './geom/surfaces/nurbsSurface'; -import {BrepSurface} from './geom/surfaces/brepSurface'; +import NurbsSurface from '../../../modules/geom/surfaces/nurbsSurface'; +import {BrepSurface} from '../../../modules/geom/surfaces/brepSurface'; import EdgeIndex from './edgeIndex'; export default class BrepBuilder { diff --git a/web/app/brep/brep-enclose.js b/web/app/brep/brep-enclose.js index c113c059..f771cea8 100644 --- a/web/app/brep/brep-enclose.js +++ b/web/app/brep/brep-enclose.js @@ -1,12 +1,12 @@ import {Shell} from './topo/shell'; import {Face} from './topo/face'; import {Edge} from './topo/edge'; -import BrepCurve from './geom/curves/brepCurve'; -import {Plane} from './geom/impl/plane'; +import BrepCurve from '../../../modules/geom/curves/brepCurve'; +import {Plane} from '../../../modules/geom/impl/plane'; import * as cad_utils from '../cad/cad-utils'; import {createBoundingSurface} from './brep-builder'; -import NurbsSurface from './geom/surfaces/nurbsSurface'; -import {BrepSurface} from './geom/surfaces/brepSurface'; +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"; diff --git a/web/app/brep/brep-primitives.js b/web/app/brep/brep-primitives.js index 7c18403f..fe46a907 100644 --- a/web/app/brep/brep-primitives.js +++ b/web/app/brep/brep-primitives.js @@ -1,5 +1,5 @@ -import {Point} from './geom/point' -import {Plane} from './geom/impl/plane' +import {Point} from '../../../modules/geom/point' +import {Plane} from '../../../modules/geom/impl/plane' import {createPrism, enclose} from './brep-enclose' import {Circle} from '../cad/sketch/sketchModel' import CSys from 'math/csys'; diff --git a/web/app/brep/edgeIndex.js b/web/app/brep/edgeIndex.js index 551e3b28..d7aa7ef0 100644 --- a/web/app/brep/edgeIndex.js +++ b/web/app/brep/edgeIndex.js @@ -1,5 +1,5 @@ import {Edge} from './topo/edge'; -import BrepCurve from './geom/curves/brepCurve'; +import BrepCurve from '../../../modules/geom/curves/brepCurve'; export default class EdgeIndex { diff --git a/web/app/brep/io/brepIO.ts b/web/app/brep/io/brepIO.ts index ff23a7c5..4c3f0197 100644 --- a/web/app/brep/io/brepIO.ts +++ b/web/app/brep/io/brepIO.ts @@ -1,14 +1,14 @@ import BrepBuilder, {createBoundingSurfaceFrom2DPoints, createBoundingSurfaceFromBBox} from '../brep-builder'; import VertexFactory from '../vertexFactory'; -import NurbsSurface from '../geom/surfaces/nurbsSurface'; +import NurbsSurface from '../../../../modules/geom/surfaces/nurbsSurface'; import * as vec from 'math/vec'; -import {BrepSurface} from '../geom/surfaces/brepSurface'; -import {Plane} from '../geom/impl/plane'; +import {BrepSurface} from '../../../../modules/geom/surfaces/brepSurface'; +import {Plane} from '../../../../modules/geom/impl/plane'; import Vector from '../../../../modules/math/vector'; -import NullSurface from '../geom/surfaces/nullSurface'; +import NullSurface from '../../../../modules/geom/surfaces/nullSurface'; import BBox from 'math/bbox'; -import NurbsCurve from '../geom/curves/nurbsCurve'; -import BrepCurve from '../geom/curves/brepCurve'; +import NurbsCurve from '../../../../modules/geom/curves/nurbsCurve'; +import BrepCurve from '../../../../modules/geom/curves/brepCurve'; import {BREPData} from "../../cad/craft/engine/brepData"; export function readBrep(data: BREPData) { diff --git a/web/app/brep/operations/boolean.js b/web/app/brep/operations/boolean.js index 61d67e2e..dfdf59d6 100644 --- a/web/app/brep/operations/boolean.js +++ b/web/app/brep/operations/boolean.js @@ -4,7 +4,7 @@ import {Loop} from '../topo/loop'; import {Shell} from '../topo/shell'; import {Vertex} from '../topo/vertex'; import {evolveFace} from './evolve-face' -import {eqTol, TOLERANCE, ueq, veq, veqNeg} from '../geom/tolerance'; +import {eqTol, TOLERANCE, ueq, veq, veqNeg} from '../../../../modules/geom/tolerance'; import CadError from "../../utils/errors"; import {createBoundingSurface} from "../brep-builder"; import BREP_DEBUG from '../debug/brep-debug'; diff --git a/web/app/brep/operations/polyhedronify.js b/web/app/brep/operations/polyhedronify.js index d21f08a4..66a42610 100644 --- a/web/app/brep/operations/polyhedronify.js +++ b/web/app/brep/operations/polyhedronify.js @@ -5,7 +5,7 @@ import {Loop} from '../topo/loop' import {Face} from '../topo/face' import {BREPValidator} from '../brep-validator'; import {linkSegments} from '../brep-builder'; -import {Line} from '../geom/impl/line' +import {Line} from '../../../../modules/geom/impl/line' export function polyhedronify(shell) { shell.reindexVertices(); diff --git a/web/app/brep/topo/edge.ts b/web/app/brep/topo/edge.ts index 45155027..5b4b2de7 100644 --- a/web/app/brep/topo/edge.ts +++ b/web/app/brep/topo/edge.ts @@ -1,6 +1,6 @@ import {TopoObject} from './topo-object' import {Vertex} from "./vertex"; -import BrepCurve from "../geom/curves/brepCurve"; +import BrepCurve from "../../../../modules/geom/curves/brepCurve"; import {Loop} from "./loop"; import Vector from "math/vector"; import {Tessellation1D} from "../../cad/craft/engine/tessellation"; diff --git a/web/app/brep/topo/face.ts b/web/app/brep/topo/face.ts index 41c2ef56..cb201611 100644 --- a/web/app/brep/topo/face.ts +++ b/web/app/brep/topo/face.ts @@ -1,9 +1,9 @@ import {TopoObject} from './topo-object' import {Loop} from './loop' import PIP from '../../cad/tess/pip'; -import {veq} from "../geom/tolerance"; +import {veq} from "geom/tolerance"; import {isOnPositiveHalfPlaneFromVec} from "../operations/boolean"; -import {BrepSurface} from "../geom/surfaces/brepSurface"; +import {BrepSurface} from "../../../../modules/geom/surfaces/brepSurface"; import {Shell} from "./shell"; import {ProductionInfo} from "../../cad/craft/engine/productionInfo"; diff --git a/web/app/brep/topo/loop.ts b/web/app/brep/topo/loop.ts index 7d986f5a..ecb9d174 100644 --- a/web/app/brep/topo/loop.ts +++ b/web/app/brep/topo/loop.ts @@ -1,6 +1,6 @@ import {TopoObject} from './topo-object' import {Face} from "./face"; -import {BrepSurface} from "../geom/surfaces/brepSurface"; +import {BrepSurface} from "../../../../modules/geom/surfaces/brepSurface"; import {HalfEdge} from "./edge"; import {findLowestLeftPoint} from "math/euclidean"; diff --git a/web/app/brep/utils/ray.js b/web/app/brep/utils/ray.js index f9d63f65..4d2d6388 100644 --- a/web/app/brep/utils/ray.js +++ b/web/app/brep/utils/ray.js @@ -1,5 +1,5 @@ import pertrub from './vector-petrub'; -import BrepCurve from '../geom/curves/brepCurve'; +import BrepCurve from '../../../../modules/geom/curves/brepCurve'; export class Ray { diff --git a/web/app/brep/vertexFactory.js b/web/app/brep/vertexFactory.js index accee227..0f603434 100644 --- a/web/app/brep/vertexFactory.js +++ b/web/app/brep/vertexFactory.js @@ -1,6 +1,6 @@ import {Vertex} from './topo/vertex'; -import {veqXYZ} from './geom/tolerance'; -import {Point} from './geom/point'; +import {veqXYZ} from '../../../modules/geom/tolerance'; +import {Point} from '../../../modules/geom/point'; export default class VertexFactory { diff --git a/web/app/cad/assembly/dof/EEEEDOF.ts b/web/app/cad/assembly/dof/EEEEDOF.ts index ae211ade..781f748b 100644 --- a/web/app/cad/assembly/dof/EEEEDOF.ts +++ b/web/app/cad/assembly/dof/EEEEDOF.ts @@ -1,6 +1,6 @@ import Vector from "math/vector"; import { FaceTouchAlignConstraint } from "../constraints/faceTouchAlign"; -import { Plane } from './../../../brep/geom/impl/plane'; +import { Plane } from '../../../../../modules/geom/impl/plane'; import { AssemblyDOF, ModificationResponse } from "./assemblyDOF"; import { ConflictDOF } from './conflictDOF'; import {EdgeAlignConstraint} from "../constraints/edgeAlign"; diff --git a/web/app/cad/assembly/dof/PPDOF.ts b/web/app/cad/assembly/dof/PPDOF.ts index 14eef8b1..7096d939 100644 --- a/web/app/cad/assembly/dof/PPDOF.ts +++ b/web/app/cad/assembly/dof/PPDOF.ts @@ -1,7 +1,7 @@ import Vector, {ORIGIN} from "math/vector"; -import {eqTol} from "../../../brep/geom/tolerance"; +import {eqTol} from "geom/tolerance"; import {FaceTouchAlignConstraint} from "../constraints/faceTouchAlign"; -import {Plane} from './../../../brep/geom/impl/plane'; +import {Plane} from '../../../../../modules/geom/impl/plane'; import {ANGULAR_ALLOWANCE, AssemblyDOF, ModificationResponse} from "./assemblyDOF"; import {clamp, DEG_RAD} from "math/commons"; import {ConflictDOF} from "./conflictDOF"; diff --git a/web/app/cad/assembly/dof/PPEEDOF.ts b/web/app/cad/assembly/dof/PPEEDOF.ts index 115054b0..cb244573 100644 --- a/web/app/cad/assembly/dof/PPEEDOF.ts +++ b/web/app/cad/assembly/dof/PPEEDOF.ts @@ -1,6 +1,6 @@ import Vector from "math/vector"; import { FaceTouchAlignConstraint } from "../constraints/faceTouchAlign"; -import { Plane } from './../../../brep/geom/impl/plane'; +import { Plane } from '../../../../../modules/geom/impl/plane'; import { AssemblyDOF, ModificationResponse } from "./assemblyDOF"; import { ConflictDOF } from './conflictDOF'; import {EdgeAlignConstraint} from "../constraints/edgeAlign"; diff --git a/web/app/cad/assembly/dof/PPPPDOF.ts b/web/app/cad/assembly/dof/PPPPDOF.ts index d84c72c8..9e1395bc 100644 --- a/web/app/cad/assembly/dof/PPPPDOF.ts +++ b/web/app/cad/assembly/dof/PPPPDOF.ts @@ -1,6 +1,6 @@ import Vector from "math/vector"; import { FaceTouchAlignConstraint } from "../constraints/faceTouchAlign"; -import { Plane } from './../../../brep/geom/impl/plane'; +import { Plane } from '../../../../../modules/geom/impl/plane'; import { AssemblyDOF, ModificationResponse } from "./assemblyDOF"; import { ConflictDOF } from './conflictDOF'; import {EdgeAlignConstraint} from "../constraints/edgeAlign"; diff --git a/web/app/cad/assembly/dof/sixDOF.ts b/web/app/cad/assembly/dof/sixDOF.ts index 6846a410..9520441b 100644 --- a/web/app/cad/assembly/dof/sixDOF.ts +++ b/web/app/cad/assembly/dof/sixDOF.ts @@ -1,4 +1,4 @@ -import { Plane } from './../../../brep/geom/impl/plane'; +import { Plane } from '../../../../../modules/geom/impl/plane'; import {AssemblyDOF, ModificationResponse} from "./assemblyDOF"; import Vector, {ORIGIN} from "math/vector"; import {FaceTouchAlignConstraint} from "../constraints/faceTouchAlign"; diff --git a/web/app/cad/craft/cutExtrude/previewer.js b/web/app/cad/craft/cutExtrude/previewer.js index 1f4357dd..2878ad03 100644 --- a/web/app/cad/craft/cutExtrude/previewer.js +++ b/web/app/cad/craft/cutExtrude/previewer.js @@ -1,6 +1,6 @@ import {getEncloseDetails, resolveExtrudeVector} from './cutExtrude'; -import {curveTessParams} from "../../../brep/geom/impl/curve/curve-tess"; +import {curveTessParams} from "../../../../../modules/geom/impl/curve/curve-tess"; import Vector from "math/vector"; import {TriangulatePolygons} from "../../tess/triangulation"; import {createMeshGeometry} from "scene/geoms"; diff --git a/web/app/cad/craft/primitives/plane/planeOperation.js b/web/app/cad/craft/primitives/plane/planeOperation.js index c45514dc..aafed345 100644 --- a/web/app/cad/craft/primitives/plane/planeOperation.js +++ b/web/app/cad/craft/primitives/plane/planeOperation.js @@ -1,5 +1,5 @@ import {createMeshGeometry} from 'scene/geoms'; -import {Plane} from '../../../../brep/geom/impl/plane'; +import {Plane} from '../../../../../../modules/geom/impl/plane'; import Vector from 'math/vector'; import PlaneWizard from './PlaneWizard'; import {MOpenFaceShell} from '../../../model/mopenFace'; diff --git a/web/app/cad/craft/primitives/simplePlane/simplePlaneOperation.js b/web/app/cad/craft/primitives/simplePlane/simplePlaneOperation.js index a5e0bce8..41ca9069 100644 --- a/web/app/cad/craft/primitives/simplePlane/simplePlaneOperation.js +++ b/web/app/cad/craft/primitives/simplePlane/simplePlaneOperation.js @@ -1,5 +1,5 @@ import {createMeshGeometry} from 'scene/geoms'; -import {Plane} from '../../../../brep/geom/impl/plane'; +import {Plane} from '../../../../../../modules/geom/impl/plane'; import Vector from 'math/vector'; import PlaneWizard from './SimplePlaneWizard'; import {MOpenFaceShell} from '../../../model/mopenFace'; diff --git a/web/app/cad/debugPlugin.js b/web/app/cad/debugPlugin.js index 5df3d98a..d392a1cb 100644 --- a/web/app/cad/debugPlugin.js +++ b/web/app/cad/debugPlugin.js @@ -7,7 +7,7 @@ import * as vec from 'math/vec'; import React from 'react'; import {readSketchFloat} from './sketch/sketchReader'; import {toLoops} from '../brep/io/brepLoopsFormat'; -import curveTess from '../brep/geom/impl/curve/curve-tess'; +import curveTess from '../../../modules/geom/impl/curve/curve-tess'; import {LOG_FLAGS} from './logFlags'; import {state} from "lstream"; diff --git a/web/app/cad/exposure/exposure.js b/web/app/cad/exposure/exposure.js index 6b2ac2f3..7408747d 100644 --- a/web/app/cad/exposure/exposure.js +++ b/web/app/cad/exposure/exposure.js @@ -9,13 +9,13 @@ import {Loop} from '../../brep/topo/loop'; import {Face} from '../../brep/topo/face'; import {Shell} from '../../brep/topo/shell'; import {Vertex} from '../../brep/topo/vertex'; -import {Point} from '../../brep/geom/point'; -import BrepCurve from '../../brep/geom/curves/brepCurve'; -import {Plane} from '../../brep/geom/impl/plane'; +import {Point} from '../../../../modules/geom/point'; +import BrepCurve from '../../../../modules/geom/curves/brepCurve'; +import {Plane} from '../../../../modules/geom/impl/plane'; import pip from '../tess/pip'; import {readShellEntityFromJson} from '../scene/wrappers/entityIO'; import * as vec from 'math/vec' -import NurbsSurface from '../../brep/geom/surfaces/nurbsSurface'; +import NurbsSurface from '../../../../modules/geom/surfaces/nurbsSurface'; export default { diff --git a/web/app/cad/model/surfacePrototype.js b/web/app/cad/model/surfacePrototype.js index 74160d85..8eae42a9 100644 --- a/web/app/cad/model/surfacePrototype.js +++ b/web/app/cad/model/surfacePrototype.js @@ -1,6 +1,6 @@ import {createBoundingSurfaceFrom2DPoints} from '../../brep/brep-builder'; -import NurbsSurface from '../../brep/geom/surfaces/nurbsSurface'; -import {BrepSurface} from '../../brep/geom/surfaces/brepSurface'; +import NurbsSurface from '../../../../modules/geom/surfaces/nurbsSurface'; +import {BrepSurface} from '../../../../modules/geom/surfaces/brepSurface'; export class SurfacePrototype { diff --git a/web/app/cad/sandbox.js b/web/app/cad/sandbox.js index a2f2b0cc..4643f308 100644 --- a/web/app/cad/sandbox.js +++ b/web/app/cad/sandbox.js @@ -1,9 +1,9 @@ import BrepBuilder from '../brep/brep-builder' import * as BREPPrimitives from '../brep/brep-primitives' -import BrepCurve from '../brep/geom/curves/brepCurve'; -import NurbsCurve from "../brep/geom/curves/nurbsCurve"; -import {surfaceIntersect} from '../brep/geom/intersection/surfaceSurface'; -import NurbsSurface from '../brep/geom/surfaces/nurbsSurface'; +import BrepCurve from '../../../modules/geom/curves/brepCurve'; +import NurbsCurve from "../../../modules/geom/curves/nurbsCurve"; +import {surfaceIntersect} from '../../../modules/geom/intersection/surfaceSurface'; +import NurbsSurface from '../../../modules/geom/surfaces/nurbsSurface'; import {createOctreeFromSurface, traverseOctree} from "../../../modules/voxels/octree"; import {Matrix3x4} from 'math/matrix'; import {AXIS, ORIGIN} from "../../../modules/math/vector"; diff --git a/web/app/cad/scene/wrappers/brepSceneObject.js b/web/app/cad/scene/wrappers/brepSceneObject.js index 13930f85..b8630f57 100644 --- a/web/app/cad/scene/wrappers/brepSceneObject.js +++ b/web/app/cad/scene/wrappers/brepSceneObject.js @@ -1,7 +1,7 @@ import Vector from 'math/vector'; import {SceneEdge, SceneFace, SceneSolid} from './sceneObject'; import brepTess from '../../tess/brep-tess'; -import tessellateSurface from '../../../brep/geom/surfaces/surfaceTess'; +import tessellateSurface from '../../../../../modules/geom/surfaces/surfaceTess'; import {setAttribute} from '../../../../../modules/scene/objectData'; import * as vec from 'math/vec'; import {perpendicularVector} from "math/euclidean"; diff --git a/web/app/cad/sketch/sketchBoundaries.js b/web/app/cad/sketch/sketchBoundaries.js index 1c7c2e28..e641cf0d 100644 --- a/web/app/cad/sketch/sketchBoundaries.js +++ b/web/app/cad/sketch/sketchBoundaries.js @@ -1,8 +1,8 @@ import * as vec from 'math/vec'; import {iteratePath} from '../cad-utils'; -import NurbsCurve from '../../brep/geom/curves/nurbsCurve'; -import {veqXYZ} from '../../brep/geom/tolerance'; -import curveTess, {curveTessParams} from '../../brep/geom/impl/curve/curve-tess'; +import NurbsCurve from '../../../../modules/geom/curves/nurbsCurve'; +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"; diff --git a/web/app/cad/sketch/sketchModel.js b/web/app/cad/sketch/sketchModel.js index 1534c9f0..2fe00caa 100644 --- a/web/app/cad/sketch/sketchModel.js +++ b/web/app/cad/sketch/sketchModel.js @@ -1,8 +1,8 @@ import verb from 'verb-nurbs' -import BrepCurve from '../../brep/geom/curves/brepCurve'; -import NurbsCurve from '../../brep/geom/curves/nurbsCurve'; +import BrepCurve from '../../../../modules/geom/curves/brepCurve'; +import NurbsCurve from '../../../../modules/geom/curves/nurbsCurve'; import {makeAngle0_360} from '../../../../modules/math/commons' -import {normalizeCurveEnds} from '../../brep/geom/impl/nurbs-ext'; +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"; diff --git a/web/app/cad/tess/brep-tess.js b/web/app/cad/tess/brep-tess.js index ad2ef2e6..b0c1dcda 100644 --- a/web/app/cad/tess/brep-tess.js +++ b/web/app/cad/tess/brep-tess.js @@ -1,7 +1,7 @@ import Vector from 'math/vector'; import ClipperLib from 'clipper-lib'; import libtess from 'libtess' -import tessellateSurface from '../../brep/geom/surfaces/surfaceTess'; +import tessellateSurface from '../../../../modules/geom/surfaces/surfaceTess'; export default function A(face) { return tessellateLoopsOnSurface(face.surface, face.loops, loop => loop, seg => e.edge.curve, seg => seg.inverted) diff --git a/web/app/cad/tess/triangulation.js b/web/app/cad/tess/triangulation.js index 9d8275f0..fd59fc6d 100644 --- a/web/app/cad/tess/triangulation.js +++ b/web/app/cad/tess/triangulation.js @@ -1,5 +1,5 @@ import libtess from 'libtess' -import {Point} from '../../brep/geom/point' +import {Point} from '../../../../modules/geom/point' import {Vertex} from '../../brep/topo/vertex' import Vector from 'math/vector'; diff --git a/web/app/sketcher/actions/objectToolActions.js b/web/app/sketcher/actions/objectToolActions.js index 5d6c7e0b..6de30436 100644 --- a/web/app/sketcher/actions/objectToolActions.js +++ b/web/app/sketcher/actions/objectToolActions.js @@ -25,7 +25,7 @@ export default [ kind: 'Tool', description: 'Add a point', icon: PointToolIcon, - command: 'point', + command: 'geom.point', invoke: (ctx) => { ctx.viewer.toolManager.takeControl(new AddPointTool(ctx.viewer)); diff --git a/web/app/sketcher/constr/ANConstraints.ts b/web/app/sketcher/constr/ANConstraints.ts index 6db6848d..d5cb0d8c 100644 --- a/web/app/sketcher/constr/ANConstraints.ts +++ b/web/app/sketcher/constr/ANConstraints.ts @@ -2,9 +2,9 @@ import {Param} from '../shapes/param'; import {DEG_RAD, makeAngle0_360} from "math/commons"; import {COS_FN, Polynomial, POW_1_FN, POW_2_FN, POW_3_FN, SIN_FN} from "./polynomial"; -import {cubicBezierDer1, cubicBezierDer2, cubicBezierPoint} from "../../brep/geom/curves/bezierCubic"; +import {cubicBezierDer1, cubicBezierDer2, cubicBezierPoint} from "../../../../modules/geom/curves/bezierCubic"; import {greaterThanConstraint, lessThanConstraint} from "./barriers"; -import {genericCurveStep} from "../../brep/geom/impl/nurbs-ext"; +import {genericCurveStep} from "../../../../modules/geom/impl/nurbs-ext"; import {_normalize} from "math/vec"; import { AngleBetweenConstraintIcon, diff --git a/web/app/sketcher/constr/AlgNumSystem.ts b/web/app/sketcher/constr/AlgNumSystem.ts index cbd2bb9e..113631ee 100644 --- a/web/app/sketcher/constr/AlgNumSystem.ts +++ b/web/app/sketcher/constr/AlgNumSystem.ts @@ -1,5 +1,5 @@ import {prepare} from "./solver"; -import {eqEps} from "../../brep/geom/tolerance"; +import {eqEps} from "geom/tolerance"; import {Polynomial, POW_1_FN} from "./polynomial"; import {compositeFn} from "gems/func"; import {AlgNumConstraint} from "./ANConstraints"; diff --git a/web/app/sketcher/constr/polynomial.ts b/web/app/sketcher/constr/polynomial.ts index 7359f428..20e86151 100644 --- a/web/app/sketcher/constr/polynomial.ts +++ b/web/app/sketcher/constr/polynomial.ts @@ -1,4 +1,4 @@ -import {eqEps} from "../../brep/geom/tolerance"; +import {eqEps} from "geom/tolerance"; import {compositeFn} from "gems/func"; import {SolverParam} from "./solverParam"; diff --git a/web/app/sketcher/generators/boundaryGenerator.js b/web/app/sketcher/generators/boundaryGenerator.js index c180715c..c18b6f82 100644 --- a/web/app/sketcher/generators/boundaryGenerator.js +++ b/web/app/sketcher/generators/boundaryGenerator.js @@ -2,7 +2,7 @@ import {NoIcon} from "../icons/NoIcon"; import {Arc} from "../shapes/arc"; import {Circle} from "../shapes/circle"; import {NurbsObject} from "../shapes/nurbsObject"; -import NurbsCurve from "../../brep/geom/curves/nurbsCurve"; +import NurbsCurve from "../../../../modules/geom/curves/nurbsCurve"; import {Segment} from "../shapes/segment"; export const BoundaryGeneratorSchema = { diff --git a/web/app/sketcher/generators/groundObjectsGenerator.ts b/web/app/sketcher/generators/groundObjectsGenerator.ts index 286b5e7b..0e636597 100644 --- a/web/app/sketcher/generators/groundObjectsGenerator.ts +++ b/web/app/sketcher/generators/groundObjectsGenerator.ts @@ -4,7 +4,7 @@ import {Arc} from "../shapes/arc"; import {EndPoint} from "../shapes/point"; import {Circle} from "../shapes/circle"; import {NurbsObject} from "../shapes/nurbsObject"; -import NurbsCurve from "../../brep/geom/curves/nurbsCurve"; +import NurbsCurve from "../../../../modules/geom/curves/nurbsCurve"; import {Segment} from "../shapes/segment"; export const GroundObjectsGeneratorSchema = { diff --git a/web/app/sketcher/shapes/nurbsObject.js b/web/app/sketcher/shapes/nurbsObject.js index 104b80ec..2c3f7e43 100644 --- a/web/app/sketcher/shapes/nurbsObject.js +++ b/web/app/sketcher/shapes/nurbsObject.js @@ -1,6 +1,6 @@ import {SketchObject} from './sketch-object' import * as vec from 'math/vec'; -import {curveTessellate} from '../../brep/geom/impl/nurbs-ext'; +import {curveTessellate} from '../../../../modules/geom/impl/nurbs-ext'; import {Ellipse} from "./ellipse"; import {EndPoint} from "./point"; diff --git a/web/app/sketcher/tools/point.js b/web/app/sketcher/tools/point.js index 36a048eb..43238d77 100644 --- a/web/app/sketcher/tools/point.js +++ b/web/app/sketcher/tools/point.js @@ -4,7 +4,7 @@ import {Tool} from './tool' export class AddPointTool extends Tool { constructor(viewer) { - super('point', viewer); + super('geom.point', viewer); } restart() { diff --git a/web/app/sketcher/tools/segment.js b/web/app/sketcher/tools/segment.js index 1a6d93b4..c908344b 100644 --- a/web/app/sketcher/tools/segment.js +++ b/web/app/sketcher/tools/segment.js @@ -85,7 +85,7 @@ export class AddSegmentTool extends Tool { firstPointPicked() { this.pointPicked(this.line.a.x, this.line.a.y); - this.sendHint('specify ' + (this.multi ? 'next' : 'end') +' point'); + this.sendHint('specify ' + (this.multi ? 'next' : 'end') +' geom.point'); } dblclick(e) {