diff --git a/web/app/3d/cad-utils.js b/web/app/3d/cad-utils.js index 286e6cce..9a558145 100644 --- a/web/app/3d/cad-utils.js +++ b/web/app/3d/cad-utils.js @@ -1,4 +1,4 @@ -import Vector from '../math/vector' +import Vector from 'math/vector'; import BBox from '../math/bbox' import {HashTable} from '../utils/hashmap' import {Graph} from '../math/graph' diff --git a/web/app/3d/craft/brep/cut-extrude.js b/web/app/3d/craft/brep/cut-extrude.js index 4c59dae9..7a75cd55 100644 --- a/web/app/3d/craft/brep/cut-extrude.js +++ b/web/app/3d/craft/brep/cut-extrude.js @@ -1,6 +1,6 @@ import {Matrix3, BasisForPlane, ORIGIN} from '../../../math/l3space' import * as math from '../../../math/math' -import Vector from '../../../math/vector' +import Vector from 'math/vector'; import {enclose, iterateSegments} from '../../../brep/brep-enclose' import * as stitching from '../../../brep/stitching' import {Loop} from '../../../brep/topo/loop' diff --git a/web/app/3d/craft/brep/wizards/cut-extrude-wizard.js b/web/app/3d/craft/brep/wizards/cut-extrude-wizard.js index 8561914b..b3a19fb7 100644 --- a/web/app/3d/craft/brep/wizards/cut-extrude-wizard.js +++ b/web/app/3d/craft/brep/wizards/cut-extrude-wizard.js @@ -2,7 +2,7 @@ import {CURRENT_SELECTION as S} from './wizard' import {PreviewWizard, SketchBasedPreviewer} from './preview-wizard' import {getEncloseDetails} from '../cut-extrude' import {TriangulatePolygons} from '../../../tess/triangulation' -import Vector from '../../../../math/vector' +import Vector from 'math/vector'; import {curveTessParams} from "../../../../brep/geom/impl/curve/curve-tess"; diff --git a/web/app/3d/craft/brep/wizards/plane-wizard.js b/web/app/3d/craft/brep/wizards/plane-wizard.js index f1b7a0c2..fd5790fc 100644 --- a/web/app/3d/craft/brep/wizards/plane-wizard.js +++ b/web/app/3d/craft/brep/wizards/plane-wizard.js @@ -1,7 +1,7 @@ import {PreviewWizard, IMAGINARY_SURFACE_MATERIAL} from './preview-wizard' import {CURRENT_SELECTION as S} from './wizard' import {AXIS, IDENTITY_BASIS, STANDARD_BASES} from '../../../../math/l3space' -import Vector from '../../../../math/vector' +import Vector from 'math/vector'; const METADATA = [ ['orientation', 'choice', 'XY', {options: ['XY', 'XZ', 'ZY']}], diff --git a/web/app/3d/craft/brep/wizards/revolve-wizard.js b/web/app/3d/craft/brep/wizards/revolve-wizard.js index 9ddf9b8d..3aa9adac 100644 --- a/web/app/3d/craft/brep/wizards/revolve-wizard.js +++ b/web/app/3d/craft/brep/wizards/revolve-wizard.js @@ -3,7 +3,7 @@ import {PreviewWizard, SketchBasedNurbsPreviewer } from './preview-wizard' import {TriangulatePolygons} from '../../../tess/triangulation' import {revolveToWallNurbs} from '../../../../brep/brep-builder' import {evalPivot} from '../revolve' -import Vector from '../../../../math/vector' +import Vector from 'math/vector'; const METADATA = [ ['angle' , 'number', 5, {min: -360, max: 360, step: 10}], diff --git a/web/app/3d/craft/mesh/revolve.js b/web/app/3d/craft/mesh/revolve.js index f743c897..240ad1a2 100644 --- a/web/app/3d/craft/mesh/revolve.js +++ b/web/app/3d/craft/mesh/revolve.js @@ -1,5 +1,5 @@ import {Matrix3} from '../../../math/l3space' -import Vector from '../../../math/vector' +import Vector from 'math/vector'; import * as math from '../../../math/math' import {createShared} from '../../cad-utils' diff --git a/web/app/3d/craft/mesh/wizards/extrude.js b/web/app/3d/craft/mesh/wizards/extrude.js index ed50a14c..4f41a9d2 100644 --- a/web/app/3d/craft/mesh/wizards/extrude.js +++ b/web/app/3d/craft/mesh/wizards/extrude.js @@ -1,7 +1,7 @@ import * as tk from '../../../../ui/toolkit.js' import * as workbench from '../workbench' import * as cad_utils from '../../../cad-utils' -import Vector from '../../../../math/vector' +import Vector from 'math/vector'; import {Matrix3, ORIGIN} from '../../../../math/l3space' import {OpWizard, IMAGINE_MATERIAL, BASE_MATERIAL} from './wizard-commons' diff --git a/web/app/3d/craft/mesh/wizards/import.js b/web/app/3d/craft/mesh/wizards/import.js index 27492631..fa7b7edb 100644 --- a/web/app/3d/craft/mesh/wizards/import.js +++ b/web/app/3d/craft/mesh/wizards/import.js @@ -1,7 +1,7 @@ import * as tk from '../../../../ui/toolkit.js' import * as workbench from '../workbench' import * as cad_utils from '../../../cad-utils' -import Vector from '../../../../math/vector' +import Vector from 'math/vector'; import {Wizard} from './wizard-commons' import {LoadSTLFromURL} from '../../../io' diff --git a/web/app/3d/craft/mesh/wizards/revolve.js b/web/app/3d/craft/mesh/wizards/revolve.js index 5115d910..3ad6410c 100644 --- a/web/app/3d/craft/mesh/wizards/revolve.js +++ b/web/app/3d/craft/mesh/wizards/revolve.js @@ -1,7 +1,7 @@ import * as tk from '../../../../ui/toolkit.js' import * as workbench from '../workbench' import * as cad_utils from '../../../cad-utils' -import Vector from '../../../../math/vector' +import Vector from 'math/vector'; import {Matrix3, ORIGIN} from '../../../../math/l3space' import {revolveToTriangles} from '../revolve' import {OpWizard, IMAGINARY_SURFACE_MATERIAL, } from './wizard-commons' diff --git a/web/app/3d/craft/mesh/workbench.js b/web/app/3d/craft/mesh/workbench.js index 0cf2b159..d92132b8 100644 --- a/web/app/3d/craft/mesh/workbench.js +++ b/web/app/3d/craft/mesh/workbench.js @@ -1,4 +1,4 @@ -import Vector from '../../../math/vector' +import Vector from 'math/vector'; import * as cad_utils from '../../cad-utils' import * as math from '../../../math/math' import {LUT} from '../../../math/bezier-cubic' diff --git a/web/app/3d/craft/sketch/sketch-reader.js b/web/app/3d/craft/sketch/sketch-reader.js index bf458b72..35851fef 100644 --- a/web/app/3d/craft/sketch/sketch-reader.js +++ b/web/app/3d/craft/sketch/sketch-reader.js @@ -1,6 +1,6 @@ import * as sm from './sketch-model' import {Matrix3, AXIS, ORIGIN} from '../../../math/l3space' -import Vector from '../../../math/vector' +import Vector from 'math/vector'; import {Graph} from '../../../math/graph' import * as math from '../../../math/math' import {HashTable} from '../../../utils/hashmap' diff --git a/web/app/3d/debug.js b/web/app/3d/debug.js index 69e9204f..c06d25c3 100644 --- a/web/app/3d/debug.js +++ b/web/app/3d/debug.js @@ -2,7 +2,7 @@ import {checkForSelectedFaces} from './actions/action-helpers' import {nurbsToThreeGeom, triangulateToThree} from './scene/brep-scene-object' import {createSolidMaterial} from './scene/scene-object' import DPR from '../utils/dpr' -import Vector from "../math/vector"; +import Vector from 'math/vector'; import {NurbsCurve} from "../brep/geom/impl/nurbs"; import * as ui from '../ui/ui'; diff --git a/web/app/3d/mesh.js b/web/app/3d/mesh.js index 4d153379..0d75a97a 100644 --- a/web/app/3d/mesh.js +++ b/web/app/3d/mesh.js @@ -1,4 +1,4 @@ -import Vector from '../math/vector' +import Vector from 'math/vector'; import * as cad_utils from './cad-utils' import * as math from '../math/math' import {Matrix3, AXIS, ORIGIN} from '../math/l3space' diff --git a/web/app/3d/modeler-app.js b/web/app/3d/modeler-app.js index 2e02d4c3..7849a3a7 100644 --- a/web/app/3d/modeler-app.js +++ b/web/app/3d/modeler-app.js @@ -1,3 +1,4 @@ +import './scene/vector-three-ench' import {Bus} from '../ui/toolkit' import {Viewer} from './viewer' import {UI} from './ui/ctrl' @@ -6,7 +7,7 @@ import ControlBar from './ui/control-bar' import {InputManager} from './ui/input-manager' import {ActionManager} from './actions/actions' import * as AllActions from './actions/all-actions' -import Vector from '../math/vector' +import Vector from 'math/vector'; import {Matrix3, AXIS, ORIGIN, IDENTITY_BASIS} from '../math/l3space' import {Craft} from './craft/craft' import {ReadSketch} from './craft/sketch/sketch-reader' diff --git a/web/app/3d/scene/brep-scene-object.js b/web/app/3d/scene/brep-scene-object.js index dcb999f8..05c5d789 100644 --- a/web/app/3d/scene/brep-scene-object.js +++ b/web/app/3d/scene/brep-scene-object.js @@ -1,4 +1,4 @@ -import Vector from '../../math/vector' +import Vector from 'math/vector'; import {EDGE_AUX, FACE_CHUNK} from '../../brep/stitching' import {normalOfCCWSeq} from '../cad-utils' import {TriangulateFace} from '../tess/triangulation' diff --git a/web/app/3d/scene/mesh-scene-object.js b/web/app/3d/scene/mesh-scene-object.js index b94e7796..cd395d64 100644 --- a/web/app/3d/scene/mesh-scene-object.js +++ b/web/app/3d/scene/mesh-scene-object.js @@ -1,5 +1,5 @@ import {HashTable} from '../../utils/hashmap' -import Vector from '../../math/vector' +import Vector from 'math/vector'; import Counters from '../counters' import {findOutline, segmentsToPaths, reconstructSketchBounds} from '../craft/mesh/workbench' import {Matrix3, AXIS} from '../../math/l3space' diff --git a/web/app/3d/scene/plane-scene-object.js b/web/app/3d/scene/plane-scene-object.js index 1d8cebce..852553be 100644 --- a/web/app/3d/scene/plane-scene-object.js +++ b/web/app/3d/scene/plane-scene-object.js @@ -1,4 +1,4 @@ -import Vector from '../../math/vector' +import Vector from 'math/vector'; import {STANDARD_BASES} from '../../math/l3space' import {Plane} from '../../brep/geom/impl/plane' import {SceneSolid, SceneFace} from './scene-object' diff --git a/web/app/3d/scene/scene-object.js b/web/app/3d/scene/scene-object.js index a2f07207..8af95af5 100644 --- a/web/app/3d/scene/scene-object.js +++ b/web/app/3d/scene/scene-object.js @@ -1,5 +1,5 @@ import {HashTable} from '../../utils/hashmap' -import Vector from '../../math/vector' +import Vector from 'math/vector'; import Counters from '../counters' import {Matrix3, BasisForPlane} from '../../math/l3space' import {isCurveClass} from '../cad-utils' diff --git a/web/app/math/vector.js b/web/app/3d/scene/vector-three-ench.js similarity index 50% rename from web/app/math/vector.js rename to web/app/3d/scene/vector-three-ench.js index 216e3cb8..155ce2f0 100644 --- a/web/app/math/vector.js +++ b/web/app/3d/scene/vector-three-ench.js @@ -1,9 +1,5 @@ -import Vector from 'math/vector' - -console.log(new Vector().fromData) +import Vector from 'math/vector'; Vector.prototype.three = function() { return new THREE.Vector3(this.x, this.y, this.z); }; - -export default Vector; \ No newline at end of file diff --git a/web/app/3d/tess/brep-tess.js b/web/app/3d/tess/brep-tess.js index aea03cab..c32f6659 100644 --- a/web/app/3d/tess/brep-tess.js +++ b/web/app/3d/tess/brep-tess.js @@ -1,4 +1,4 @@ -import Vector from "../../math/vector"; +import Vector from 'math/vector'; import ClipperLib from 'clipper-lib'; import libtess from 'libtess' diff --git a/web/app/3d/tess/triangulation.js b/web/app/3d/tess/triangulation.js index 6ab70f9e..9d8275f0 100644 --- a/web/app/3d/tess/triangulation.js +++ b/web/app/3d/tess/triangulation.js @@ -1,7 +1,7 @@ import libtess from 'libtess' import {Point} from '../../brep/geom/point' import {Vertex} from '../../brep/topo/vertex' -import Vector from "../../math/vector"; +import Vector from 'math/vector'; function initTesselator() { // function called for each vertex of tesselator output diff --git a/web/app/brep/geom/impl/nurbs.js b/web/app/brep/geom/impl/nurbs.js index 24de2ad1..849c375c 100644 --- a/web/app/brep/geom/impl/nurbs.js +++ b/web/app/brep/geom/impl/nurbs.js @@ -2,7 +2,7 @@ import {BasisForPlane, Matrix3} from '../../../math/l3space' import * as math from '../../../math/math' import {Point} from '../point' import {Surface} from "../surface"; -import Vector from "../../../math/vector"; +import Vector from 'math/vector'; import * as ext from "./nurbs-ext"; import {EPSILON, eqEps, eqSqTol, TOLERANCE, TOLERANCE_SQ, ueq, veq, veq3, veqNeg} from "../tolerance"; import curveIntersect from "./curve/curves-isec"; diff --git a/web/app/brep/geom/point.js b/web/app/brep/geom/point.js index b05c851b..8bc26155 100644 --- a/web/app/brep/geom/point.js +++ b/web/app/brep/geom/point.js @@ -1,3 +1,3 @@ -import Vector from '../../math/vector' +import Vector from 'math/vector'; export const Point = Vector; \ No newline at end of file diff --git a/web/app/brep/nurbs-tiling.js b/web/app/brep/nurbs-tiling.js index c7206160..a7e5021f 100644 --- a/web/app/brep/nurbs-tiling.js +++ b/web/app/brep/nurbs-tiling.js @@ -1,4 +1,4 @@ -import Vector from '../math/vector' +import Vector from 'math/vector'; class Tree { diff --git a/web/app/brep/operations/evolve-face.js b/web/app/brep/operations/evolve-face.js index 84255782..44e06d89 100644 --- a/web/app/brep/operations/evolve-face.js +++ b/web/app/brep/operations/evolve-face.js @@ -1,6 +1,6 @@ import {Face} from '../topo/face'; import {Vertex} from '../topo/vertex'; -import Vector from '../../math/vector'; +import Vector from 'math/vector'; import {isCCW} from '../../math/math'; import PIP from '../../3d/tess/pip'; diff --git a/web/app/math/bbox.js b/web/app/math/bbox.js index ba0e3da8..c3979066 100644 --- a/web/app/math/bbox.js +++ b/web/app/math/bbox.js @@ -1,4 +1,4 @@ -import Vector from './vector' +import Vector from 'math/vector'; export default class BBox { diff --git a/web/app/math/bezier-cubic.js b/web/app/math/bezier-cubic.js index 3b6f9f75..e1f81d9b 100644 --- a/web/app/math/bezier-cubic.js +++ b/web/app/math/bezier-cubic.js @@ -1,4 +1,4 @@ -import Vector from './vector' +import Vector from 'math/vector'; import * as math from './math' export function LUT(a, b, cp1, cp2, scale) { diff --git a/web/app/math/l3space.js b/web/app/math/l3space.js index c8d5cb99..82bd14ce 100644 --- a/web/app/math/l3space.js +++ b/web/app/math/l3space.js @@ -1,4 +1,4 @@ -import Vector from './vector'; +import Vector from 'math/vector'; var ORIGIN = new Vector(0, 0, 0); diff --git a/web/app/math/math.js b/web/app/math/math.js index e54d7855..bea3fb4d 100644 --- a/web/app/math/math.js +++ b/web/app/math/math.js @@ -1,4 +1,4 @@ -import Vector from './vector' +import Vector from 'math/vector'; import BBox from './bbox' export const TOLERANCE = 1E-6; diff --git a/web/app/sketcher/io.js b/web/app/sketcher/io.js index c9d93b0a..0c9d4311 100644 --- a/web/app/sketcher/io.js +++ b/web/app/sketcher/io.js @@ -11,7 +11,7 @@ import {BezierCurve} from './shapes/bezier-curve' import {HDimension, VDimension, Dimension, DiameterDimension} from './shapes/dim' import {Constraints} from './parametric' import {HashTable} from '../utils/hashmap' -import Vector from '../math/vector' +import Vector from 'math/vector'; const Types = { END_POINT : 'TCAD.TWO.EndPoint', diff --git a/web/app/sketcher/parametric.js b/web/app/sketcher/parametric.js index 0b0b15d1..a085fafc 100644 --- a/web/app/sketcher/parametric.js +++ b/web/app/sketcher/parametric.js @@ -2,7 +2,7 @@ import * as utils from '../utils/utils' import {Ref} from './shapes/ref' import {Param, prepare} from './constr/solver' import {createByConstraintName} from './constr/constraints' -import Vector from '../math/vector' +import Vector from 'math/vector'; import * as math from '../math/math' import * as fetch from './fetchers' diff --git a/web/app/sketcher/shapes/arc.js b/web/app/sketcher/shapes/arc.js index 9986f4a3..54bc46fe 100644 --- a/web/app/sketcher/shapes/arc.js +++ b/web/app/sketcher/shapes/arc.js @@ -1,6 +1,6 @@ import * as utils from '../../utils/utils'; import * as math from '../../math/math'; -import Vector from '../../math/vector' +import Vector from 'math/vector'; import {Ref} from './ref' import {Constraints} from '../parametric' import {SketchObject} from './sketch-object' diff --git a/web/app/sketcher/shapes/dim.js b/web/app/sketcher/shapes/dim.js index f3e6d246..bd4f089a 100644 --- a/web/app/sketcher/shapes/dim.js +++ b/web/app/sketcher/shapes/dim.js @@ -1,6 +1,6 @@ import * as utils from '../../utils/utils' import * as math from '../../math/math' -import Vector from '../../math/vector' +import Vector from 'math/vector'; import {SketchObject} from './sketch-object' class LinearDimension extends SketchObject { diff --git a/web/app/sketcher/shapes/point.js b/web/app/sketcher/shapes/point.js index 4dfff6be..73653e4a 100644 --- a/web/app/sketcher/shapes/point.js +++ b/web/app/sketcher/shapes/point.js @@ -1,7 +1,7 @@ import {SketchObject} from './sketch-object' import {DrawPoint} from './draw-utils' import {Generator} from '../id-generator' -import Vector from '../../math/vector' +import Vector from 'math/vector'; export class EndPoint extends SketchObject { diff --git a/web/app/sketcher/shapes/segment.js b/web/app/sketcher/shapes/segment.js index aebc9b5d..f663f3c5 100644 --- a/web/app/sketcher/shapes/segment.js +++ b/web/app/sketcher/shapes/segment.js @@ -1,5 +1,5 @@ import {SketchObject} from './sketch-object' -import Vector from '../../math/vector' +import Vector from 'math/vector'; import {Constraints} from '../parametric' import * as math from '../../math/math' diff --git a/web/app/sketcher/tools/arc.js b/web/app/sketcher/tools/arc.js index aad93933..4dfe3422 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 {EndPoint} from '../shapes/point' import {Tool} from './tool' -import Vector from '../../math/vector' +import Vector from 'math/vector'; import * as math from '../../math/math'; export class AddArcTool extends Tool { diff --git a/web/app/sketcher/tools/bezier-curve.js b/web/app/sketcher/tools/bezier-curve.js index 5f459977..e1915732 100644 --- a/web/app/sketcher/tools/bezier-curve.js +++ b/web/app/sketcher/tools/bezier-curve.js @@ -2,7 +2,7 @@ import {Tool} from './tool' import {EndPoint} from '../shapes/point' import {BezierCurve} from '../shapes/bezier-curve' import {Constraints} from '../parametric' -import Vector from '../../math/vector' +import Vector from 'math/vector'; import * as math from '../../math/math' export class BezierCurveTool extends Tool { diff --git a/web/app/sketcher/tools/dim.js b/web/app/sketcher/tools/dim.js index e549ee97..a58fc4f6 100644 --- a/web/app/sketcher/tools/dim.js +++ b/web/app/sketcher/tools/dim.js @@ -1,5 +1,5 @@ import {HDimension, VDimension, Dimension, DiameterDimension} from '../shapes/dim' -import Vector from '../../math/vector' +import Vector from 'math/vector'; import {EndPoint} from '../shapes/point' import {Tool} from './tool' diff --git a/web/app/sketcher/tools/ellipse.js b/web/app/sketcher/tools/ellipse.js index b6c9036d..fde9d84a 100644 --- a/web/app/sketcher/tools/ellipse.js +++ b/web/app/sketcher/tools/ellipse.js @@ -2,7 +2,7 @@ import {Tool} from './tool' import {EndPoint} from '../shapes/point' import {Ellipse} from '../shapes/ellipse' import {EllipticalArc} from '../shapes/elliptical-arc' -import Vector from '../../math/vector' +import Vector from 'math/vector'; export const STATE_POINT1 = 0; export const STATE_POINT2 = 1; diff --git a/web/app/sketcher/tools/fillet.js b/web/app/sketcher/tools/fillet.js index 459f49d3..6d8a5931 100644 --- a/web/app/sketcher/tools/fillet.js +++ b/web/app/sketcher/tools/fillet.js @@ -1,4 +1,4 @@ -import Vector from '../../math/vector' +import Vector from 'math/vector'; import {Styles} from '../styles' import * as fetch from '../fetchers' import * as math from '../../math/math' diff --git a/web/app/sketcher/tools/offset.js b/web/app/sketcher/tools/offset.js index b101ffcd..b396df67 100644 --- a/web/app/sketcher/tools/offset.js +++ b/web/app/sketcher/tools/offset.js @@ -1,7 +1,7 @@ import {LoopPickTool} from './loop-pick' import {Constraints} from '../parametric' import * as math from '../../math/math'; -import Vector from '../../math/vector'; +import Vector from 'math/vector'; import {swap} from '../../utils/utils' import {EndPoint} from '../shapes/point' import {Arc} from '../shapes/arc' diff --git a/web/app/sketcher/viewer2d.js b/web/app/sketcher/viewer2d.js index 423fea5f..772499fc 100644 --- a/web/app/sketcher/viewer2d.js +++ b/web/app/sketcher/viewer2d.js @@ -11,7 +11,7 @@ import {EndPoint} from './shapes/point' import {Point} from './shapes/primitives' import {ReferencePoint} from './shapes/reference-point' import {BasisOrigin} from './shapes/basis-origin' -import Vector from '../math/vector' +import Vector from 'math/vector'; import * as draw_utils from './shapes/draw-utils' import * as math from '../math/math' diff --git a/web/test/cases/offset.js b/web/test/cases/offset.js index 7db37629..a5f76cfa 100644 --- a/web/test/cases/offset.js +++ b/web/test/cases/offset.js @@ -1,7 +1,7 @@ import * as test from '../test' import * as sketcher_utils from '../utils/sketcher-utils' import {TestMouseEvent} from '../utils/mouse-event' -import Vector from '../../app/math/vector'; +import Vector from 'math/vector'; export default { testRefreshHappensOnce: function (env) { diff --git a/web/test/cases/segment.js b/web/test/cases/segment.js index 757ab38e..470aa114 100644 --- a/web/test/cases/segment.js +++ b/web/test/cases/segment.js @@ -2,7 +2,7 @@ import * as test from '../test' import * as sketcher_utils from '../utils/sketcher-utils' import * as keyboard from '../utils/keyboard' import {TestMouseEvent} from '../utils/mouse-event' -import Vector from '../../app/math/vector'; +import Vector from 'math/vector'; export default { testSegmentWizard: function(env) { diff --git a/web/test/utils/sketcher-utils.js b/web/test/utils/sketcher-utils.js index 15ba93c6..16a200d4 100644 --- a/web/test/utils/sketcher-utils.js +++ b/web/test/utils/sketcher-utils.js @@ -1,5 +1,5 @@ import {TestMouseEvent} from './mouse-event' -import Vector from '../../app/math/vector'; +import Vector from 'math/vector'; export function toModel(app, x, y) { return app.viewer._screenToModel(x, y);