Reorganised 3D views

js/client/main/index.js

@@ -12,8 +12,8 @@ requester.onReady(() => {
         synchronize(data);
         
         const viewManager = require('../utils/view-manager');
-        const ReciprocalView3D = require('../views/reciprocal/reciprocal-view-3d');
-        const UnitCellView3D = require('../views/unitcell-view-3d');
+        const ReciprocalView3D = require('../views/3D/reciprocal/reciprocal-view-3d');
+        const UnitCellView3D = require('../views/3D/unitcell-view-3d');
 
         // Create the views.
         const reciprocalView3D = new ReciprocalView3D();

js/client/views/3D/lattice-view.js → js/client/views/3D/reciprocal/lattice-view.js

-const View3D = require('./view3d');
-const {vector3WorldToView} = require('../../utils/conversion');
+const View3D = require('../view3d');
+const {vector3WorldToView} = require('../../../utils/conversion');
 const math = require('mathjs');
-const xtal = require('../../../server/model/xtal/xtal');
-const { peaks } = require('../../server-state');
+const xtal = require('../../../../server/model/xtal/xtal');
+const { peaks } = require('../../../server-state');
 const THREE = require('three');
 
 // Value for determining if a peak is in the scattering plane.

js/client/views/3D/plane-view.js → js/client/views/3D/reciprocal/plane-view.js

-const View3D = require('./view3d');
-const {vector3WorldToView, vector3ViewToWorld} = require('../../utils/conversion');
-const { mapColor } = require('../../utils/map-color');
+const View3D = require('./../view3d');
+const {vector3WorldToView, vector3ViewToWorld} = require('../../../utils/conversion');
+const { mapColor } = require('../../../utils/map-color');
 const THREE = require('three');
-const { grid, matrix } = require('../../server-state');
-const { requester } = require('../../main/context');
+const { grid, matrix } = require('../../../server-state');
+const { requester } = require('../../../main/context');
 
 const X_DIR = 1;
 const Y_DIR = 2;

js/client/views/reciprocal/reciprocal-view-3d.js → js/client/views/3D/reciprocal/reciprocal-view-3d.js

@@ -2,46 +2,46 @@
  * Reciprocal 3D view.
  */
 
-const myLayout = require('../../main/multi-layout');
+const myLayout = require('../../../main/multi-layout');
 const PubSub = require('pubsub-js');
 const THREE = require('three');
 const OrbitControls = require('three-orbitcontrols');
 const DragControls = require('three-dragcontrols');
-const { menuEvent, displayMode, receiver } = require('../../main/context');
-const { mode, matrix } = require('../../server-state');
+const { menuEvent, displayMode, receiver } = require('../../../main/context');
+const { mode, matrix } = require('../../../server-state');
 
-const viewManager = require('../../utils/view-manager');
+const viewManager = require('../../../utils/view-manager');
 const MapControls = require('./map-control');
-const CameraMove = require('../../utils/camera-move');
-const DeviceOrientationControls = require('../reciprocal/three-device-orientation');
-
-const PlaneController = require('../../controllers/plane-controller');
-const LatticeController = require('../../controllers/lattice-controller');
-const PeaksController = require('../../controllers/peaks-controller');
-const SampleController = require('../../controllers/sample-controller');
-const ScatteringController = require('../../controllers/scattering-controller');
-const TrajectoryController = require('../../controllers/trajectory-controller');
-const UnitCellController = require('../../controllers/unitcell-controller');
+const CameraMove = require('../../../utils/camera-move');
+const DeviceOrientationControls = require('./three-device-orientation');
+
+const PlaneController = require('../../../controllers/plane-controller');
+const LatticeController = require('../../../controllers/lattice-controller');
+const PeaksController = require('../../../controllers/peaks-controller');
+const SampleController = require('../../../controllers/sample-controller');
+const ScatteringController = require('../../../controllers/scattering-controller');
+const TrajectoryController = require('../../../controllers/trajectory-controller');
+const UnitCellController = require('../../../controllers/unitcell-controller');
 //const ConfigurationController = require('../../controllers/configuration-controller');
 
-const LatticeView3D = require('../3D/lattice-view');
-const PlaneView3D = require('../3D/plane-view');
-const ScatteringView3D = require('../3D/scattering-view');
-const TrajectoryView3D = require('../3D/trajectory-view');
-
-const PlanePanelView = require('../panels/plane-view');
-const GridPanelView = require('../panels/grid-view');
-const TrajectorySettingsPanelView = require('../panels/trajectory-settings-view');
-const ExpDataPanelView = require('../panels/expdata-view');
-const PeaksPanelView = require('../panels/peaks-view');
-const SamplePanelView = require('../panels/sample-view');
-const ScatteringPanelView = require('../panels/scattering-view');
-const TrajectoryPanelView = require('../panels/trajectory-view');
-const AnglesPanelView = require('../panels/angles-view');
-const AtomsPanelView = require('../panels/atoms-view');
+const LatticeView3D = require('./lattice-view');
+const PlaneView3D = require('./plane-view');
+const ScatteringView3D = require('./scattering-view');
+const TrajectoryView3D = require('./trajectory-view');
+
+const PlanePanelView = require('../../panels/plane-view');
+const GridPanelView = require('../../panels/grid-view');
+const TrajectorySettingsPanelView = require('../../panels/trajectory-settings-view');
+const ExpDataPanelView = require('../../panels/expdata-view');
+const PeaksPanelView = require('../../panels/peaks-view');
+const SamplePanelView = require('../../panels/sample-view');
+const ScatteringPanelView = require('../../panels/scattering-view');
+const TrajectoryPanelView = require('../../panels/trajectory-view');
+const AnglesPanelView = require('../../panels/angles-view');
+const AtomsPanelView = require('../../panels/atoms-view');
 //const ConfigurationPanelView = require('../panels/configuration-view');
 
-const Constants = require('../../utils/constants');
+const Constants = require('../../../utils/constants');
 
 class ReciprocalView3D {
 

js/client/views/3D/scattering-view.js → js/client/views/3D/reciprocal/scattering-view.js

-const { displayMode, receiver } = require('../../main/context');
-const View3D = require('./view3d');
+const { displayMode, receiver } = require('../../../main/context');
+const View3D = require('./../view3d');
 const THREE = require('three');
-const SnapSphere = require('../../utils/shapes/snap-sphere');
-const Arrow3D = require('../../utils/shapes/arrow-3d');
-const Color = require('../../utils/colors');
-const {vector3WorldToView, vector3ViewToWorld } = require('../../utils/conversion');
-const { calculateSs, calculateKiKf } = require('../../utils/calculations');
-const { scattering, matrix, mode } = require('../../server-state');
+const SnapSphere = require('../../../utils/shapes/snap-sphere');
+const Arrow3D = require('../../../utils/shapes/arrow-3d');
+const Color = require('../../../utils/colors');
+const {vector3WorldToView, vector3ViewToWorld } = require('../../../utils/conversion');
+const { calculateSs, calculateKiKf } = require('../../../utils/calculations');
+const { scattering, matrix, mode } = require('../../../server-state');
 
 class ScatteringView3D extends View3D {
     constructor(scene, dragControls, raycaster, draggables, mapControls) {

js/client/views/3D/trajectory-view.js → js/client/views/3D/reciprocal/trajectory-view.js

-const View3D = require('./view3d');
-const HKLLine = require('../../utils/shapes/hkl-line');
-const EnergyLine = require('../../utils/shapes/energy-line');
-const { calculateKiKf } = require('../../utils/calculations');
+const View3D = require('./../view3d');
+const HKLLine = require('../../../utils/shapes/hkl-line');
+const EnergyLine = require('../../../utils/shapes/energy-line');
+const { calculateKiKf } = require('../../../utils/calculations');
 const THREE = require('three');
-const { displayMode } = require('../../main/context');
-const { scattering, matrix, trajectoryData } = require('../../server-state');
-const { clientSettings } = require('../../client-state');
-const {scalarWorldToView} = require('../../utils/conversion');
-const Constants = require('../../utils/constants');
+const { displayMode } = require('../../../main/context');
+const { scattering, matrix, trajectoryData } = require('../../../server-state');
+const { clientSettings } = require('../../../client-state');
+const {scalarWorldToView} = require('../../../utils/conversion');
+const Constants = require('../../../utils/constants');
 
 class TrajectoryView3D extends View3D {
     constructor(scene, dragControls, scatteringView) {

js/client/views/unitcell-view-3d.js → js/client/views/3D/unitcell-view-3d.js

@@ -4,11 +4,11 @@
 
 const THREE = require('three');
 const OrbitControls = require('three-orbitcontrols');
-const viewManager = require('../utils/view-manager');
-const xtal = require('../../server/model/xtal/xtal');
-const { sample } = require('../server-state');
+const viewManager = require('../../utils/view-manager');
+const xtal = require('../../../server/model/xtal/xtal');
+const { sample } = require('../../server-state');
 const SeedRandom = require('seedrandom');
-const atomColor = require('../utils/atom-color');
+const atomColor = require('../../utils/atom-color');
 
 class UnitCellView3D {