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

UI modularization / moving files around

Browse source
This commit is contained in:
Val Erastov 2018-01-04 18:53:38 -08:00
parent 9773d466cc
commit 6c4d658e20
12 changed files with 44 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
web/app/3d/scene/vector-three-ench.js → modules/scene/utils/vectorThreeEnhancement.js
View file

2
web/app/3d/cad-utils.js
View file

@ -5,7 +5,7 @@ import {Graph} from '../math/graph'
import * as math from '../math/math'
import {Matrix3, AXIS, ORIGIN} from '../math/l3space'
import Counters from './counters'
import {MeshSceneSolid} from './scene/mesh-scene-object'
import {MeshSceneSolid} from './scene/wrappers/meshSceneObject'
import DPR from '../utils/dpr'
export const FACE_COLOR = 0xB0C4DE;

2
web/app/3d/craft/brep/boolean-operation.js
View file

@ -1,5 +1,5 @@
import {subtract, union, intersect} from '../../../brep/operations/boolean'
import {BREPSceneSolid} from '../../scene/brep-scene-object'
import {BREPSceneSolid} from '../../scene/wrappers/brepSceneObject'
import {update as updateStitching} from '../../../brep/stitching'
import {BREPValidator} from '../../../brep/brep-validator'
import {Shell} from '../../../brep/topo/shell'

4
web/app/3d/craft/operations.js
View file

@ -1,8 +1,8 @@
import {MESH_OPERATIONS} from './mesh/workbench'
import {Extrude, Cut} from './brep/cut-extrude'
import {Revolve} from './brep/revolve'
import {BREPSceneSolid} from '../scene/brep-scene-object'
import {PlaneSceneObject} from '../scene/plane-scene-object'
import {BREPSceneSolid} from '../scene/wrappers/brepSceneObject'
import {PlaneSceneObject} from '../scene/wrappers/planeSceneObject'
import {box} from '../../brep/brep-primitives'
export const CUT = {

4
web/app/3d/debug.js
View file

@ -1,6 +1,6 @@
import {checkForSelectedFaces} from './actions/action-helpers'
import {nurbsToThreeGeom, triangulateToThree} from './scene/brep-scene-object'
import {createSolidMaterial} from './scene/scene-object'
import {nurbsToThreeGeom, triangulateToThree} from './scene/wrappers/brepSceneObject'
import {createSolidMaterial} from './scene/wrappers/sceneObject'
import DPR from '../utils/dpr'
import Vector from 'math/vector';
import {NurbsCurve} from "../brep/geom/impl/nurbs";

6
web/app/3d/modeler-app.js
View file

@ -1,7 +1,7 @@
import './scene/vector-three-ench'
import '../../../modules/scene/utils/vectorThreeEnhancement'
import '../utils/three-loader'
import {Bus} from '../ui/toolkit'
import {Viewer} from './viewer'
import {Viewer} from './viewer/viewer'
import {UI} from './ui/ctrl'
import TabSwitcher from './ui/tab-switcher'
import ControlBar from './ui/control-bar'
@ -24,7 +24,7 @@ import BrepBuilder from '../brep/brep-builder'
import * as BREPPrimitives from '../brep/brep-primitives'
import * as BREPBool from '../brep/operations/boolean'
import {BREPValidator} from '../brep/brep-validator'
import {BREPSceneSolid} from './scene/brep-scene-object'
import {BREPSceneSolid} from './scene/wrappers/brepSceneObject'
import TPI from './tpi'
import {NurbsCurve, NurbsCurveImpl, NurbsSurface} from "../brep/geom/impl/nurbs";
import {Circle} from "./craft/sketch/sketch-model";

10
web/app/3d/scene/brep-scene-object.js → web/app/3d/scene/wrappers/brepSceneObject.js
View file

@ -1,9 +1,9 @@
import Vector from 'math/vector';
import {EDGE_AUX, FACE_CHUNK} from '../../brep/stitching'
import {normalOfCCWSeq} from '../cad-utils'
import {TriangulateFace} from '../tess/triangulation'
import {SceneSolid, SceneFace, WIREFRAME_MATERIAL} from './scene-object'
import brepTess from '../tess/brep-tess'
import {EDGE_AUX, FACE_CHUNK} from '../../../brep/stitching'
import {normalOfCCWSeq} from '../../cad-utils'
import {TriangulateFace} from '../../tess/triangulation'
import {SceneSolid, SceneFace, WIREFRAME_MATERIAL} from './sceneObject'
import brepTess from '../../tess/brep-tess'
const SMOOTH_RENDERING = false //true;

14
web/app/3d/scene/mesh-scene-object.js → web/app/3d/scene/wrappers/meshSceneObject.js
View file

@ -1,11 +1,11 @@
import {HashTable} from '../../utils/hashmap'
import {HashTable} from '../../../utils/hashmap'
import Vector from 'math/vector';
import Counters from '../counters'
import {findOutline, segmentsToPaths, reconstructSketchBounds} from '../craft/mesh/workbench'
import {Matrix3, AXIS} from '../../math/l3space'
import {arrFlatten1L, isCurveClass} from '../cad-utils'
import DPR from '../../utils/dpr'
import {SceneSolid, SceneFace} from './scene-object'
import Counters from '../../counters'
import {findOutline, segmentsToPaths, reconstructSketchBounds} from '../../craft/mesh/workbench'
import {Matrix3, AXIS} from '../../../math/l3space'
import {arrFlatten1L, isCurveClass} from '../../cad-utils'
import DPR from 'dpr'
import {SceneSolid, SceneFace} from './sceneObject'
export class MeshSceneSolid extends SceneSolid {

6
web/app/3d/scene/plane-scene-object.js → web/app/3d/scene/wrappers/planeSceneObject.js
View file

@ -1,7 +1,7 @@
import Vector from 'math/vector';
import {STANDARD_BASES} from '../../math/l3space'
import {Plane} from '../../brep/geom/impl/plane'
import {SceneSolid, SceneFace} from './scene-object'
import {STANDARD_BASES} from '../../../math/l3space'
import {Plane} from '../../../brep/geom/impl/plane'
import {SceneSolid, SceneFace} from './sceneObject'
const INIT_WIDTH_H = 750 * 0.5;
const INIT_HEIGHT_H = 750 * 0.5;

12
web/app/3d/scene/scene-object.js → web/app/3d/scene/wrappers/sceneObject.js
View file

@ -1,10 +1,10 @@
import {HashTable} from '../../utils/hashmap'
import {HashTable} from '../../../utils/hashmap'
import Vector from 'math/vector';
import Counters from '../counters'
import {Matrix3, BasisForPlane} from '../../math/l3space'
import {isCurveClass} from '../cad-utils'
import DPR from '../../utils/dpr'
import {ReadSketch, ReadSketchFromFace} from "../craft/sketch/sketch-reader";
import Counters from '../../counters'
import {Matrix3, BasisForPlane} from '../../../math/l3space'
import {isCurveClass} from '../../cad-utils'
import DPR from 'dpr'
import {ReadSketch, ReadSketchFromFace} from "../../craft/sketch/sketch-reader";
export class SceneSolid {

10
modules/scene/pickControl.js → web/app/3d/viewer/pickControl.js
View file

@ -1,4 +1,12 @@
export default function initPickControl(domElement, onPick) {
export default class PickControl {
constructor(bus) {
this.bus = bus;
}
}
export function initPickControl(domElement, onPick) {
let mouseState = {
startX: 0,
startY: 0

10
web/app/3d/viewer.js → web/app/3d/viewer/viewer.js
View file

@ -1,14 +1,14 @@
import {AXIS} from '../math/l3space'
import {AXIS} from '../../math/l3space'
import DPR from 'dpr'
import * as mask from '../utils/mask';
import {EdgeSelectionManager, SelectionManager, SketchSelectionManager} from './selection'
import * as mask from '../../utils/mask';
import {EdgeSelectionManager, SelectionManager, SketchSelectionManager} from '../selection'
import {createArrow} from 'scene/objects/auxiliary';
import Vector from 'math/vector';
import {OnTopOfAll} from 'scene/materialMixins';
import SceneSetup from 'scene/sceneSetup';
import * as SceneGraph from 'scene/sceneGraph';
import initPickControl from "scene/pickControl";
import {moveObject3D, setBasisToObject3D} from "../../../modules/scene/objects/transform";
import {moveObject3D, setBasisToObject3D} from 'scene/objects/transform';
import {initPickControl} from "./pickControl";
export class Viewer {