diff --git a/modules/brep/brep-builder.js b/modules/brep/brep-builder.js index af81a8d7..f4e86221 100644 --- a/modules/brep/brep-builder.js +++ b/modules/brep/brep-builder.js @@ -1,13 +1,13 @@ -import {Plane} from '../geom/impl/plane'; -import {Point} from '../geom/point'; +import {Plane} from 'geom/impl/plane'; +import {Point} from '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 '../../web/app/cad/cad-utils'; -import BBox from '../math/bbox'; -import NurbsSurface from '../geom/surfaces/nurbsSurface'; -import {BrepSurface} from '../geom/surfaces/brepSurface'; +import BBox from 'math/bbox'; +import NurbsSurface from 'geom/surfaces/nurbsSurface'; +import {BrepSurface} from 'geom/surfaces/brepSurface'; import EdgeIndex from './edgeIndex'; export default class BrepBuilder { diff --git a/modules/brep/brep-enclose.js b/modules/brep/brep-enclose.js index 937c3951..8ee31db6 100644 --- a/modules/brep/brep-enclose.js +++ b/modules/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 'geom/curves/brepCurve'; +import {Plane} from 'geom/impl/plane'; import * as cad_utils from '../../web/app/cad/cad-utils'; import {createBoundingSurface} from './brep-builder'; -import NurbsSurface from '../geom/surfaces/nurbsSurface'; -import {BrepSurface} from '../geom/surfaces/brepSurface'; +import NurbsSurface from 'geom/surfaces/nurbsSurface'; +import {BrepSurface} from 'geom/surfaces/brepSurface'; import {Matrix3x4} from 'math/matrix'; import {BasisForPlane} from "math/basis"; import {isCCW as isCCWtest} from "geom/euclidean"; diff --git a/modules/brep/brep-primitives.js b/modules/brep/brep-primitives.js index c366ef2b..2e401bd7 100644 --- a/modules/brep/brep-primitives.js +++ b/modules/brep/brep-primitives.js @@ -1,10 +1,10 @@ -import {Point} from '../geom/point' -import {Plane} from '../geom/impl/plane' +import {Point} from 'geom/point' +import {Plane} from 'geom/impl/plane' import {createPrism, enclose} from './brep-enclose' import {Circle} from '../../web/app/cad/sketch/sketchModel' import CSys from 'math/csys'; import {Matrix3x4} from 'math/matrix'; -import {AXIS} from "../math/vector"; +import {AXIS} from "math/vector"; export function box(w, h, d, tr) { const wh = w * 0.5; diff --git a/modules/brep/debug/debugger/utils.jsx b/modules/brep/debug/debugger/utils.jsx index 2df9f002..293eb18a 100644 --- a/modules/brep/debug/debugger/utils.jsx +++ b/modules/brep/debug/debugger/utils.jsx @@ -4,7 +4,7 @@ import { YELLOW } from "./colors"; import Section from "./section"; -import {distanceAB3} from "../../../math/distance"; +import {distanceAB3} from "math/distance"; export function getFacesViewObjects(group3d, category, context, out, faces) { forEach(faces, getFaceViewObjects.bind(null, group3d, category, context, out)); diff --git a/modules/brep/edgeIndex.js b/modules/brep/edgeIndex.js index 335a3987..af8e23a2 100644 --- a/modules/brep/edgeIndex.js +++ b/modules/brep/edgeIndex.js @@ -1,5 +1,5 @@ import {Edge} from './topo/edge'; -import BrepCurve from '../geom/curves/brepCurve'; +import BrepCurve from 'geom/curves/brepCurve'; export default class EdgeIndex { diff --git a/modules/brep/io/brepIO.ts b/modules/brep/io/brepIO.ts index 44016f9e..2fd0f8f6 100644 --- a/modules/brep/io/brepIO.ts +++ b/modules/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 'geom/surfaces/nurbsSurface'; import * as vec from 'math/vec'; -import {BrepSurface} from '../../geom/surfaces/brepSurface'; -import {Plane} from '../../geom/impl/plane'; -import Vector from '../../math/vector'; -import NullSurface from '../../geom/surfaces/nullSurface'; +import {BrepSurface} from 'geom/surfaces/brepSurface'; +import {Plane} from 'geom/impl/plane'; +import Vector from 'math/vector'; +import NullSurface from 'geom/surfaces/nullSurface'; import BBox from 'math/bbox'; -import NurbsCurve from '../../geom/curves/nurbsCurve'; -import BrepCurve from '../../geom/curves/brepCurve'; +import NurbsCurve from 'geom/curves/nurbsCurve'; +import BrepCurve from 'geom/curves/brepCurve'; import {BREPData} from "../../../web/app/cad/craft/engine/brepData"; export function readBrep(data: BREPData) { diff --git a/modules/brep/operations/boolean.js b/modules/brep/operations/boolean.js index 7e16d740..f07ac5f1 100644 --- a/modules/brep/operations/boolean.js +++ b/modules/brep/operations/boolean.js @@ -4,12 +4,12 @@ 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 'geom/tolerance'; import CadError from "../../../web/app/utils/errors"; import {createBoundingSurface} from "../brep-builder"; import BREP_DEBUG from '../debug/brep-debug'; import {Face} from "../topo/face"; -import {vectorsEqual} from "../../math/equality"; +import {vectorsEqual} from "math/equality"; const A = 0, B = 1; diff --git a/modules/brep/operations/evolve-face.js b/modules/brep/operations/evolve-face.js index 8ab113b0..eb5aa52b 100644 --- a/modules/brep/operations/evolve-face.js +++ b/modules/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 '../../../web/app/cad/tess/pip'; -import {isCCW} from "../../geom/euclidean"; +import {isCCW} from "geom/euclidean"; export function evolveFace(originFace, loops) { let out = []; diff --git a/modules/brep/operations/polyhedronify.js b/modules/brep/operations/polyhedronify.js index ffdc8787..bc62b3e9 100644 --- a/modules/brep/operations/polyhedronify.js +++ b/modules/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 'geom/impl/line' export function polyhedronify(shell) { shell.reindexVertices(); diff --git a/modules/brep/topo/edge.ts b/modules/brep/topo/edge.ts index 7a2c05e5..9a27db28 100644 --- a/modules/brep/topo/edge.ts +++ b/modules/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 "geom/curves/brepCurve"; import {Loop} from "./loop"; import Vector from "math/vector"; import {Tessellation1D} from "../../../web/app/cad/craft/engine/tessellation"; diff --git a/modules/brep/topo/face.ts b/modules/brep/topo/face.ts index bc5e7403..2ab2e4a7 100644 --- a/modules/brep/topo/face.ts +++ b/modules/brep/topo/face.ts @@ -3,7 +3,7 @@ import {Loop} from './loop' import PIP from '../../../web/app/cad/tess/pip'; import {veq} from "geom/tolerance"; import {isOnPositiveHalfPlaneFromVec} from "../operations/boolean"; -import {BrepSurface} from "../../geom/surfaces/brepSurface"; +import {BrepSurface} from "geom/surfaces/brepSurface"; import {Shell} from "./shell"; import {ProductionInfo} from "../../../web/app/cad/craft/engine/productionInfo"; diff --git a/modules/brep/topo/loop.ts b/modules/brep/topo/loop.ts index 67ce4ea2..dc596d43 100644 --- a/modules/brep/topo/loop.ts +++ b/modules/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 "geom/surfaces/brepSurface"; import {HalfEdge} from "./edge"; import {findLowestLeftPoint} from "geom/euclidean"; diff --git a/modules/brep/utils/pickPointInPolygon.js b/modules/brep/utils/pickPointInPolygon.js index 23c0b75a..0f8e1b83 100644 --- a/modules/brep/utils/pickPointInPolygon.js +++ b/modules/brep/utils/pickPointInPolygon.js @@ -1,5 +1,5 @@ import libtess from 'libtess' -import {area} from "../../geom/euclidean"; +import {area} from "geom/euclidean"; export default function pickPointInside2dPolygon(polygon) { function vertexCallback(data, tr) { diff --git a/modules/brep/utils/ray.js b/modules/brep/utils/ray.js index 0183613e..e4ef6905 100644 --- a/modules/brep/utils/ray.js +++ b/modules/brep/utils/ray.js @@ -1,5 +1,5 @@ import pertrub from './vector-petrub'; -import BrepCurve from '../../geom/curves/brepCurve'; +import BrepCurve from 'geom/curves/brepCurve'; export class Ray { diff --git a/modules/brep/vertexFactory.js b/modules/brep/vertexFactory.js index 1a99baaf..bb2b7b8d 100644 --- a/modules/brep/vertexFactory.js +++ b/modules/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 'geom/tolerance'; +import {Point} from 'geom/point'; export default class VertexFactory { diff --git a/modules/geom/impl/curve/curves-isec.js b/modules/geom/impl/curve/curves-isec.js index bed4c17a..02dded72 100644 --- a/modules/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 "../../../math/equality"; +import {areEqual} from "math/equality"; export default function curveIntersect(curve1, curve2, isecRange1, isecRange2, tesselator) { diff --git a/modules/math/vectorFactory.js b/modules/math/vectorFactory.js index 1527f285..1ffe4fab 100644 --- a/modules/math/vectorFactory.js +++ b/modules/math/vectorFactory.js @@ -1,4 +1,4 @@ -import {veqXYZ} from '../geom/tolerance'; +import {veqXYZ} from 'geom/tolerance'; import Vector from './vector'; export default class VectorFactory { diff --git a/modules/scene/cameraControlRenderer.js b/modules/scene/cameraControlRenderer.js index 447b70f5..5b516466 100644 --- a/modules/scene/cameraControlRenderer.js +++ b/modules/scene/cameraControlRenderer.js @@ -2,7 +2,7 @@ import {AmbientLight, PerspectiveCamera, Scene, SpotLight, WebGLRenderer} from ' import DPR from '../dpr'; import {MeshArrow} from './objects/auxiliary'; import * as SceneGraph from './sceneGraph'; -import {AXIS} from "../math/vector"; +import {AXIS} from "math/vector"; export default function(container) { diff --git a/modules/scene/objects/meshLine.js b/modules/scene/objects/meshLine.js index 8f4cf6d4..b73670e5 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 "../../geom/euclidean"; +import {perpendicularVector} from "geom/euclidean"; export function createMeshLineGeometry(points, width) { const vThree = arr => new Vector3().fromArray(arr); diff --git a/modules/scene/objects/scalableLine.js b/modules/scene/objects/scalableLine.js index 90eadcf0..3fa58b99 100644 --- a/modules/scene/objects/scalableLine.js +++ b/modules/scene/objects/scalableLine.js @@ -1,12 +1,12 @@ import {Face3, FaceColors, Geometry, Mesh, MeshBasicMaterial, MeshPhongMaterial} from 'three'; -import {advancePseudoFrenetFrame, frenetFrame, pseudoFrenetFrame} from '../../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'; import {getSceneSetup} from '../sceneSetup'; import calcFaceNormal from '../utils/calcFaceNormal'; import {BufferGeometry} from "three/src/core/BufferGeometry"; -import {ORIGIN} from "../../math/vector"; +import {ORIGIN} from "math/vector"; export default class ScalableLine extends Mesh { diff --git a/test/coreTests/testCases/solveSystems.js b/test/coreTests/testCases/solveSystems.js index 881d5a04..fbb8856b 100644 --- a/test/coreTests/testCases/solveSystems.js +++ b/test/coreTests/testCases/solveSystems.js @@ -1,5 +1,5 @@ import {assertEquals, assertFalse, assertTrue} from '../utils/asserts'; -import {NOOP} from '../../../modules/gems/func'; +import {NOOP} from 'gems/func'; export const TEST_MODE = 'sketcherUI'; diff --git a/web/app/cad/assembly/dof/EEEEDOF.ts b/web/app/cad/assembly/dof/EEEEDOF.ts index 781f748b..8f06ec8d 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 '../../../../../modules/geom/impl/plane'; +import { Plane } from '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 7096d939..7b85c88a 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 "geom/tolerance"; import {FaceTouchAlignConstraint} from "../constraints/faceTouchAlign"; -import {Plane} from '../../../../../modules/geom/impl/plane'; +import {Plane} from '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 cb244573..0626a270 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 '../../../../../modules/geom/impl/plane'; +import { Plane } from '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 9e1395bc..ec95ecd6 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 '../../../../../modules/geom/impl/plane'; +import { Plane } from '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 9520441b..58bfaccd 100644 --- a/web/app/cad/assembly/dof/sixDOF.ts +++ b/web/app/cad/assembly/dof/sixDOF.ts @@ -1,4 +1,4 @@ -import { Plane } from '../../../../../modules/geom/impl/plane'; +import { Plane } from '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/booleanOperation.js b/web/app/cad/craft/booleanOperation.js index 20b06908..e299ae8a 100644 --- a/web/app/cad/craft/booleanOperation.js +++ b/web/app/cad/craft/booleanOperation.js @@ -1,7 +1,7 @@ -import {intersect, subtract, union} from '../../../../modules/brep/operations/boolean'; -import {update as updateStitching} from '../../../../modules/brep/stitching'; -import {BREPValidator} from '../../../../modules/brep/brep-validator'; -import {Shell} from '../../../../modules/brep/topo/shell'; +import {intersect, subtract, union} from 'brep/operations/boolean'; +import {update as updateStitching} from 'brep/stitching'; +import {BREPValidator} from 'brep/brep-validator'; +import {Shell} from 'brep/topo/shell'; import {MBrepShell} from '../model/mshell'; const BoolOpMap = { diff --git a/web/app/cad/craft/cutExtrude/cutExtrude.js b/web/app/cad/craft/cutExtrude/cutExtrude.js index 751910a3..da253822 100644 --- a/web/app/cad/craft/cutExtrude/cutExtrude.js +++ b/web/app/cad/craft/cutExtrude/cutExtrude.js @@ -1,4 +1,4 @@ -import {enclose} from '../../../../../modules/brep/brep-enclose' +import {enclose} from 'brep/brep-enclose' import {BooleanOperation, combineShells} from '../booleanOperation' import {Matrix3x4} from 'math/matrix'; import {equal} from 'math/equality'; diff --git a/web/app/cad/craft/cutExtrude/previewer.js b/web/app/cad/craft/cutExtrude/previewer.js index 2878ad03..58de2b36 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 "../../../../../modules/geom/impl/curve/curve-tess"; +import {curveTessParams} from "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/datum/create/createDatumOperation.js b/web/app/cad/craft/datum/create/createDatumOperation.js index f5b0bdef..904137c6 100644 --- a/web/app/cad/craft/datum/create/createDatumOperation.js +++ b/web/app/cad/craft/datum/create/createDatumOperation.js @@ -2,11 +2,11 @@ import DatumWizard from './CreateDatumWizard'; import schema from './createDatumOpSchema'; import DatumObject3D from '../datumObject'; import * as SceneGraph from 'scene/sceneGraph'; -import CSys from '../../../../../../modules/math/csys'; +import CSys from 'math/csys'; import {MDatum} from '../../../model/mdatum'; import {roundInteractiveInput} from '../../wizard/roundUtils'; import {DatumParamsRenderer} from '../DatumParamsRenderer'; -import {pointAsText} from '../../../../../../modules/renders'; +import {pointAsText} from 'renders'; function updateCSys(csys, params, findFace) { csys.copy(CSys.ORIGIN); diff --git a/web/app/cad/craft/datum/csysObject.js b/web/app/cad/craft/datum/csysObject.js index 1859f07b..dae11e0a 100644 --- a/web/app/cad/craft/datum/csysObject.js +++ b/web/app/cad/craft/datum/csysObject.js @@ -1,7 +1,7 @@ import {MeshLambertMaterial, Object3D} from 'three'; import {MeshArrow} from 'scene/objects/auxiliary'; -import {viewScaleFactor} from '../../../../../modules/scene/scaleHelper'; -import {AXIS} from "../../../../../modules/math/vector"; +import {viewScaleFactor} from 'scene/scaleHelper'; +import {AXIS} from "math/vector"; export default class CSysObject3D extends Object3D { diff --git a/web/app/cad/craft/datum/move/moveDatumOperation.js b/web/app/cad/craft/datum/move/moveDatumOperation.js index 4c4573de..1c8e33b8 100644 --- a/web/app/cad/craft/datum/move/moveDatumOperation.js +++ b/web/app/cad/craft/datum/move/moveDatumOperation.js @@ -2,8 +2,8 @@ import schema from './moveDatumOpSchema'; import {MDatum} from '../../../model/mdatum'; import MoveDatumWizard from './MoveDatumWizard'; import {roundInteractiveInput} from '../../wizard/roundUtils'; -import {EMPTY_ARRAY} from '../../../../../../modules/gems/iterables'; -import {pointAsText} from '../../../../../../modules/renders'; +import {EMPTY_ARRAY} from 'gems/iterables'; +import {pointAsText} from 'renders'; import {DatumParamsRenderer} from '../DatumParamsRenderer'; diff --git a/web/app/cad/craft/datum/rotate/rotateDatumOperation.js b/web/app/cad/craft/datum/rotate/rotateDatumOperation.js index 626d154a..8698b609 100644 --- a/web/app/cad/craft/datum/rotate/rotateDatumOperation.js +++ b/web/app/cad/craft/datum/rotate/rotateDatumOperation.js @@ -1,9 +1,9 @@ import schema from './rotateDatumOpSchema'; import {MDatum} from '../../../model/mdatum'; import RotateDatumWizard from './RotateDatumWizard'; -import {DEG_RAD} from '../../../../../../modules/math/commons'; -import {Matrix3x4} from "../../../../../../modules/math/matrix"; -import {ORIGIN} from "../../../../../../modules/math/vector"; +import {DEG_RAD} from 'math/commons'; +import {Matrix3x4} from "math/matrix"; +import {ORIGIN} from "math/vector"; function rotate(params, {cadRegistry}) { diff --git a/web/app/cad/craft/loft/loftPreviewer.js b/web/app/cad/craft/loft/loftPreviewer.js index 9282a163..20e6a4b5 100644 --- a/web/app/cad/craft/loft/loftPreviewer.js +++ b/web/app/cad/craft/loft/loftPreviewer.js @@ -1,4 +1,4 @@ -import {createSmoothMeshGeometryFromData} from '../../../../../modules/scene/geoms'; +import {createSmoothMeshGeometryFromData} from 'scene/geoms'; export function loftPreviewGeomProvider(params, services) { diff --git a/web/app/cad/craft/primitives/cone/coneOperation.js b/web/app/cad/craft/primitives/cone/coneOperation.js index bc1ee8b0..5bce71c5 100644 --- a/web/app/cad/craft/primitives/cone/coneOperation.js +++ b/web/app/cad/craft/primitives/cone/coneOperation.js @@ -2,8 +2,8 @@ import {Mesh, ConeGeometry, Matrix4, CylinderGeometry} from 'three'; import schema from './coneOpSchema'; import ConeWizard from './ConeWizard'; import {IMAGINARY_SURFACE_MATERIAL} from '../../../preview/scenePreviewer'; -import CSys from '../../../../../../modules/math/csys'; -import * as SceneGraph from '../../../../../../modules/scene/sceneGraph'; +import CSys from 'math/csys'; +import * as SceneGraph from 'scene/sceneGraph'; import datumConsumingOperation from '../datumConsumingOperation'; import {assignBooleanParams} from '../booleanOptionHelper'; diff --git a/web/app/cad/craft/primitives/datumConsumingOperation.js b/web/app/cad/craft/primitives/datumConsumingOperation.js index 1e6adc99..8d77bc7c 100644 --- a/web/app/cad/craft/primitives/datumConsumingOperation.js +++ b/web/app/cad/craft/primitives/datumConsumingOperation.js @@ -1,4 +1,4 @@ -import CSys from '../../../../../modules/math/csys'; +import CSys from 'math/csys'; export default function datumConsumingOperation(params, services, run) { let mDatum = params.datum && services.cadRegistry.findDatum(params.datum); diff --git a/web/app/cad/craft/primitives/plane/planeOperation.js b/web/app/cad/craft/primitives/plane/planeOperation.js index aafed345..423880fa 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 '../../../../../../modules/geom/impl/plane'; +import {Plane} from '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/primitivePreviewer.js b/web/app/cad/craft/primitives/primitivePreviewer.js index d39b7e08..c3454eec 100644 --- a/web/app/cad/craft/primitives/primitivePreviewer.js +++ b/web/app/cad/craft/primitives/primitivePreviewer.js @@ -1,7 +1,7 @@ import {BoxGeometry, Matrix4, Mesh} from 'three'; import {IMAGINARY_SURFACE_MATERIAL} from '../../preview/scenePreviewer'; -import CSys from '../../../../../modules/math/csys'; -import * as SceneGraph from '../../../../../modules/scene/sceneGraph'; +import CSys from 'math/csys'; +import * as SceneGraph from 'scene/sceneGraph'; export default function primitivePreviewer(createThreePrimitiveGeometry, paramsToScales, shift) { return function previewer(ctx, initialParams) { diff --git a/web/app/cad/craft/primitives/simplePlane/simplePlaneOperation.js b/web/app/cad/craft/primitives/simplePlane/simplePlaneOperation.js index 41ca9069..b5e89f5a 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 '../../../../../../modules/geom/impl/plane'; +import {Plane} from 'geom/impl/plane'; import Vector from 'math/vector'; import PlaneWizard from './SimplePlaneWizard'; import {MOpenFaceShell} from '../../../model/mopenFace'; diff --git a/web/app/cad/craft/primitives/torus/torusOperation.js b/web/app/cad/craft/primitives/torus/torusOperation.js index 502068e3..5f2e7ec9 100644 --- a/web/app/cad/craft/primitives/torus/torusOperation.js +++ b/web/app/cad/craft/primitives/torus/torusOperation.js @@ -2,8 +2,8 @@ import {Mesh, TorusGeometry} from 'three'; import schema from './torusOpSchema'; import TorusWizard from './TorusWizard'; import {IMAGINARY_SURFACE_MATERIAL} from '../../../preview/scenePreviewer'; -import CSys from '../../../../../../modules/math/csys'; -import * as SceneGraph from '../../../../../../modules/scene/sceneGraph'; +import CSys from 'math/csys'; +import * as SceneGraph from 'scene/sceneGraph'; import datumConsumingOperation from '../datumConsumingOperation'; import {assignBooleanParams} from '../booleanOptionHelper'; diff --git a/web/app/cad/craft/revolve/revolveOperation.js b/web/app/cad/craft/revolve/revolveOperation.js index 763226ed..f6694df9 100644 --- a/web/app/cad/craft/revolve/revolveOperation.js +++ b/web/app/cad/craft/revolve/revolveOperation.js @@ -1,7 +1,7 @@ import RevolveForm from './RevolveForm'; import schema from './schema'; import {createRevolvePreviewGeomProvider, revolvePreviewGeomProvider} from './revolvePreviewer'; -import {NOOP} from '../../../../../modules/gems/func'; +import {NOOP} from 'gems/func'; export default { id: 'REVOLVE', diff --git a/web/app/cad/craft/revolve/revolvePreviewer.js b/web/app/cad/craft/revolve/revolvePreviewer.js index df6389fc..da32105c 100644 --- a/web/app/cad/craft/revolve/revolvePreviewer.js +++ b/web/app/cad/craft/revolve/revolvePreviewer.js @@ -1,5 +1,5 @@ import {createMeshGeometry} from 'scene/geoms'; -import {DEG_RAD} from '../../../../../modules/math/commons'; +import {DEG_RAD} from 'math/commons'; import {revolveToTriangles} from '../../legacy/mesh/revolve'; let cache = {}; diff --git a/web/app/cad/craft/spatialCurve/editor/controlPointObject.js b/web/app/cad/craft/spatialCurve/editor/controlPointObject.js index ba23d162..4e0fe51e 100644 --- a/web/app/cad/craft/spatialCurve/editor/controlPointObject.js +++ b/web/app/cad/craft/spatialCurve/editor/controlPointObject.js @@ -6,7 +6,7 @@ import { SphereGeometry, Vector2, Vector3 } from 'three'; import {CSYS_SIZE_MODEL} from '../../datum/csysObject'; -import {DisposableMesh} from '../../../../../../modules/scene/objects/disposableMesh'; +import {DisposableMesh} from 'scene/objects/disposableMesh'; export default class ControlPointObject3D extends DatumObject3D { diff --git a/web/app/cad/craft/spatialCurve/spatialCurveOperation.js b/web/app/cad/craft/spatialCurve/spatialCurveOperation.js index f0a06d94..2f596087 100644 --- a/web/app/cad/craft/spatialCurve/spatialCurveOperation.js +++ b/web/app/cad/craft/spatialCurve/spatialCurveOperation.js @@ -1,4 +1,4 @@ -import CSys from '../../../../../modules/math/csys'; +import CSys from 'math/csys'; import {MDatum} from '../../model/mdatum'; import spatialCurveOpSchema from './spatialCurveOpSchema'; diff --git a/web/app/cad/craft/ui/HistoryTimeline.jsx b/web/app/cad/craft/ui/HistoryTimeline.jsx index ecbe8203..205ff339 100644 --- a/web/app/cad/craft/ui/HistoryTimeline.jsx +++ b/web/app/cad/craft/ui/HistoryTimeline.jsx @@ -1,16 +1,16 @@ import React from 'react'; import ls from './HistoryTimeline.less'; import connect from 'ui/connect'; -import decoratorChain from '../../../../../modules/ui/decoratorChain'; +import decoratorChain from 'ui/decoratorChain'; import {finishHistoryEditing, removeAndDropDependants} from '../craftHistoryUtils'; -import mapContext from '../../../../../modules/ui/mapContext'; +import mapContext from 'ui/mapContext'; import ImgIcon from 'ui/components/ImgIcon'; import cx from 'classnames'; -import Fa from '../../../../../modules/ui/components/Fa'; +import Fa from 'ui/components/Fa'; import {menuAboveElementHint} from '../../dom/menu/menuUtils'; import {combine} from 'lstream'; -import {EMPTY_OBJECT} from '../../../../../modules/gems/objects'; -import {aboveElement} from '../../../../../modules/ui/positionUtils'; +import {EMPTY_OBJECT} from 'gems/objects'; +import {aboveElement} from 'ui/positionUtils'; @connect(streams => combine(streams.craft.modifications, streams.operation.registry, streams.wizard.insertOperation) .map(([modifications, operationRegistry, insertOperationReq]) => ({ diff --git a/web/app/cad/craft/ui/OperationHistory.jsx b/web/app/cad/craft/ui/OperationHistory.jsx index ff916563..1cf1c82f 100644 --- a/web/app/cad/craft/ui/OperationHistory.jsx +++ b/web/app/cad/craft/ui/OperationHistory.jsx @@ -10,7 +10,7 @@ import Button from 'ui/components/controls/Button'; import {finishHistoryEditing, removeAndDropDependants} from '../craftHistoryUtils'; import mapContext from 'ui/mapContext'; import decoratorChain from 'ui/decoratorChain'; -import {EMPTY_OBJECT} from '../../../../../modules/gems/objects'; +import {EMPTY_OBJECT} from 'gems/objects'; function OperationHistory({history, pointer, setHistoryPointer, remove, getOperation}) { let lastMod = history.length - 1; diff --git a/web/app/cad/craft/ui/SelectedModificationInfo.jsx b/web/app/cad/craft/ui/SelectedModificationInfo.jsx index 705cfe2a..da073cfb 100644 --- a/web/app/cad/craft/ui/SelectedModificationInfo.jsx +++ b/web/app/cad/craft/ui/SelectedModificationInfo.jsx @@ -1,14 +1,14 @@ import React from 'react'; import connect from 'ui/connect'; import Widget from 'ui/components/Widget'; -import decoratorChain from '../../../../../modules/ui/decoratorChain'; -import {combine, merger} from '../../../../../modules/lstream'; +import decoratorChain from 'ui/decoratorChain'; +import {combine, merger} from 'lstream'; import ls from './SelectedModificationInfo.less'; import ImgIcon from 'ui/components/ImgIcon'; import mapContext from 'ui/mapContext'; -import {EMPTY_OBJECT} from '../../../../../modules/gems/objects'; -import ButtonGroup from '../../../../../modules/ui/components/controls/ButtonGroup'; -import Button from '../../../../../modules/ui/components/controls/Button'; +import {EMPTY_OBJECT} from 'gems/objects'; +import ButtonGroup from 'ui/components/controls/ButtonGroup'; +import Button from 'ui/components/controls/Button'; import {removeAndDropDependants} from '../craftHistoryUtils'; import RenderObject from 'ui/components/RenderObject'; diff --git a/web/app/cad/craft/wizard/components/form/EntityList.jsx b/web/app/cad/craft/wizard/components/form/EntityList.jsx index b6477a5a..3af44cc9 100644 --- a/web/app/cad/craft/wizard/components/form/EntityList.jsx +++ b/web/app/cad/craft/wizard/components/form/EntityList.jsx @@ -5,7 +5,7 @@ import Field from 'ui/components/controls/Field'; import Fa from 'ui/components/Fa'; import {attachToForm} from './Form'; import {camelCaseSplitToStr} from 'gems/camelCaseSplit'; -import {EMPTY_ARRAY, removeInPlace} from '../../../../../../../modules/gems/iterables'; +import {EMPTY_ARRAY, removeInPlace} from 'gems/iterables'; @attachToForm export default class EntityList extends React.Component { diff --git a/web/app/cad/craft/wizard/wizardPlugin.js b/web/app/cad/craft/wizard/wizardPlugin.js index d6296522..4269d8f5 100644 --- a/web/app/cad/craft/wizard/wizardPlugin.js +++ b/web/app/cad/craft/wizard/wizardPlugin.js @@ -4,7 +4,7 @@ import {clone, EMPTY_OBJECT} from 'gems/objects'; import materializeParams from '../materializeParams'; import {createFunctionList} from 'gems/func'; import {onParamsUpdate} from '../cutExtrude/extrudeOperation'; -import {propsChangeTracker} from '../../../../../modules/lstream/utils'; +import {propsChangeTracker} from 'lstream/utils'; export function activate(ctx) { diff --git a/web/app/cad/debugPlugin.js b/web/app/cad/debugPlugin.js index 47bf105e..349a3560 100644 --- a/web/app/cad/debugPlugin.js +++ b/web/app/cad/debugPlugin.js @@ -6,8 +6,8 @@ import Vector from 'math/vector'; import * as vec from 'math/vec'; import React from 'react'; import {readSketchFloat} from './sketch/sketchReader'; -import {toLoops} from '../../../modules/brep/io/brepLoopsFormat'; -import curveTess from '../../../modules/geom/impl/curve/curve-tess'; +import {toLoops} from 'brep/io/brepLoopsFormat'; +import curveTess from 'geom/impl/curve/curve-tess'; import {LOG_FLAGS} from './logFlags'; import {state} from "lstream"; diff --git a/web/app/cad/dom/components/HeadsUpToolbar.jsx b/web/app/cad/dom/components/HeadsUpToolbar.jsx index 859b10e9..5b2b4114 100644 --- a/web/app/cad/dom/components/HeadsUpToolbar.jsx +++ b/web/app/cad/dom/components/HeadsUpToolbar.jsx @@ -3,7 +3,7 @@ import connect from 'ui/connect'; import Toolbar from 'ui/components/Toolbar'; import {ConnectedActionButton, ToolbarActionButtons} from './PlugableToolbar'; import ls from './HeadsUpToolbar.less'; -import {combine} from '../../../../../modules/lstream'; +import {combine} from 'lstream'; export const HeadsUpToolbar = connect(streams => combine( streams.ui.toolbars.headsUp, diff --git a/web/app/cad/dom/components/PlugableControlBar.jsx b/web/app/cad/dom/components/PlugableControlBar.jsx index 34dc58cd..34d5e408 100644 --- a/web/app/cad/dom/components/PlugableControlBar.jsx +++ b/web/app/cad/dom/components/PlugableControlBar.jsx @@ -5,7 +5,7 @@ import Fa from 'ui/components/Fa'; import {toIdAndOverrides} from '../../actions/actionRef'; import {isMenuAction} from '../menu/menuPlugin'; import {menuAboveElementHint} from '../menu/menuUtils'; -import {useStream} from "../../../../../modules/ui/effects"; +import {useStream} from "ui/effects"; import {ActionButtonBehavior} from "../../actions/ActionButtonBehavior"; export default function PlugableControlBar() { diff --git a/web/app/cad/dom/components/PlugableToolbar.jsx b/web/app/cad/dom/components/PlugableToolbar.jsx index 8cea9664..84f0c667 100644 --- a/web/app/cad/dom/components/PlugableToolbar.jsx +++ b/web/app/cad/dom/components/PlugableToolbar.jsx @@ -6,7 +6,7 @@ import {toIdAndOverrides} from '../../actions/actionRef'; import {ActionButtonBehavior} from '../../actions/ActionButtonBehavior'; import capitalize from 'gems/capitalize'; import {combine} from 'lstream'; -import {useStream} from "../../../../../modules/ui/effects"; +import {useStream} from "ui/effects"; import {NoIcon} from "../../../sketcher/icons/NoIcon"; function ConfigurableToolbar({actions, size, ...props}) { diff --git a/web/app/cad/dom/components/WebApplication.jsx b/web/app/cad/dom/components/WebApplication.jsx index c4225f67..78ba5d78 100644 --- a/web/app/cad/dom/components/WebApplication.jsx +++ b/web/app/cad/dom/components/WebApplication.jsx @@ -2,7 +2,7 @@ import React from 'react'; import 'ui/styles/global/index.less'; import AppTabs from "./AppTabs"; -import {StreamsContext} from "../../../../../modules/ui/streamsContext"; +import {StreamsContext} from "ui/streamsContext"; import {AppContext} from "./AppContext"; export default function WebApplication(props) { diff --git a/web/app/cad/dom/menu/MenuHolder.jsx b/web/app/cad/dom/menu/MenuHolder.jsx index 1d517cdc..6ef13f8a 100644 --- a/web/app/cad/dom/menu/MenuHolder.jsx +++ b/web/app/cad/dom/menu/MenuHolder.jsx @@ -5,7 +5,7 @@ import Fa from 'ui/components/Fa'; import {ActionButtonBehavior} from '../../actions/ActionButtonBehavior'; import connect from 'ui/connect'; import {combine, merger} from 'lstream'; -import {useStream} from "../../../../../modules/ui/effects"; +import {useStream} from "ui/effects"; function MenuHolder({menus}) { return menus.map(({id, actions}) => ); diff --git a/web/app/cad/dom/menu/menuPlugin.js b/web/app/cad/dom/menu/menuPlugin.js index a96bb5b5..6faa0203 100644 --- a/web/app/cad/dom/menu/menuPlugin.js +++ b/web/app/cad/dom/menu/menuPlugin.js @@ -1,4 +1,4 @@ -import {state} from '../../../../../modules/lstream'; +import {state} from 'lstream'; export function activate({services, streams}) { diff --git a/web/app/cad/exposure/exposure.js b/web/app/cad/exposure/exposure.js index e4965723..f24ffb97 100644 --- a/web/app/cad/exposure/exposure.js +++ b/web/app/cad/exposure/exposure.js @@ -1,21 +1,21 @@ -import * as BREPPrimitives from '../../../../modules/brep/brep-primitives' -import BrepBuilder, {createBoundingSurface} from '../../../../modules/brep/brep-builder' -import {createPrism} from '../../../../modules/brep/brep-enclose' -import * as BREPBool from '../../../../modules/brep/operations/boolean' -import * as IO from '../../../../modules/brep/io/brepLoopsFormat' -import {BREPValidator} from '../../../../modules/brep/brep-validator' -import {Edge} from '../../../../modules/brep/topo/edge'; -import {Loop} from '../../../../modules/brep/topo/loop'; -import {Face} from '../../../../modules/brep/topo/face'; -import {Shell} from '../../../../modules/brep/topo/shell'; -import {Vertex} from '../../../../modules/brep/topo/vertex'; -import {Point} from '../../../../modules/geom/point'; -import BrepCurve from '../../../../modules/geom/curves/brepCurve'; -import {Plane} from '../../../../modules/geom/impl/plane'; +import * as BREPPrimitives from 'brep/brep-primitives' +import BrepBuilder, {createBoundingSurface} from 'brep/brep-builder' +import {createPrism} from 'brep/brep-enclose' +import * as BREPBool from 'brep/operations/boolean' +import * as IO from 'brep/io/brepLoopsFormat' +import {BREPValidator} from 'brep/brep-validator' +import {Edge} from 'brep/topo/edge'; +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 'geom/point'; +import BrepCurve from 'geom/curves/brepCurve'; +import {Plane} from 'geom/impl/plane'; import pip from '../tess/pip'; import {readShellEntityFromJson} from '../scene/wrappers/entityIO'; import * as vec from 'math/vec' -import NurbsSurface from '../../../../modules/geom/surfaces/nurbsSurface'; +import NurbsSurface from 'geom/surfaces/nurbsSurface'; export default { diff --git a/web/app/cad/legacy/brep/revolve.js b/web/app/cad/legacy/brep/revolve.js index 45f4f09d..b2fd6d9a 100644 --- a/web/app/cad/legacy/brep/revolve.js +++ b/web/app/cad/legacy/brep/revolve.js @@ -1,6 +1,6 @@ import {BooleanOperation, combineShells} from './boolean-operation' import {ReadSketchFromFace} from '../../sketch/sketchReader' -import {revolve} from '../../../../../modules/brep/brep-builder' +import {revolve} from 'brep/brep-builder' export function Revolve(app, params) { diff --git a/web/app/cad/legacy/brep/wizards/revolve-wizard.js b/web/app/cad/legacy/brep/wizards/revolve-wizard.js index 38e4f861..b8758a64 100644 --- a/web/app/cad/legacy/brep/wizards/revolve-wizard.js +++ b/web/app/cad/legacy/brep/wizards/revolve-wizard.js @@ -1,7 +1,7 @@ import {CURRENT_SELECTION as S} from './wizard' import {PreviewWizard, SketchBasedNurbsPreviewer } from './preview-wizard' import {TriangulatePolygons} from '../../../tess/triangulation' -import {revolveToWallNurbs} from '../../../../../../modules/brep/brep-builder' +import {revolveToWallNurbs} from 'brep/brep-builder' import {evalPivot} from '../revolve' import Vector from 'math/vector'; diff --git a/web/app/cad/legacy/mesh/wizards/plane.js b/web/app/cad/legacy/mesh/wizards/plane.js index 2e194b64..e83d827e 100644 --- a/web/app/cad/legacy/mesh/wizards/plane.js +++ b/web/app/cad/legacy/mesh/wizards/plane.js @@ -2,7 +2,7 @@ import * as tk from '../../../../ui/toolkit.js' import {FACE_COLOR} from '../../../cad-utils' import {Wizard} from './wizard-commons' import {IDENTITY_BASIS} from 'math/basis'; -import {AXIS} from "../../../../../../modules/math/vector"; +import {AXIS} from "math/vector"; export function PlaneWizard(app, initParams) { Wizard.call(this, app.viewer, initParams); diff --git a/web/app/cad/legacy/mesh/wizards/transform.js b/web/app/cad/legacy/mesh/wizards/transform.js index 4a7854c5..9d948208 100644 --- a/web/app/cad/legacy/mesh/wizards/transform.js +++ b/web/app/cad/legacy/mesh/wizards/transform.js @@ -1,8 +1,8 @@ import * as tk from '../../../../ui/toolkit.js' import {FACE_COLOR} from '../../../cad-utils' import {Wizard} from './wizard-commons' -import {IDENTITY_BASIS} from "../../../../../../modules/math/basis"; -import {AXIS} from "../../../../../../modules/math/vector"; +import {IDENTITY_BASIS} from "math/basis"; +import {AXIS} from "math/vector"; export function TransformWizard(viewer, solid, initParams) { Wizard.call(this, viewer, initParams); diff --git a/web/app/cad/legacy/mesh/workbench.js b/web/app/cad/legacy/mesh/workbench.js index 417254f1..f88934fc 100644 --- a/web/app/cad/legacy/mesh/workbench.js +++ b/web/app/cad/legacy/mesh/workbench.js @@ -4,9 +4,9 @@ import {HashTable} from '../../../utils/hashmap' import {Mesh} from '../mesh' 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/geom/euclidean"; +import {distanceAB3} from "math/distance"; +import {areEqual, equal, strictEqual} from "math/equality"; +import {isPointInsidePolygon} from "geom/euclidean"; export function sortPolygons(polygons) { function Loop(polygon) { diff --git a/web/app/cad/model/surfacePrototype.js b/web/app/cad/model/surfacePrototype.js index 4fff7bca..2c79193c 100644 --- a/web/app/cad/model/surfacePrototype.js +++ b/web/app/cad/model/surfacePrototype.js @@ -1,6 +1,6 @@ -import {createBoundingSurfaceFrom2DPoints} from '../../../../modules/brep/brep-builder'; -import NurbsSurface from '../../../../modules/geom/surfaces/nurbsSurface'; -import {BrepSurface} from '../../../../modules/geom/surfaces/brepSurface'; +import {createBoundingSurfaceFrom2DPoints} from 'brep/brep-builder'; +import NurbsSurface from 'geom/surfaces/nurbsSurface'; +import {BrepSurface} from 'geom/surfaces/brepSurface'; export class SurfacePrototype { diff --git a/web/app/cad/projectManager/projectManagerPlugin.ts b/web/app/cad/projectManager/projectManagerPlugin.ts index ee9ce02a..92678df7 100644 --- a/web/app/cad/projectManager/projectManagerPlugin.ts +++ b/web/app/cad/projectManager/projectManagerPlugin.ts @@ -1,6 +1,6 @@ import {PROJECTS_PREFIX, SKETCH_SUFFIX} from '../projectPlugin'; import {ProjectManager} from './ProjectManager'; -import exportTextData from '../../../../modules/gems/exportTextData'; +import exportTextData from 'gems/exportTextData'; import {SketchFormat_V3} from "../../sketcher/io"; import {ApplicationContext} from "context"; import {OperationRequest} from "../craft/craftPlugin"; diff --git a/web/app/cad/sandbox.js b/web/app/cad/sandbox.js index 6b6d1a3b..2714d7f5 100644 --- a/web/app/cad/sandbox.js +++ b/web/app/cad/sandbox.js @@ -1,12 +1,12 @@ -import BrepBuilder from '../../../modules/brep/brep-builder' -import * as BREPPrimitives from '../../../modules/brep/brep-primitives' -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 BrepBuilder from 'brep/brep-builder' +import * as BREPPrimitives from 'brep/brep-primitives' +import BrepCurve from 'geom/curves/brepCurve'; +import NurbsCurve from "geom/curves/nurbsCurve"; +import {surfaceIntersect} from 'geom/intersection/surfaceSurface'; +import NurbsSurface from 'geom/surfaces/nurbsSurface'; +import {createOctreeFromSurface, traverseOctree} from "voxels/octree"; import {Matrix3x4} from 'math/matrix'; -import {AXIS, ORIGIN} from "../../../modules/math/vector"; +import {AXIS, ORIGIN} from "math/vector"; export function runSandbox({bus, services, services: { viewer, cadScene, cadRegistry, exposure, exposure: {addShellOnScene} }}) { diff --git a/web/app/cad/scene/controls/defaultSelectionState.js b/web/app/cad/scene/controls/defaultSelectionState.js index a06e99de..6fe91b0b 100644 --- a/web/app/cad/scene/controls/defaultSelectionState.js +++ b/web/app/cad/scene/controls/defaultSelectionState.js @@ -1,4 +1,4 @@ -import {state} from '../../../../../modules/lstream'; +import {state} from 'lstream'; import {DATUM, EDGE, FACE, SHELL, SKETCH_OBJECT} from '../entites'; const SELECTABLE_ENTITIES = [FACE, EDGE, SKETCH_OBJECT, DATUM, SHELL]; diff --git a/web/app/cad/scene/entityContextPlugin.js b/web/app/cad/scene/entityContextPlugin.js index ed0b47dc..b9048e14 100644 --- a/web/app/cad/scene/entityContextPlugin.js +++ b/web/app/cad/scene/entityContextPlugin.js @@ -1,9 +1,9 @@ import {state} from 'lstream'; import {addToListInMap} from 'gems/iterables'; -import {EMPTY_ARRAY} from '../../../../modules/gems/iterables'; +import {EMPTY_ARRAY} from 'gems/iterables'; import {DATUM, FACE, SHELL, SKETCH_OBJECT, EDGE, LOOP} from './entites'; -import {combine} from "../../../../modules/lstream"; +import {combine} from "lstream"; export const SELECTABLE_ENTITIES = [FACE, EDGE, SKETCH_OBJECT, DATUM, SHELL]; diff --git a/web/app/cad/scene/selectionMarker/selectionMarker.js b/web/app/cad/scene/selectionMarker/selectionMarker.js index f2cdf5c0..f74507b8 100644 --- a/web/app/cad/scene/selectionMarker/selectionMarker.js +++ b/web/app/cad/scene/selectionMarker/selectionMarker.js @@ -1,4 +1,4 @@ -import * as stitching from '../../../../../modules/brep/stitching' +import * as stitching from 'brep/stitching' import {AbstractSelectionMarker, setFacesColor} from "./abstractSelectionMarker"; export class SelectionMarker extends AbstractSelectionMarker { diff --git a/web/app/cad/scene/viewSyncPlugin.js b/web/app/cad/scene/viewSyncPlugin.js index ec9699c6..b44b134c 100644 --- a/web/app/cad/scene/viewSyncPlugin.js +++ b/web/app/cad/scene/viewSyncPlugin.js @@ -1,6 +1,6 @@ -import * as SceneGraph from '../../../../modules/scene/sceneGraph'; +import * as SceneGraph from 'scene/sceneGraph'; import {ShellView} from './views/shellView'; -import {getAttribute} from '../../../../modules/scene/objectData'; +import {getAttribute} from 'scene/objectData'; import {MOpenFaceShell} from '../model/mopenFace'; import {OpenFaceShellView} from './views/openFaceView'; import {MShell} from '../model/mshell'; diff --git a/web/app/cad/scene/views/faceView.js b/web/app/cad/scene/views/faceView.js index e3d1e5a2..a5d17ac8 100644 --- a/web/app/cad/scene/views/faceView.js +++ b/web/app/cad/scene/views/faceView.js @@ -1,7 +1,7 @@ -import {setAttribute} from '../../../../../modules/scene/objectData'; +import {setAttribute} from 'scene/objectData'; import {brepFaceToGeom, tessDataToGeom} from '../wrappers/brepSceneObject'; import {FACE} from '../entites'; -import * as SceneGraph from '../../../../../modules/scene/sceneGraph'; +import * as SceneGraph from 'scene/sceneGraph'; import {SketchObjectView} from './sketchObjectView'; import {View} from './view'; import {SketchLoopView} from './sketchLoopView'; diff --git a/web/app/cad/scene/views/openFaceView.js b/web/app/cad/scene/views/openFaceView.js index 91ea5e32..5111f910 100644 --- a/web/app/cad/scene/views/openFaceView.js +++ b/web/app/cad/scene/views/openFaceView.js @@ -1,4 +1,4 @@ -import {setAttribute} from '../../../../../modules/scene/objectData'; +import {setAttribute} from 'scene/objectData'; import {FACE, SHELL} from '../entites'; import {NULL_COLOR, SELECTION_COLOR, setFacesColor, SketchingView} from './faceView'; import {View} from './view'; diff --git a/web/app/cad/scene/views/shellView.js b/web/app/cad/scene/views/shellView.js index a6f73b32..410fb1d3 100644 --- a/web/app/cad/scene/views/shellView.js +++ b/web/app/cad/scene/views/shellView.js @@ -1,6 +1,6 @@ import {View} from './view'; -import * as SceneGraph from '../../../../../modules/scene/sceneGraph'; -import {getAttribute, setAttribute} from '../../../../../modules/scene/objectData'; +import * as SceneGraph from 'scene/sceneGraph'; +import {getAttribute, setAttribute} from 'scene/objectData'; import {createSolidMaterial} from '../wrappers/sceneObject'; import {FaceView, SELECTION_COLOR} from './faceView'; import {EdgeView} from './edgeView'; diff --git a/web/app/cad/scene/views/sketchLoopView.js b/web/app/cad/scene/views/sketchLoopView.js index 5575e39b..4e73c2ad 100644 --- a/web/app/cad/scene/views/sketchLoopView.js +++ b/web/app/cad/scene/views/sketchLoopView.js @@ -5,9 +5,9 @@ import {createSolidMaterial} from '../wrappers/sceneObject'; import {DoubleSide, Geometry, Mesh} from 'three'; import {surfaceAndPolygonsToGeom} from '../wrappers/brepSceneObject'; import {TriangulatePolygons} from '../../tess/triangulation'; -import Vector from '../../../../../modules/math/vector'; +import Vector from 'math/vector'; import {LOOP} from '../entites'; -import {setAttribute} from '../../../../../modules/scene/objectData'; +import {setAttribute} from 'scene/objectData'; export class SketchLoopView extends MarkTracker(View) { constructor(mLoop) { diff --git a/web/app/cad/scene/views/vertexView.js b/web/app/cad/scene/views/vertexView.js index 67c1c2c0..a8fc8ff2 100644 --- a/web/app/cad/scene/views/vertexView.js +++ b/web/app/cad/scene/views/vertexView.js @@ -1,7 +1,7 @@ import {View} from './view'; import {Mesh, MeshBasicMaterial, SphereGeometry} from 'three'; import {CSYS_SIZE_MODEL} from '../../craft/datum/csysObject'; -import {ConstantScaleGroup} from "../../../../../modules/scene/scaleHelper"; +import {ConstantScaleGroup} from "scene/scaleHelper"; export class VertexView extends View { diff --git a/web/app/cad/scene/wrappers/brepSceneObject.js b/web/app/cad/scene/wrappers/brepSceneObject.js index f85e5309..1021a5d9 100644 --- a/web/app/cad/scene/wrappers/brepSceneObject.js +++ b/web/app/cad/scene/wrappers/brepSceneObject.js @@ -1,8 +1,8 @@ import Vector from 'math/vector'; import {SceneEdge, SceneFace, SceneSolid} from './sceneObject'; import brepTess from '../../tess/brep-tess'; -import tessellateSurface from '../../../../../modules/geom/surfaces/surfaceTess'; -import {setAttribute} from '../../../../../modules/scene/objectData'; +import tessellateSurface from 'geom/surfaces/surfaceTess'; +import {setAttribute} from 'scene/objectData'; import * as vec from 'math/vec'; import {perpendicularVector} from "geom/euclidean"; diff --git a/web/app/cad/scene/wrappers/entityIO.js b/web/app/cad/scene/wrappers/entityIO.js index 5376696d..94f8dc78 100644 --- a/web/app/cad/scene/wrappers/entityIO.js +++ b/web/app/cad/scene/wrappers/entityIO.js @@ -1,6 +1,6 @@ -import {readBrep} from '../../../../../modules/brep/io/brepIO'; +import {readBrep} from 'brep/io/brepIO'; import {MBrepShell} from '../../model/mshell'; -import CSys from '../../../../../modules/math/csys'; +import CSys from 'math/csys'; export function readShellEntityFromJson(data, consumed, csys) { diff --git a/web/app/cad/scene/wrappers/planeSceneObject.js b/web/app/cad/scene/wrappers/planeSceneObject.js index 42ef9f87..3b2db719 100644 --- a/web/app/cad/scene/wrappers/planeSceneObject.js +++ b/web/app/cad/scene/wrappers/planeSceneObject.js @@ -1,6 +1,6 @@ import Vector from 'math/vector'; import {SceneFace, SceneSolid} from './sceneObject'; -import {createBoundingSurfaceFrom2DPoints} from '../../../../../modules/brep/brep-builder'; +import {createBoundingSurfaceFrom2DPoints} from 'brep/brep-builder'; const INIT_WIDTH_H = 750 * 0.5; const INIT_HEIGHT_H = 750 * 0.5; diff --git a/web/app/cad/sketch/components/InplaceSketcher.jsx b/web/app/cad/sketch/components/InplaceSketcher.jsx index 246839a2..6c67f338 100644 --- a/web/app/cad/sketch/components/InplaceSketcher.jsx +++ b/web/app/cad/sketch/components/InplaceSketcher.jsx @@ -1,6 +1,6 @@ import React from 'react'; -import {useStream} from "../../../../../modules/ui/effects"; -import {StreamsContext} from "../../../../../modules/ui/streamsContext"; +import {useStream} from "ui/effects"; +import {StreamsContext} from "ui/streamsContext"; import {SketcherAppContext} from "../../../sketcher/components/SketcherAppContext"; import {Scope} from "../../../sketcher/components/Scope"; diff --git a/web/app/cad/sketch/components/SketcherMode.jsx b/web/app/cad/sketch/components/SketcherMode.jsx index bccde382..e36a6e71 100644 --- a/web/app/cad/sketch/components/SketcherMode.jsx +++ b/web/app/cad/sketch/components/SketcherMode.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import {useStream} from "../../../../../modules/ui/effects"; +import {useStream} from "ui/effects"; export default function SketcherMode({children}) { diff --git a/web/app/cad/sketch/inPlaceSketcher.js b/web/app/cad/sketch/inPlaceSketcher.js index c34e0f6b..33bd2342 100644 --- a/web/app/cad/sketch/inPlaceSketcher.js +++ b/web/app/cad/sketch/inPlaceSketcher.js @@ -5,7 +5,7 @@ import DPR from 'dpr'; import {SKETCHER_MODE_HEADS_UP_ACTIONS} from "./sketcherUIContrib"; import {createEssentialAppContext} from "../../sketcher/sketcherContext"; import {STANDARD_MODE_HEADS_UP_TOOLBAR} from "../part/uiConfigPlugin"; -import {ORIGIN} from "../../../../modules/math/vector"; +import {ORIGIN} from "math/vector"; export class InPlaceSketcher { diff --git a/web/app/cad/sketch/reassignSketchMode.js b/web/app/cad/sketch/reassignSketchMode.js index 026ae6dc..d10a518e 100644 --- a/web/app/cad/sketch/reassignSketchMode.js +++ b/web/app/cad/sketch/reassignSketchMode.js @@ -1,6 +1,6 @@ import React from 'react'; -import mapContext from '../../../../modules/ui/mapContext'; -import Button from '../../../../modules/ui/components/controls/Button'; +import mapContext from 'ui/mapContext'; +import Button from 'ui/components/controls/Button'; export default function initReassignSketchMode(ctx) { ctx.services.ui.registerComponent('ReassignSketchTool', ReassignSketchTool); diff --git a/web/app/cad/sketch/sketchBoundaries.js b/web/app/cad/sketch/sketchBoundaries.js index a4a632c8..50598b56 100644 --- a/web/app/cad/sketch/sketchBoundaries.js +++ b/web/app/cad/sketch/sketchBoundaries.js @@ -1,11 +1,11 @@ import * as vec from 'math/vec'; import {iteratePath} from '../cad-utils'; -import NurbsCurve from '../../../../modules/geom/curves/nurbsCurve'; -import {veqXYZ} from '../../../../modules/geom/tolerance'; -import curveTess, {curveTessParams} from '../../../../modules/geom/impl/curve/curve-tess'; +import NurbsCurve from 'geom/curves/nurbsCurve'; +import {veqXYZ} from 'geom/tolerance'; +import curveTess, {curveTessParams} from 'geom/impl/curve/curve-tess'; import {distanceAB} from "math/distance"; import {areEqual, TOLERANCE} from "math/equality"; -import {circleFromPoints, radiusOfCurvature} from "../../../../modules/geom/euclidean"; +import {circleFromPoints, radiusOfCurvature} from "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 d3a1d2b1..a1148d8f 100644 --- a/web/app/cad/sketch/sketchModel.js +++ b/web/app/cad/sketch/sketchModel.js @@ -1,12 +1,12 @@ import verb from 'verb-nurbs' -import BrepCurve from '../../../../modules/geom/curves/brepCurve'; -import NurbsCurve from '../../../../modules/geom/curves/nurbsCurve'; -import {makeAngle0_360} from '../../../../modules/math/commons' -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/geom/euclidean"; +import BrepCurve from 'geom/curves/brepCurve'; +import NurbsCurve from 'geom/curves/nurbsCurve'; +import {makeAngle0_360} from 'math/commons' +import {normalizeCurveEnds} from 'geom/impl/nurbs-ext'; +import Vector from 'math/vector'; +import CSys from "math/csys"; +import {distanceAB} from "math/distance"; +import {isCCW} from "geom/euclidean"; const RESOLUTION = 20; diff --git a/web/app/cad/sketch/sketchReader.js b/web/app/cad/sketch/sketchReader.js index 3a8775ed..66f0b830 100644 --- a/web/app/cad/sketch/sketchReader.js +++ b/web/app/cad/sketch/sketchReader.js @@ -1,10 +1,10 @@ import * as sm from './sketchModel' import {Graph} from '../../utils/graph' import {HashTable} from '../../utils/hashmap' -import Joints from '../../../../modules/gems/joints'; +import Joints from 'gems/joints'; import sketchObjectGlobalId from './sketchObjectGlobalId'; -import VectorFactory from '../../../../modules/math/vectorFactory'; -import {strictEqual2D} from "../../../../modules/math/equality"; +import VectorFactory from 'math/vectorFactory'; +import {strictEqual2D} from "math/equality"; class SketchGeom { diff --git a/web/app/cad/sketch/sketcherUIContrib.js b/web/app/cad/sketch/sketcherUIContrib.js index 75692f6c..a47a9798 100644 --- a/web/app/cad/sketch/sketcherUIContrib.js +++ b/web/app/cad/sketch/sketcherUIContrib.js @@ -1,7 +1,7 @@ import {startOperation} from "../../sketcher/actions"; import objectToolActions from '../../sketcher/actions/objectToolActions'; import measureActions from '../../sketcher/actions/measureActions'; -import {insertAfter} from '../../../../modules/gems/iterables'; +import {insertAfter} from 'gems/iterables'; import operationActions from "../../sketcher/actions/operationActions"; import constraintGlobalActions from "../../sketcher/actions/constraintGlobalActions"; import generalToolActions from "../../sketcher/actions/generalToolActions"; diff --git a/web/app/cad/tess/brep-tess.js b/web/app/cad/tess/brep-tess.js index b0c1dcda..bfd92133 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 '../../../../modules/geom/surfaces/surfaceTess'; +import tessellateSurface from '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/nested-loops.js b/web/app/cad/tess/nested-loops.js index f850c518..14a6063d 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/geom/euclidean"; +import {isCCW} from "geom/euclidean"; export default function(loops) { const loops = loops.map(loop => new NestedLoop(loop)); diff --git a/web/app/cad/tess/triangulation.js b/web/app/cad/tess/triangulation.js index 7f48f321..0a50b3d3 100644 --- a/web/app/cad/tess/triangulation.js +++ b/web/app/cad/tess/triangulation.js @@ -1,6 +1,6 @@ import libtess from 'libtess' -import {Point} from '../../../../modules/geom/point' -import {Vertex} from '../../../../modules/brep/topo/vertex' +import {Point} from 'geom/point' +import {Vertex} from 'brep/topo/vertex' import Vector from 'math/vector'; function initTesselator() { diff --git a/web/app/sketcher.js b/web/app/sketcher.js index 709c1f35..9b4b6015 100644 --- a/web/app/sketcher.js +++ b/web/app/sketcher.js @@ -12,7 +12,7 @@ import {Scope} from "./sketcher/components/Scope"; import {createElement} from "./utils/domUtils"; import {SKETCHER_STORAGE_PREFIX} from "./sketcher/project"; import {Dock, dockBtn} from "./sketcher/components/Dock"; -import {DIRECTIONS, ResizeHelper} from "../../modules/ui/components/Window"; +import {DIRECTIONS, ResizeHelper} from "ui/components/Window"; import {getSketcherAction} from "./sketcher/actions"; import {initShortkeys} from "./sketcher/shortkeys"; diff --git a/web/app/sketcher/components/ConstraintEditor.jsx b/web/app/sketcher/components/ConstraintEditor.jsx index b4862284..b43426db 100644 --- a/web/app/sketcher/components/ConstraintEditor.jsx +++ b/web/app/sketcher/components/ConstraintEditor.jsx @@ -7,8 +7,8 @@ import {useStream} from "ui/effects"; import CheckboxControl from "ui/components/controls/CheckboxControl"; import Window from "ui/components/Window"; import Field from "ui/components/controls/Field"; -import Label from "../../../../modules/ui/components/controls/Label"; -import {EMPTY_OBJECT} from "../../../../modules/gems/objects"; +import Label from "ui/components/controls/Label"; +import {EMPTY_OBJECT} from "gems/objects"; import {SketcherAppContext} from "./SketcherAppContext"; export function ConstraintEditor() { diff --git a/web/app/sketcher/components/ContextualControls.jsx b/web/app/sketcher/components/ContextualControls.jsx index 35d48ea2..92d123b6 100644 --- a/web/app/sketcher/components/ContextualControls.jsx +++ b/web/app/sketcher/components/ContextualControls.jsx @@ -1,10 +1,10 @@ import React, {useContext} from 'react'; import ls from './ContextualControls.less'; import {matchAvailableActions} from "../actions"; -import {useStream} from "../../../../modules/ui/effects"; +import {useStream} from "ui/effects"; import {MatchIndex, matchSelection} from "../selectionMatcher"; import {ConstraintButton, GeneratorButton} from "./ConstraintExplorer"; -import {Columnizer} from "../../../../modules/ui/components/Columnizer"; +import {Columnizer} from "ui/components/Columnizer"; import {NoIcon} from "../icons/NoIcon"; import {SketcherAppContext} from "./SketcherAppContext"; diff --git a/web/app/sketcher/components/ExportDialog.jsx b/web/app/sketcher/components/ExportDialog.jsx index 24d7b29a..14f9609a 100644 --- a/web/app/sketcher/components/ExportDialog.jsx +++ b/web/app/sketcher/components/ExportDialog.jsx @@ -1,7 +1,7 @@ import React from 'react'; import {useStreamWithUpdater} from "ui/effects"; -import Window from "../../../../modules/ui/components/Window"; -import Stack from "../../../../modules/ui/components/Stack"; +import Window from "ui/components/Window"; +import Stack from "ui/components/Stack"; import {SketcherActionButton} from "./SketcherActionButton"; export function ExportDialog() { diff --git a/web/app/sketcher/components/SketchObjectExplorer.jsx b/web/app/sketcher/components/SketchObjectExplorer.jsx index 82ecd088..39ffee54 100644 --- a/web/app/sketcher/components/SketchObjectExplorer.jsx +++ b/web/app/sketcher/components/SketchObjectExplorer.jsx @@ -2,7 +2,7 @@ import React, {useContext, useState} from 'react'; import cx from 'classnames'; import ls from './SketchObjectExplorer.less' import {combine} from 'lstream'; -import {useStream} from "../../../../modules/ui/effects"; +import {useStream} from "ui/effects"; import {SketcherAppContext} from "./SketcherAppContext"; diff --git a/web/app/sketcher/components/SketcherOperationWizard.jsx b/web/app/sketcher/components/SketcherOperationWizard.jsx index 25475802..cabab419 100644 --- a/web/app/sketcher/components/SketcherOperationWizard.jsx +++ b/web/app/sketcher/components/SketcherOperationWizard.jsx @@ -5,7 +5,7 @@ import Window from "ui/components/Window"; import Stack from "ui/components/Stack"; import ButtonGroup from "ui/components/controls/ButtonGroup"; import Button from "ui/components/controls/Button"; -import {useStreamWithUpdater} from "../../../../modules/ui/effects"; +import {useStreamWithUpdater} from "ui/effects"; import {SketcherAppContext} from "./SketcherAppContext"; diff --git a/web/app/sketcher/components/StageControl.jsx b/web/app/sketcher/components/StageControl.jsx index 325701d8..e0801cf1 100644 --- a/web/app/sketcher/components/StageControl.jsx +++ b/web/app/sketcher/components/StageControl.jsx @@ -1,5 +1,5 @@ import React, {useContext} from 'react'; -import {useStreamWithUpdater} from "../../../../modules/ui/effects"; +import {useStreamWithUpdater} from "ui/effects"; import ls from "./StageControl.less"; import {SketcherAppContext} from "./SketcherAppContext"; diff --git a/web/app/sketcher/constr/ANConstraints.ts b/web/app/sketcher/constr/ANConstraints.ts index d5cb0d8c..aa635459 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 "../../../../modules/geom/curves/bezierCubic"; +import {cubicBezierDer1, cubicBezierDer2, cubicBezierPoint} from "geom/curves/bezierCubic"; import {greaterThanConstraint, lessThanConstraint} from "./barriers"; -import {genericCurveStep} from "../../../../modules/geom/impl/nurbs-ext"; +import {genericCurveStep} from "geom/impl/nurbs-ext"; import {_normalize} from "math/vec"; import { AngleBetweenConstraintIcon, diff --git a/web/app/sketcher/constr/barriers.js b/web/app/sketcher/constr/barriers.js index 5ad9fdfb..7a76c825 100644 --- a/web/app/sketcher/constr/barriers.js +++ b/web/app/sketcher/constr/barriers.js @@ -1,4 +1,4 @@ -import {sq} from "../../../../modules/math/commons"; +import {sq} from "math/commons"; export function greaterThanConstraint(val) { const K = 100; diff --git a/web/app/sketcher/constr/residuals.js b/web/app/sketcher/constr/residuals.js index f2402292..5bc7b5de 100644 --- a/web/app/sketcher/constr/residuals.js +++ b/web/app/sketcher/constr/residuals.js @@ -1,4 +1,4 @@ -import {sq} from "../../../../modules/math/commons"; +import {sq} from "math/commons"; export function R_Equal(params, [value]) { diff --git a/web/app/sketcher/constraints.js b/web/app/sketcher/constraints.js index 1a72d3da..5fab0e45 100644 --- a/web/app/sketcher/constraints.js +++ b/web/app/sketcher/constraints.js @@ -1,6 +1,6 @@ import {Ref} from './shapes/ref'; -import Vector from '../../../modules/math/vector'; -import {distanceAB} from "../../../modules/math/distance"; +import Vector from 'math/vector'; +import {distanceAB} from "math/distance"; class AbstractConstraint { diff --git a/web/app/sketcher/generators/boundaryGenerator.js b/web/app/sketcher/generators/boundaryGenerator.js index c18b6f82..259d628b 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 "../../../../modules/geom/curves/nurbsCurve"; +import NurbsCurve from "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 0e636597..042c8d28 100644 --- a/web/app/sketcher/generators/groundObjectsGenerator.ts +++ b/web/app/sketcher/generators/groundObjectsGenerator.ts @@ -1,10 +1,10 @@ import {NoIcon} from "../icons/NoIcon"; -import {NOOP} from "../../../../modules/gems/func"; +import {NOOP} from "gems/func"; import {Arc} from "../shapes/arc"; import {EndPoint} from "../shapes/point"; import {Circle} from "../shapes/circle"; import {NurbsObject} from "../shapes/nurbsObject"; -import NurbsCurve from "../../../../modules/geom/curves/nurbsCurve"; +import NurbsCurve from "geom/curves/nurbsCurve"; import {Segment} from "../shapes/segment"; export const GroundObjectsGeneratorSchema = { diff --git a/web/app/sketcher/shapes/circle.js b/web/app/sketcher/shapes/circle.js index f56c14f5..19803e9b 100644 --- a/web/app/sketcher/shapes/circle.js +++ b/web/app/sketcher/shapes/circle.js @@ -1,7 +1,7 @@ import {SketchObject} from './sketch-object' import {Param} from "./param"; import {EndPoint} from "./point"; -import {distance} from "../../../../modules/math/distance"; +import {distance} from "math/distance"; export const MIN_RADIUS = 100; diff --git a/web/app/sketcher/shapes/dim.js b/web/app/sketcher/shapes/dim.js index 338a0132..d0af75c5 100644 --- a/web/app/sketcher/shapes/dim.js +++ b/web/app/sketcher/shapes/dim.js @@ -1,6 +1,6 @@ import { DEG_RAD, - makeAngle0_360} from '../../../../modules/math/commons' + makeAngle0_360} from 'math/commons' import * as vec from 'math/vec' import Vector from 'math/vector'; import {Styles} from "../styles"; @@ -8,8 +8,8 @@ import {TextHelper} from "./textHelper"; 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/geom/euclidean"; +import {distance, distanceAB} from "math/distance"; +import {lineLineIntersection2d, pointToLineSignedDistance} from "geom/euclidean"; const ARROW_W_PX = 15; const ARROW_H_PX = 4; diff --git a/web/app/sketcher/shapes/ellipse.js b/web/app/sketcher/shapes/ellipse.js index 6ff5c48b..8ca40b8e 100644 --- a/web/app/sketcher/shapes/ellipse.js +++ b/web/app/sketcher/shapes/ellipse.js @@ -1,7 +1,7 @@ import {SketchObject} from './sketch-object' import {Param} from "./param"; import {EndPoint} from "./point"; -import {distance} from "../../../../modules/math/distance"; +import {distance} from "math/distance"; export class Ellipse extends SketchObject { diff --git a/web/app/sketcher/shapes/nurbsObject.js b/web/app/sketcher/shapes/nurbsObject.js index 2c3f7e43..bde4b66e 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 '../../../../modules/geom/impl/nurbs-ext'; +import {curveTessellate} from 'geom/impl/nurbs-ext'; import {Ellipse} from "./ellipse"; import {EndPoint} from "./point"; diff --git a/web/app/sketcher/shapes/point.ts b/web/app/sketcher/shapes/point.ts index faf90757..949562ca 100644 --- a/web/app/sketcher/shapes/point.ts +++ b/web/app/sketcher/shapes/point.ts @@ -3,7 +3,7 @@ import {DrawPoint} from './draw-utils' import Vector from 'math/vector'; import {Param} from "./param"; import {ConstraintDefinitions} from "../constr/ANConstraints"; -import {dfs} from "../../../../modules/gems/traverse"; +import {dfs} from "gems/traverse"; import {SketchSegmentSerializationData} from "./segment"; export class EndPoint extends SketchObject { diff --git a/web/app/sketcher/shapes/textHelper.js b/web/app/sketcher/shapes/textHelper.js index 5057c3a3..313fa388 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 {_270, _90, makeAngle0_360} from "math/commons"; import {_negate} from "math/vec"; -import {pointToLineSignedDistance} from "../../../../modules/geom/euclidean"; +import {pointToLineSignedDistance} from "geom/euclidean"; export class TextHelper { diff --git a/web/app/sketcher/system.js b/web/app/sketcher/system.js index cbac90c8..b23017f0 100644 --- a/web/app/sketcher/system.js +++ b/web/app/sketcher/system.js @@ -1,4 +1,4 @@ -import {addToSetInMap, removeFromSetInMap, removeInPlace} from '../../../modules/gems/iterables'; +import {addToSetInMap, removeFromSetInMap, removeInPlace} from 'gems/iterables'; import {ParametricManager} from './parametric'; diff --git a/web/app/sketcher/tools/arc.js b/web/app/sketcher/tools/arc.js index afcbbd3a..462b0b72 100644 --- a/web/app/sketcher/tools/arc.js +++ b/web/app/sketcher/tools/arc.js @@ -1,7 +1,7 @@ import {Arc} from '../shapes/arc' import {Tool} from './tool' import Vector from 'math/vector'; -import {distance} from "../../../../modules/math/distance"; +import {distance} from "math/distance"; export class AddArcTool extends Tool { diff --git a/web/app/sketcher/tools/circle.js b/web/app/sketcher/tools/circle.js index 7cf025d4..edec00db 100644 --- a/web/app/sketcher/tools/circle.js +++ b/web/app/sketcher/tools/circle.js @@ -1,6 +1,6 @@ import {Tool} from './tool' import {Circle} from '../shapes/circle' -import {distance} from "../../../../modules/math/distance"; +import {distance} from "math/distance"; export class EditCircleTool extends Tool { constructor(viewer) { diff --git a/web/app/sketcher/tools/dim.js b/web/app/sketcher/tools/dim.js index 817b839a..17499faf 100644 --- a/web/app/sketcher/tools/dim.js +++ b/web/app/sketcher/tools/dim.js @@ -13,7 +13,7 @@ import {isInstanceOf} from "../actions/matchUtils"; import {Segment} from "../shapes/segment"; import {DEFAULT_SEARCH_BUFFER} from "../viewer2d"; import {_negate, cross2d} from "math/vec"; -import {distance} from "../../../../modules/math/distance"; +import {distance} from "math/distance"; export class AddDimTool extends Tool { diff --git a/web/app/sketcher/tools/drag.js b/web/app/sketcher/tools/drag.js index 717defc5..8ccf5e44 100644 --- a/web/app/sketcher/tools/drag.js +++ b/web/app/sketcher/tools/drag.js @@ -1,6 +1,6 @@ import {Tool} from './tool' import {toast} from "react-toastify"; -import {distance} from "../../../../modules/math/distance"; +import {distance} from "math/distance"; export class DragTool extends Tool { diff --git a/web/app/sketcher/tools/fillet.js b/web/app/sketcher/tools/fillet.js index 6b126d39..8eb26561 100644 --- a/web/app/sketcher/tools/fillet.js +++ b/web/app/sketcher/tools/fillet.js @@ -4,7 +4,7 @@ import {Arc} from '../shapes/arc' import {Tool} from './tool' import {Segment} from "../shapes/segment"; import {AlgNumConstraint, ConstraintDefinitions} from "../constr/ANConstraints"; -import {distanceAB} from "../../../../modules/math/distance"; +import {distanceAB} from "math/distance"; export class FilletTool extends Tool { diff --git a/web/app/sketcher/tools/offset.js b/web/app/sketcher/tools/offset.js index 64d9f9e2..c9c05c3d 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/geom/euclidean"; +import {isCCW} from "geom/euclidean"; export class OffsetTool extends LoopPickTool { diff --git a/web/app/sketcher/uiConfig.js b/web/app/sketcher/uiConfig.js index f76d0552..d28bd1e5 100644 --- a/web/app/sketcher/uiConfig.js +++ b/web/app/sketcher/uiConfig.js @@ -2,7 +2,7 @@ import constraintGlobalActions from "./actions/constraintGlobalActions"; import measureActions from "./actions/measureActions"; import objectToolActions from "./actions/objectToolActions"; import commonActions from "./actions/commonActions"; -import {insertAfter, removeInPlace} from "../../../modules/gems/iterables"; +import {insertAfter, removeInPlace} from "gems/iterables"; import generalToolActions from "./actions/generalToolActions"; export const sketcherRightToolbarConfig = constraintGlobalActions.map(a => a.id); diff --git a/web/app/sketcher/viewer2d.ts b/web/app/sketcher/viewer2d.ts index d65a37a2..7f5f98f7 100644 --- a/web/app/sketcher/viewer2d.ts +++ b/web/app/sketcher/viewer2d.ts @@ -11,7 +11,7 @@ import Vector from 'math/vector'; import * as draw_utils from './shapes/draw-utils'; import sketcherStreams, {SketcherStreams} from './sketcherStreams'; import {BBox, IO} from "./io"; -import {NOOP} from "../../../modules/gems/func"; +import {NOOP} from "gems/func"; import {Shape} from "./shapes/shape"; import {SketchObject} from "./shapes/sketch-object"; import {Styles} from './styles'; diff --git a/web/app/utils/genSerpinski.js b/web/app/utils/genSerpinski.js index 783575ce..ad485c0a 100644 --- a/web/app/utils/genSerpinski.js +++ b/web/app/utils/genSerpinski.js @@ -1,4 +1,4 @@ -import Vector from '../../../modules/math/vector'; +import Vector from 'math/vector'; export default function genSerpinski(viewer, depthLimit = 7) { let [line] = viewer.selected;