-
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #298 from BarthPaleologue/289-refactor-make-orbita…
…lobjectmodel-celestialbodymodel-discriminated-unions Refactor to discriminated unions: OrbitalObjectModel, OrbitalObject, MissionNode, MissionNodeSerialized
- Loading branch information
Showing
115 changed files
with
2,475 additions
and
2,126 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| // This file is part of Cosmos Journeyer | ||
| // | ||
| // Copyright (C) 2024 Barthélemy Paléologue <barth.paleologue@cosmosjourneyer.com> | ||
| // | ||
| // This program is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU Affero General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU Affero General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU Affero General Public License | ||
| // along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
|
|
||
| import { normalRandom, randRange } from "extended-random"; | ||
| import { clamp } from "../../utils/math"; | ||
| import { OrbitalObjectType } from "../../architecture/orbitalObjectType"; | ||
| import { Orbit } from "../../orbit/orbit"; | ||
| import { GenerationSteps } from "../../utils/generationSteps"; | ||
| import { getRngFromSeed } from "../../utils/getRngFromSeed"; | ||
| import { JuliaSetModel } from "./juliaSetModel"; | ||
| import { Color3 } from "@babylonjs/core/Maths/math.color"; | ||
| import { Tools } from "@babylonjs/core/Misc/tools"; | ||
|
|
||
| export function newSeededJuliaSetModel(seed: number, name: string): JuliaSetModel { | ||
| const rng = getRngFromSeed(seed); | ||
|
|
||
| const radius = 1000e3; | ||
|
|
||
| const accentColor = Color3.FromHSV( | ||
| 360 * rng(GenerationSteps.ACCENT_COLOR), | ||
| rng(GenerationSteps.ACCENT_COLOR + 123) * 0.5, | ||
| 0.8 | ||
| ); | ||
|
|
||
| // Todo: do not hardcode | ||
| const orbitRadius = rng(GenerationSteps.ORBIT) * 15e9; | ||
|
|
||
| const orbitalP = clamp(0.5, 3.0, normalRandom(1.0, 0.3, rng, GenerationSteps.ORBIT + 80)); | ||
|
|
||
| const orbit: Orbit = { | ||
| semiMajorAxis: orbitRadius, | ||
| p: orbitalP, | ||
| inclination: Tools.ToRadians(normalRandom(90, 20, rng, GenerationSteps.ORBIT + 160)), | ||
| eccentricity: randRange(0.1, 0.9, rng, GenerationSteps.ORBIT + 240), | ||
| longitudeOfAscendingNode: randRange(0, 2 * Math.PI, rng, GenerationSteps.ORBIT + 320), | ||
| argumentOfPeriapsis: randRange(0, 2 * Math.PI, rng, GenerationSteps.ORBIT + 400), | ||
| initialMeanAnomaly: randRange(0, 2 * Math.PI, rng, GenerationSteps.ORBIT + 480) | ||
| }; | ||
| const mass = 10; | ||
| const siderealDaySeconds = 0; | ||
| const axialTilt = normalRandom(0, 0.4, rng, GenerationSteps.AXIAL_TILT); | ||
|
|
||
| return { | ||
| type: OrbitalObjectType.JULIA_SET, | ||
| name, | ||
| radius, | ||
| orbit, | ||
| mass, | ||
| siderealDaySeconds, | ||
| axialTilt, | ||
| accentColor | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| // This file is part of Cosmos Journeyer | ||
| // | ||
| // Copyright (C) 2024 Barthélemy Paléologue <barth.paleologue@cosmosjourneyer.com> | ||
| // | ||
| // This program is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU Affero General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU Affero General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU Affero General Public License | ||
| // along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
|
|
||
| import { randRange, normalRandom } from "extended-random"; | ||
| import { clamp } from "../../utils/math"; | ||
| import { OrbitalObjectType } from "../../architecture/orbitalObjectType"; | ||
| import { Orbit } from "../../orbit/orbit"; | ||
| import { GenerationSteps } from "../../utils/generationSteps"; | ||
| import { getRngFromSeed } from "../../utils/getRngFromSeed"; | ||
| import { MandelboxModel } from "./mandelboxModel"; | ||
| import { Color3 } from "@babylonjs/core/Maths/math.color"; | ||
| import { Tools } from "@babylonjs/core/Misc/tools"; | ||
|
|
||
| export function newSeededMandelboxModel(seed: number, name: string): MandelboxModel { | ||
| const rng = getRngFromSeed(seed); | ||
|
|
||
| const radius = 200e3; | ||
|
|
||
| const mr2 = randRange(0.0, 1.0, rng, GenerationSteps.POWER); | ||
| const spread = randRange(1.0, 1.5, rng, GenerationSteps.POWER + 1); | ||
| const accentColor = Color3.FromHSV( | ||
| 360 * rng(GenerationSteps.ACCENT_COLOR), | ||
| rng(GenerationSteps.ACCENT_COLOR + 123) * 0.5, | ||
| 0.8 | ||
| ); | ||
|
|
||
| // Todo: do not hardcode | ||
| const orbitRadius = rng(GenerationSteps.ORBIT) * 15e9; | ||
|
|
||
| const orbitalP = clamp(0.5, 3.0, normalRandom(1.0, 0.3, rng, GenerationSteps.ORBIT + 80)); | ||
|
|
||
| const orbit: Orbit = { | ||
| semiMajorAxis: orbitRadius, | ||
| p: orbitalP, | ||
| inclination: Tools.ToRadians(normalRandom(90, 20, rng, GenerationSteps.ORBIT + 160)), | ||
| eccentricity: randRange(0.1, 0.9, rng, GenerationSteps.ORBIT + 240), | ||
| longitudeOfAscendingNode: randRange(0, 2 * Math.PI, rng, GenerationSteps.ORBIT + 320), | ||
| argumentOfPeriapsis: randRange(0, 2 * Math.PI, rng, GenerationSteps.ORBIT + 400), | ||
| initialMeanAnomaly: randRange(0, 2 * Math.PI, rng, GenerationSteps.ORBIT + 480) | ||
| }; | ||
|
|
||
| const mass = 10; | ||
| const siderealDaySeconds = 0; | ||
| const axialTilt = normalRandom(0, 0.4, rng, GenerationSteps.AXIAL_TILT); | ||
|
|
||
| return { | ||
| radius, | ||
| mass, | ||
| siderealDaySeconds, | ||
| axialTilt, | ||
| name, | ||
| type: OrbitalObjectType.MANDELBOX, | ||
| mr2, | ||
| spread, | ||
| color: accentColor, | ||
| orbit | ||
| }; | ||
| } |
Oops, something went wrong.