From 824af087c1feeee1779958f2a2549f24139506dc Mon Sep 17 00:00:00 2001 From: Krafpy Date: Sun, 15 Aug 2021 21:31:25 +0200 Subject: [PATCH] Modified file structure. Modified the file structure to have the `index.html` at the root of the repository. Needed for Github Pages. --- {public/data => data}/config.yml | 0 {public/data => data}/kspbodies.yml | 0 {public => dist}/dedicated-workers/libs/common.js | 0 .../dedicated-workers/libs/evolution.js | 0 {public => dist}/dedicated-workers/libs/lambert.js | 0 {public => dist}/dedicated-workers/libs/math.js | 0 .../dedicated-workers/libs/physics-2d.js | 0 .../dedicated-workers/libs/physics-3d.js | 0 {public => dist}/dedicated-workers/libs/physics.js | 0 .../dedicated-workers/libs/trajectory-calculator.js | 0 .../dedicated-workers/sequence-evaluator.js | 0 .../dedicated-workers/sequence-generator.js | 0 .../dedicated-workers/trajectory-optimizer.js | 0 {public => dist}/main/editor/body-selector.js | 0 {public => dist}/main/editor/buttons.js | 0 {public => dist}/main/editor/editor.js | 0 {public => dist}/main/editor/error-msg.js | 0 {public => dist}/main/editor/integer-input.js | 0 {public => dist}/main/editor/plot.js | 0 {public => dist}/main/editor/progress-msg.js | 0 {public => dist}/main/editor/range.js | 0 {public => dist}/main/editor/selector.js | 0 {public => dist}/main/editor/sequence-selector.js | 0 {public => dist}/main/editor/time-selector.js | 0 {public => dist}/main/editor/time.js | 0 {public => dist}/main/main.js | 0 {public => dist}/main/objects/body.js | 0 {public => dist}/main/objects/camera.js | 0 {public => dist}/main/objects/orbit.js | 0 {public => dist}/main/objects/sequence.js | 0 {public => dist}/main/objects/system.js | 0 {public => dist}/main/objects/time.js | 0 {public => dist}/main/objects/trajectory.js | 0 {public => dist}/main/solvers/sequence-solver.js | 4 ++-- {public => dist}/main/solvers/sequence.js | 0 {public => dist}/main/solvers/trajectory-solver.js | 2 +- {public => dist}/main/solvers/trajectory.js | 0 {public => dist}/main/utilities/array.js | 0 {public => dist}/main/utilities/data.js | 0 {public => dist}/main/utilities/geometry.js | 0 {public => dist}/main/utilities/worker.js | 0 public/favicon.ico => favicon.ico | Bin {public/imgs => imgs}/example_trajectory.png | Bin {public/includes => includes}/Line2.js | 0 {public/includes => includes}/LineGeometry.js | 0 {public/includes => includes}/LineMaterial.js | 0 .../includes => includes}/LineSegmentGeometry.js | 0 {public/includes => includes}/LineSegments2.js | 0 {public/includes => includes}/OrbitControls.js | 0 public/index.html => index.html | 2 +- {public/sprites => sprites}/arrow-512.png | Bin {public/sprites => sprites}/circle-512.png | Bin src/main/solvers/sequence-solver.ts | 4 ++-- src/main/solvers/trajectory-solver.ts | 2 +- src/tsconfig.json | 2 +- public/style.css => style.css | 0 56 files changed, 8 insertions(+), 8 deletions(-) rename {public/data => data}/config.yml (100%) rename {public/data => data}/kspbodies.yml (100%) rename {public => dist}/dedicated-workers/libs/common.js (100%) rename {public => dist}/dedicated-workers/libs/evolution.js (100%) rename {public => dist}/dedicated-workers/libs/lambert.js (100%) rename {public => dist}/dedicated-workers/libs/math.js (100%) rename {public => dist}/dedicated-workers/libs/physics-2d.js (100%) rename {public => dist}/dedicated-workers/libs/physics-3d.js (100%) rename {public => dist}/dedicated-workers/libs/physics.js (100%) rename {public => dist}/dedicated-workers/libs/trajectory-calculator.js (100%) rename {public => dist}/dedicated-workers/sequence-evaluator.js (100%) rename {public => dist}/dedicated-workers/sequence-generator.js (100%) rename {public => dist}/dedicated-workers/trajectory-optimizer.js (100%) rename {public => dist}/main/editor/body-selector.js (100%) rename {public => dist}/main/editor/buttons.js (100%) rename {public => dist}/main/editor/editor.js (100%) rename {public => dist}/main/editor/error-msg.js (100%) rename {public => dist}/main/editor/integer-input.js (100%) rename {public => dist}/main/editor/plot.js (100%) rename {public => dist}/main/editor/progress-msg.js (100%) rename {public => dist}/main/editor/range.js (100%) rename {public => dist}/main/editor/selector.js (100%) rename {public => dist}/main/editor/sequence-selector.js (100%) rename {public => dist}/main/editor/time-selector.js (100%) rename {public => dist}/main/editor/time.js (100%) rename {public => dist}/main/main.js (100%) rename {public => dist}/main/objects/body.js (100%) rename {public => dist}/main/objects/camera.js (100%) rename {public => dist}/main/objects/orbit.js (100%) rename {public => dist}/main/objects/sequence.js (100%) rename {public => dist}/main/objects/system.js (100%) rename {public => dist}/main/objects/time.js (100%) rename {public => dist}/main/objects/trajectory.js (100%) rename {public => dist}/main/solvers/sequence-solver.js (92%) rename {public => dist}/main/solvers/sequence.js (100%) rename {public => dist}/main/solvers/trajectory-solver.js (97%) rename {public => dist}/main/solvers/trajectory.js (100%) rename {public => dist}/main/utilities/array.js (100%) rename {public => dist}/main/utilities/data.js (100%) rename {public => dist}/main/utilities/geometry.js (100%) rename {public => dist}/main/utilities/worker.js (100%) rename public/favicon.ico => favicon.ico (100%) rename {public/imgs => imgs}/example_trajectory.png (100%) rename {public/includes => includes}/Line2.js (100%) rename {public/includes => includes}/LineGeometry.js (100%) rename {public/includes => includes}/LineMaterial.js (100%) rename {public/includes => includes}/LineSegmentGeometry.js (100%) rename {public/includes => includes}/LineSegments2.js (100%) rename {public/includes => includes}/OrbitControls.js (100%) rename public/index.html => index.html (99%) rename {public/sprites => sprites}/arrow-512.png (100%) rename {public/sprites => sprites}/circle-512.png (100%) rename public/style.css => style.css (100%) diff --git a/public/data/config.yml b/data/config.yml similarity index 100% rename from public/data/config.yml rename to data/config.yml diff --git a/public/data/kspbodies.yml b/data/kspbodies.yml similarity index 100% rename from public/data/kspbodies.yml rename to data/kspbodies.yml diff --git a/public/dedicated-workers/libs/common.js b/dist/dedicated-workers/libs/common.js similarity index 100% rename from public/dedicated-workers/libs/common.js rename to dist/dedicated-workers/libs/common.js diff --git a/public/dedicated-workers/libs/evolution.js b/dist/dedicated-workers/libs/evolution.js similarity index 100% rename from public/dedicated-workers/libs/evolution.js rename to dist/dedicated-workers/libs/evolution.js diff --git a/public/dedicated-workers/libs/lambert.js b/dist/dedicated-workers/libs/lambert.js similarity index 100% rename from public/dedicated-workers/libs/lambert.js rename to dist/dedicated-workers/libs/lambert.js diff --git a/public/dedicated-workers/libs/math.js b/dist/dedicated-workers/libs/math.js similarity index 100% rename from public/dedicated-workers/libs/math.js rename to dist/dedicated-workers/libs/math.js diff --git a/public/dedicated-workers/libs/physics-2d.js b/dist/dedicated-workers/libs/physics-2d.js similarity index 100% rename from public/dedicated-workers/libs/physics-2d.js rename to dist/dedicated-workers/libs/physics-2d.js diff --git a/public/dedicated-workers/libs/physics-3d.js b/dist/dedicated-workers/libs/physics-3d.js similarity index 100% rename from public/dedicated-workers/libs/physics-3d.js rename to dist/dedicated-workers/libs/physics-3d.js diff --git a/public/dedicated-workers/libs/physics.js b/dist/dedicated-workers/libs/physics.js similarity index 100% rename from public/dedicated-workers/libs/physics.js rename to dist/dedicated-workers/libs/physics.js diff --git a/public/dedicated-workers/libs/trajectory-calculator.js b/dist/dedicated-workers/libs/trajectory-calculator.js similarity index 100% rename from public/dedicated-workers/libs/trajectory-calculator.js rename to dist/dedicated-workers/libs/trajectory-calculator.js diff --git a/public/dedicated-workers/sequence-evaluator.js b/dist/dedicated-workers/sequence-evaluator.js similarity index 100% rename from public/dedicated-workers/sequence-evaluator.js rename to dist/dedicated-workers/sequence-evaluator.js diff --git a/public/dedicated-workers/sequence-generator.js b/dist/dedicated-workers/sequence-generator.js similarity index 100% rename from public/dedicated-workers/sequence-generator.js rename to dist/dedicated-workers/sequence-generator.js diff --git a/public/dedicated-workers/trajectory-optimizer.js b/dist/dedicated-workers/trajectory-optimizer.js similarity index 100% rename from public/dedicated-workers/trajectory-optimizer.js rename to dist/dedicated-workers/trajectory-optimizer.js diff --git a/public/main/editor/body-selector.js b/dist/main/editor/body-selector.js similarity index 100% rename from public/main/editor/body-selector.js rename to dist/main/editor/body-selector.js diff --git a/public/main/editor/buttons.js b/dist/main/editor/buttons.js similarity index 100% rename from public/main/editor/buttons.js rename to dist/main/editor/buttons.js diff --git a/public/main/editor/editor.js b/dist/main/editor/editor.js similarity index 100% rename from public/main/editor/editor.js rename to dist/main/editor/editor.js diff --git a/public/main/editor/error-msg.js b/dist/main/editor/error-msg.js similarity index 100% rename from public/main/editor/error-msg.js rename to dist/main/editor/error-msg.js diff --git a/public/main/editor/integer-input.js b/dist/main/editor/integer-input.js similarity index 100% rename from public/main/editor/integer-input.js rename to dist/main/editor/integer-input.js diff --git a/public/main/editor/plot.js b/dist/main/editor/plot.js similarity index 100% rename from public/main/editor/plot.js rename to dist/main/editor/plot.js diff --git a/public/main/editor/progress-msg.js b/dist/main/editor/progress-msg.js similarity index 100% rename from public/main/editor/progress-msg.js rename to dist/main/editor/progress-msg.js diff --git a/public/main/editor/range.js b/dist/main/editor/range.js similarity index 100% rename from public/main/editor/range.js rename to dist/main/editor/range.js diff --git a/public/main/editor/selector.js b/dist/main/editor/selector.js similarity index 100% rename from public/main/editor/selector.js rename to dist/main/editor/selector.js diff --git a/public/main/editor/sequence-selector.js b/dist/main/editor/sequence-selector.js similarity index 100% rename from public/main/editor/sequence-selector.js rename to dist/main/editor/sequence-selector.js diff --git a/public/main/editor/time-selector.js b/dist/main/editor/time-selector.js similarity index 100% rename from public/main/editor/time-selector.js rename to dist/main/editor/time-selector.js diff --git a/public/main/editor/time.js b/dist/main/editor/time.js similarity index 100% rename from public/main/editor/time.js rename to dist/main/editor/time.js diff --git a/public/main/main.js b/dist/main/main.js similarity index 100% rename from public/main/main.js rename to dist/main/main.js diff --git a/public/main/objects/body.js b/dist/main/objects/body.js similarity index 100% rename from public/main/objects/body.js rename to dist/main/objects/body.js diff --git a/public/main/objects/camera.js b/dist/main/objects/camera.js similarity index 100% rename from public/main/objects/camera.js rename to dist/main/objects/camera.js diff --git a/public/main/objects/orbit.js b/dist/main/objects/orbit.js similarity index 100% rename from public/main/objects/orbit.js rename to dist/main/objects/orbit.js diff --git a/public/main/objects/sequence.js b/dist/main/objects/sequence.js similarity index 100% rename from public/main/objects/sequence.js rename to dist/main/objects/sequence.js diff --git a/public/main/objects/system.js b/dist/main/objects/system.js similarity index 100% rename from public/main/objects/system.js rename to dist/main/objects/system.js diff --git a/public/main/objects/time.js b/dist/main/objects/time.js similarity index 100% rename from public/main/objects/time.js rename to dist/main/objects/time.js diff --git a/public/main/objects/trajectory.js b/dist/main/objects/trajectory.js similarity index 100% rename from public/main/objects/trajectory.js rename to dist/main/objects/trajectory.js diff --git a/public/main/solvers/sequence-solver.js b/dist/main/solvers/sequence-solver.js similarity index 92% rename from public/main/solvers/sequence-solver.js rename to dist/main/solvers/sequence-solver.js index 80ef39e..bd55a57 100644 --- a/public/main/solvers/sequence-solver.js +++ b/dist/main/solvers/sequence-solver.js @@ -6,9 +6,9 @@ export class FlybySequenceGenerator { this.system = system; this.config = config; this.totalFeasible = 0; - this._workerPool = new WorkerPool("dedicated-workers/sequence-evaluator.js", this.config); + this._workerPool = new WorkerPool("dist/dedicated-workers/sequence-evaluator.js", this.config); this._workerPool.initialize({ system: this.system.data, config: this.config }); - this._sequenceWorker = new ComputeWorker("dedicated-workers/sequence-generator.js"); + this._sequenceWorker = new ComputeWorker("dist/dedicated-workers/sequence-generator.js"); this._sequenceWorker.initialize(this.config); } cancel() { diff --git a/public/main/solvers/sequence.js b/dist/main/solvers/sequence.js similarity index 100% rename from public/main/solvers/sequence.js rename to dist/main/solvers/sequence.js diff --git a/public/main/solvers/trajectory-solver.js b/dist/main/solvers/trajectory-solver.js similarity index 97% rename from public/main/solvers/trajectory-solver.js rename to dist/main/solvers/trajectory-solver.js index a72c0b0..c347486 100644 --- a/public/main/solvers/trajectory-solver.js +++ b/dist/main/solvers/trajectory-solver.js @@ -14,7 +14,7 @@ export class TrajectorySolver { this._chunkIndices = []; this.bestTrajectorySteps = []; this.bestDeltaV = 0; - this._workerPool = new WorkerPool("dedicated-workers/trajectory-optimizer.js", this.config); + this._workerPool = new WorkerPool("dist/dedicated-workers/trajectory-optimizer.js", this.config); this._workerPool.initialize({ system: this.system.data, config: this.config }); } _initPlot() { diff --git a/public/main/solvers/trajectory.js b/dist/main/solvers/trajectory.js similarity index 100% rename from public/main/solvers/trajectory.js rename to dist/main/solvers/trajectory.js diff --git a/public/main/utilities/array.js b/dist/main/utilities/array.js similarity index 100% rename from public/main/utilities/array.js rename to dist/main/utilities/array.js diff --git a/public/main/utilities/data.js b/dist/main/utilities/data.js similarity index 100% rename from public/main/utilities/data.js rename to dist/main/utilities/data.js diff --git a/public/main/utilities/geometry.js b/dist/main/utilities/geometry.js similarity index 100% rename from public/main/utilities/geometry.js rename to dist/main/utilities/geometry.js diff --git a/public/main/utilities/worker.js b/dist/main/utilities/worker.js similarity index 100% rename from public/main/utilities/worker.js rename to dist/main/utilities/worker.js diff --git a/public/favicon.ico b/favicon.ico similarity index 100% rename from public/favicon.ico rename to favicon.ico diff --git a/public/imgs/example_trajectory.png b/imgs/example_trajectory.png similarity index 100% rename from public/imgs/example_trajectory.png rename to imgs/example_trajectory.png diff --git a/public/includes/Line2.js b/includes/Line2.js similarity index 100% rename from public/includes/Line2.js rename to includes/Line2.js diff --git a/public/includes/LineGeometry.js b/includes/LineGeometry.js similarity index 100% rename from public/includes/LineGeometry.js rename to includes/LineGeometry.js diff --git a/public/includes/LineMaterial.js b/includes/LineMaterial.js similarity index 100% rename from public/includes/LineMaterial.js rename to includes/LineMaterial.js diff --git a/public/includes/LineSegmentGeometry.js b/includes/LineSegmentGeometry.js similarity index 100% rename from public/includes/LineSegmentGeometry.js rename to includes/LineSegmentGeometry.js diff --git a/public/includes/LineSegments2.js b/includes/LineSegments2.js similarity index 100% rename from public/includes/LineSegments2.js rename to includes/LineSegments2.js diff --git a/public/includes/OrbitControls.js b/includes/OrbitControls.js similarity index 100% rename from public/includes/OrbitControls.js rename to includes/OrbitControls.js diff --git a/public/index.html b/index.html similarity index 99% rename from public/index.html rename to index.html index 4422152..cd67169 100644 --- a/public/index.html +++ b/index.html @@ -407,6 +407,6 @@ - + \ No newline at end of file diff --git a/public/sprites/arrow-512.png b/sprites/arrow-512.png similarity index 100% rename from public/sprites/arrow-512.png rename to sprites/arrow-512.png diff --git a/public/sprites/circle-512.png b/sprites/circle-512.png similarity index 100% rename from public/sprites/circle-512.png rename to sprites/circle-512.png diff --git a/src/main/solvers/sequence-solver.ts b/src/main/solvers/sequence-solver.ts index 467a727..8f9b909 100644 --- a/src/main/solvers/sequence-solver.ts +++ b/src/main/solvers/sequence-solver.ts @@ -11,10 +11,10 @@ export class FlybySequenceGenerator { public totalFeasible: number = 0; constructor(public readonly system: SolarSystem, public readonly config: Config) { - this._workerPool = new WorkerPool("dedicated-workers/sequence-evaluator.js", this.config); + this._workerPool = new WorkerPool("dist/dedicated-workers/sequence-evaluator.js", this.config); this._workerPool.initialize({system: this.system.data, config: this.config}); - this._sequenceWorker = new ComputeWorker("dedicated-workers/sequence-generator.js"); + this._sequenceWorker = new ComputeWorker("dist/dedicated-workers/sequence-generator.js"); this._sequenceWorker.initialize(this.config); } diff --git a/src/main/solvers/trajectory-solver.ts b/src/main/solvers/trajectory-solver.ts index c7930c5..8929f57 100644 --- a/src/main/solvers/trajectory-solver.ts +++ b/src/main/solvers/trajectory-solver.ts @@ -20,7 +20,7 @@ export class TrajectorySolver { public bestDeltaV: number = 0; constructor(public readonly system: SolarSystem, public readonly config: Config, public readonly plot: EvolutionPlot) { - this._workerPool = new WorkerPool("dedicated-workers/trajectory-optimizer.js", this.config); + this._workerPool = new WorkerPool("dist/dedicated-workers/trajectory-optimizer.js", this.config); this._workerPool.initialize({system: this.system.data, config: this.config}); } diff --git a/src/tsconfig.json b/src/tsconfig.json index 0a6b996..b827fa7 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -3,7 +3,7 @@ "target": "ES2019", "module": "ES6", "lib": ["ES2019", "DOM", "DOM.Iterable", "webworker"], - "outDir": "../public", + "outDir": "../dist", "rootDir": ".", "removeComments": true, "strict": true, diff --git a/public/style.css b/style.css similarity index 100% rename from public/style.css rename to style.css