diff --git a/src/components/SceneryManager.js b/src/components/SceneryManager.js index c1cba7e..adf2ce8 100644 --- a/src/components/SceneryManager.js +++ b/src/components/SceneryManager.js @@ -1,14 +1,14 @@ import { useState, useCallback, useEffect, useRef } from 'react'; import SceneryContext from '../contexts/SceneryContext'; import { useZoomPanEmitter } from '../hooks/useZoomPubSub'; -import SceneryParser from '../model/scenery-parser'; -import SceneryParserLog from '../model/scenery-parser-log'; +import SceneryParser from '../model/parsing/scenery-parser'; +import SceneryParserLog from '../model/parsing/scenery-parser-log'; import { showCustomDialog, showDialog } from '../services/dialogService'; import { resetHoveredTracksStack } from '../services/trackHoverInfoService'; import SceneryLoadedDialog from './scenery-loaded-dialog/SceneryLoadedDialog'; import Constants from '../helpers/constants'; import MiscHelper from '../helpers/miscHelper'; -import ElectrificationResolver from '../model/electrification-resolver'; +import ElectrificationResolver from '../model/parsing/electrification-resolver'; export default function SceneryManager(props) { const [isLoading, setIsLoading] = useState(false); diff --git a/src/components/scenery-loaded-dialog/SceneryLoadedDialog.js b/src/components/scenery-loaded-dialog/SceneryLoadedDialog.js index 97dc1b5..0331a9c 100644 --- a/src/components/scenery-loaded-dialog/SceneryLoadedDialog.js +++ b/src/components/scenery-loaded-dialog/SceneryLoadedDialog.js @@ -1,5 +1,5 @@ import { forwardRef, useImperativeHandle } from 'react'; -import SceneryParserLog from '../../model/scenery-parser-log'; +import SceneryParserLog from '../../model/parsing/scenery-parser-log'; import SceneryParserLogView from '../scenery-loaded-dialog/SceneryParserLogView'; import '../dialog/Dialog.css'; import './SceneryLoadedDialog.css' diff --git a/src/model/misc/platform.js b/src/model/misc/platform.js index cbb6459..fcfa447 100644 --- a/src/model/misc/platform.js +++ b/src/model/misc/platform.js @@ -1,5 +1,5 @@ import Misc from "./misc.js"; -import SceneryParserLog from "../scenery-parser-log.js"; +import SceneryParserLog from "../parsing/scenery-parser-log.js"; import Vector3 from "../vector3.js"; import DefinedPlatforms from "../defs/defined-platforms.js"; diff --git a/src/model/misc/signalbox.js b/src/model/misc/signalbox.js index 853fb1c..30b17de 100644 --- a/src/model/misc/signalbox.js +++ b/src/model/misc/signalbox.js @@ -1,5 +1,5 @@ import Misc from "./misc.js"; -import SceneryParserLog from "../scenery-parser-log.js"; +import SceneryParserLog from "../parsing/scenery-parser-log.js"; import Vector3 from "../vector3.js"; import DefinedSignalBoxes from "../defs/defined-signalboxes.js"; diff --git a/src/model/attach-signs.js b/src/model/parsing/attach-signs.js similarity index 97% rename from src/model/attach-signs.js rename to src/model/parsing/attach-signs.js index 1dd0c67..e83482c 100644 --- a/src/model/attach-signs.js +++ b/src/model/parsing/attach-signs.js @@ -1,7 +1,7 @@ -import AngleHelper from "../helpers/angleHelper"; -import Constants from "../helpers/constants"; +import AngleHelper from "../../helpers/angleHelper"; +import Constants from "../../helpers/constants"; import SceneryParserLog from "./scenery-parser-log"; -import Vector3 from "./vector3"; +import Vector3 from "../vector3"; function getGridSize(scenery) { const sceneryBounds = scenery.getBounds(); diff --git a/src/model/connect-tracks.js b/src/model/parsing/connect-tracks.js similarity index 95% rename from src/model/connect-tracks.js rename to src/model/parsing/connect-tracks.js index f104861..6f7fa2b 100644 --- a/src/model/connect-tracks.js +++ b/src/model/parsing/connect-tracks.js @@ -1,7 +1,7 @@ -import TrackConnection, {TrackConnectionEnd} from "./track-connection"; +import TrackConnection, {TrackConnectionEnd} from "../track-connection"; import SceneryParserLog from "./scenery-parser-log"; -import Constants from "../helpers/constants"; -import {TrackSource} from "./tracks/track"; +import Constants from "../../helpers/constants"; +import {TrackSource} from "../tracks/track"; const connectionThresholdDistanceSq = 0.05; diff --git a/src/model/electrification-resolver.js b/src/model/parsing/electrification-resolver.js similarity index 98% rename from src/model/electrification-resolver.js rename to src/model/parsing/electrification-resolver.js index fe95f35..3a65cbe 100644 --- a/src/model/electrification-resolver.js +++ b/src/model/parsing/electrification-resolver.js @@ -1,6 +1,6 @@ -import Constants from "../helpers/constants"; +import Constants from "../../helpers/constants"; import SceneryParserLog from "./scenery-parser-log"; -import {ElectrificationStatus, ElectrificationResolutionStatus} from "./electrification-status"; +import {ElectrificationStatus, ElectrificationResolutionStatus} from "../electrification-status"; export default class ElectrificationResolver { static hasWarnings = false; diff --git a/src/model/scenery-parser-log.js b/src/model/parsing/scenery-parser-log.js similarity index 94% rename from src/model/scenery-parser-log.js rename to src/model/parsing/scenery-parser-log.js index 7990931..1c4269b 100644 --- a/src/model/scenery-parser-log.js +++ b/src/model/parsing/scenery-parser-log.js @@ -1,4 +1,4 @@ -import Constants from "../helpers/constants"; +import Constants from "../../helpers/constants"; export default class SceneryParserLog { static log = []; diff --git a/src/model/scenery-parser.js b/src/model/parsing/scenery-parser.js similarity index 88% rename from src/model/scenery-parser.js rename to src/model/parsing/scenery-parser.js index 6ed5dc3..5d0dbd3 100644 --- a/src/model/scenery-parser.js +++ b/src/model/parsing/scenery-parser.js @@ -1,26 +1,26 @@ -import Scenery from './scenery'; -import Switch from './switch'; -import StandardTrack from './tracks/standard-track'; -import BezierTrack from './tracks/bezier-track'; -import TrackObject from './track-objects/track-object'; -import Signal from './track-objects/signal'; -import Route from './route'; -import Misc from './misc/misc'; +import Scenery from '../scenery'; +import Switch from '../switch'; +import StandardTrack from '../tracks/standard-track'; +import BezierTrack from '../tracks/bezier-track'; +import TrackObject from '../track-objects/track-object'; +import Signal from '../track-objects/signal'; +import Route from '../route'; +import Misc from '../misc/misc'; import SceneryParserLog from './scenery-parser-log'; -import SignalBox from './misc/signalbox'; -import Constants from '../helpers/constants'; -import SceneryInfo from './special-objects/scenery-info'; -import Sign from './track-objects/sign'; -import CameraHome from './special-objects/camera-home'; -import MainCamera from './special-objects/main-camera'; +import SignalBox from '../misc/signalbox'; +import Constants from '../../helpers/constants'; +import SceneryInfo from '../special-objects/scenery-info'; +import Sign from '../track-objects/sign'; +import CameraHome from '../special-objects/camera-home'; +import MainCamera from '../special-objects/main-camera'; import ElectrificationResolver from './electrification-resolver'; -import NEVP from './track-objects/nevp'; -import Derailer from './track-objects/derailer'; -import SpawnPoint from './track-objects/spawn-point'; -import Platform from './misc/platform'; +import NEVP from '../track-objects/nevp'; +import Derailer from '../track-objects/derailer'; +import SpawnPoint from '../track-objects/spawn-point'; +import Platform from '../misc/platform'; import { attachSigns } from './attach-signs'; import {connectTracks} from "./connect-tracks"; -import MiscGroup from './misc-group'; +import MiscGroup from '../misc-group'; export default class SceneryParser { static nextMiscId = 1; diff --git a/src/model/route.js b/src/model/route.js index c0b663a..b9ab054 100644 --- a/src/model/route.js +++ b/src/model/route.js @@ -1,6 +1,6 @@ import SceneryObject from "./scenery-object"; import Vector3 from "./vector3"; -import SceneryParserLog from "./scenery-parser-log"; +import SceneryParserLog from "./parsing/scenery-parser-log"; import TrackConnection, {TrackConnectionEnd} from "./track-connection"; import CurveHelper from "../helpers/curveHelper"; import StandardTrack from "./tracks/standard-track"; diff --git a/src/model/signal-elements/parsers/common.js b/src/model/signal-elements/parsers/common.js index 107cb42..59e64e3 100644 --- a/src/model/signal-elements/parsers/common.js +++ b/src/model/signal-elements/parsers/common.js @@ -1,5 +1,5 @@ import DefinedSignalSigns from '../../defs/defined-signal-signs'; -import SceneryParserLog from '../../scenery-parser-log'; +import SceneryParserLog from '../../parsing/scenery-parser-log'; import SignalElementsEnums from '../enums'; export default class SignalElementsParserCommon { diff --git a/src/model/signal-elements/signal-elements.js b/src/model/signal-elements/signal-elements.js index a880a11..f78c64b 100644 --- a/src/model/signal-elements/signal-elements.js +++ b/src/model/signal-elements/signal-elements.js @@ -1,4 +1,4 @@ -import SceneryParserLog from "../scenery-parser-log"; +import SceneryParserLog from "../parsing/scenery-parser-log"; import SignalElementsEnums from "./enums"; import SignalElementsParsersList from "./parsers-list"; diff --git a/src/model/switch.js b/src/model/switch.js index d243d31..259316d 100644 --- a/src/model/switch.js +++ b/src/model/switch.js @@ -1,5 +1,5 @@ import SceneryObject from "./scenery-object.js"; -import SceneryParserLog from "./scenery-parser-log.js"; +import SceneryParserLog from "./parsing/scenery-parser-log.js"; import Vector3 from "./vector3.js"; import {DefinedSwitches, SwitchTrackConnectionType} from "./defs/defined-switches.js"; import TrackConnection, {TrackConnectionEnd} from "./track-connection"; diff --git a/src/model/track-objects/derailer.js b/src/model/track-objects/derailer.js index 07e8388..4225f8e 100644 --- a/src/model/track-objects/derailer.js +++ b/src/model/track-objects/derailer.js @@ -1,6 +1,6 @@ import TrackObject from './track-object'; import Vector3 from '../vector3'; -import SceneryParserLog from "../scenery-parser-log"; +import SceneryParserLog from "../parsing/scenery-parser-log"; export default class Derailer extends TrackObject { type = "Derailer"; diff --git a/src/model/track-objects/sign.js b/src/model/track-objects/sign.js index f077e6e..acb11c9 100644 --- a/src/model/track-objects/sign.js +++ b/src/model/track-objects/sign.js @@ -1,5 +1,5 @@ import DefinedSigns from "../defs/defined-signs"; -import SceneryParserLog from "../scenery-parser-log"; +import SceneryParserLog from "../parsing/scenery-parser-log"; import TrackObject from "./track-object"; import Vector3 from "../vector3"; diff --git a/src/model/track-objects/signal.js b/src/model/track-objects/signal.js index b2bea3a..72a7624 100644 --- a/src/model/track-objects/signal.js +++ b/src/model/track-objects/signal.js @@ -1,4 +1,4 @@ -import SceneryParserLog from "../scenery-parser-log"; +import SceneryParserLog from "../parsing/scenery-parser-log"; import SpawnInfo from "../spawn-info"; import TrackObject from "./track-object"; import Vector3 from "../vector3"; diff --git a/src/model/track-objects/spawn-point.js b/src/model/track-objects/spawn-point.js index 04476f3..c3538a7 100644 --- a/src/model/track-objects/spawn-point.js +++ b/src/model/track-objects/spawn-point.js @@ -1,4 +1,4 @@ -import SceneryParserLog from "../scenery-parser-log"; +import SceneryParserLog from "../parsing/scenery-parser-log"; import SpawnInfo from "../spawn-info"; import TrackObject from "./track-object"; import Vector3 from "../vector3"; diff --git a/src/model/track-objects/track-object.js b/src/model/track-objects/track-object.js index 5a60440..337c429 100644 --- a/src/model/track-objects/track-object.js +++ b/src/model/track-objects/track-object.js @@ -1,5 +1,5 @@ import SceneryObject from '../scenery-object'; -import SceneryParserLog from '../scenery-parser-log'; +import SceneryParserLog from '../parsing/scenery-parser-log'; import Vector3 from '../vector3'; export default class TrackObject extends SceneryObject {