-
Credits
+
-
-
About
+
+
About
-
- Hello fellow explorer!
- I am the creator of CosmosJourneyer, and I am glad you're interested in this project.
+
+ Hello fellow explorer!\n
+ I am the creator of Cosmos Journeyer, and I am glad you're interested in this project.
It was years in the making you see: back in 2016 already, when I was working on my 3D planetarium, I dreamed
about
- making the planets fully explorable. But then I was limited by how little I knew about computer graphics.
-
- I only started CosmosJourneyer years later as a way to escape from the stress of my studies in French "classes
+ making the planets fully explorable. But then I was limited by how little I knew about computer graphics.\n
+ \n
+ I only started Cosmos Journeyer years later as a way to escape from the stress of my studies in French "classes
préparatoires". At first, it was only a small procedural planet generator, which was called PlanetEngine.
But as ideas kept on coming, I continued working on it for years and the project grew way beyond what I had
- imagined at first.
-
- As I understand now that such projects cannot be achieved alone, I decided to open-source CosmosJourneyer so
+ imagined at first.\n
+ \n
+ As I understand now that such projects cannot be achieved alone, I decided to open-source Cosmos Journeyer so
that
- anyone could freely use and modify it to their liking and even contribute to the project.
-
- I hope you will enjoy CosmosJourneyer as much as I enjoy making it!
+ anyone could freely use and modify it to their liking and even contribute to the project.\n
+ \n
+ I hope you will enjoy Cosmos Journeyer as much as I enjoy making it!
Barthélemy Paléologue
-
If you have any question about CosmosJourneyer, feel free to contact me at If you have any question about Cosmos Journeyer, feel free to contact me atbarth.paleologue@cosmosjourneyer.com
diff --git a/src/html/mainMenu.html b/src/html/mainMenu.html
index 82af90db9..1c08c6ed8 100644
--- a/src/html/mainMenu.html
+++ b/src/html/mainMenu.html
@@ -4,11 +4,11 @@
Cosmos Journeyer
\ No newline at end of file
diff --git a/src/locales/en-US/common.json b/src/locales/en-US/common.json
new file mode 100644
index 000000000..d42c376db
--- /dev/null
+++ b/src/locales/en-US/common.json
@@ -0,0 +1,4 @@
+{
+ "loading": "Loading, please wait...",
+ "fullscreen": "Press F11 to enable fullscreen"
+}
\ No newline at end of file
diff --git a/src/locales/en-US/mainMenu.json b/src/locales/en-US/mainMenu.json
new file mode 100644
index 000000000..0c18b5e73
--- /dev/null
+++ b/src/locales/en-US/mainMenu.json
@@ -0,0 +1,8 @@
+{
+ "newJourney": "New Journey",
+ "loadSave": "Load Save",
+ "settings": "Settings",
+ "contribute": "Contribute",
+ "credits": "Credits",
+ "about": "About"
+}
\ No newline at end of file
diff --git a/src/locales/en-US/notifications.json b/src/locales/en-US/notifications.json
new file mode 100644
index 000000000..363e09319
--- /dev/null
+++ b/src/locales/en-US/notifications.json
@@ -0,0 +1,8 @@
+{
+ "howToFly": "Your pointer controls the pitch and roll of your spaceship. The neutral position is at the center of the screen.",
+ "landingSequenceEngaged": "Landing sequence engaged",
+ "landingComplete": "Landing complete! Use {{bindingsString}} to disembark.",
+ "copiedToClipboard": "Copied to clipboard",
+ "howToLiftOff": "Hold {{bindingsString}} to lift off.",
+ "howToHyperSpace": "Align your ship with the system target using the target helper on the bottom right of your screen then press {{bindingsString}} to make a hyperspace jump."
+}
\ No newline at end of file
diff --git a/src/locales/en-US/objectTypes.json b/src/locales/en-US/objectTypes.json
new file mode 100644
index 000000000..5346f7f28
--- /dev/null
+++ b/src/locales/en-US/objectTypes.json
@@ -0,0 +1,11 @@
+{
+ "starSystem": "Star system",
+ "star": "{{stellarType}} Star",
+ "neutronStar": "Neutron Star",
+ "blackHole": "Black Hole",
+ "gasPlanet": "Gas planet",
+ "telluricPlanet": "Telluric Planet",
+ "telluricMoon": "Telluric Moon",
+ "spaceStation": "Space Station",
+ "anomaly": "Anomaly"
+}
\ No newline at end of file
diff --git a/src/locales/en-US/pauseMenu.json b/src/locales/en-US/pauseMenu.json
new file mode 100644
index 000000000..de113fb26
--- /dev/null
+++ b/src/locales/en-US/pauseMenu.json
@@ -0,0 +1,8 @@
+{
+ "resume": "Resume",
+ "save": "Save Game",
+ "settings": "Settings",
+ "contribute": "Contribute",
+ "share": "Share Position",
+ "screenshot": "Take Screenshot"
+}
\ No newline at end of file
diff --git a/src/locales/en-US/sidePanel.json b/src/locales/en-US/sidePanel.json
new file mode 100644
index 000000000..4a8c44aae
--- /dev/null
+++ b/src/locales/en-US/sidePanel.json
@@ -0,0 +1,21 @@
+{
+ "dropASaveFileHere": "Drop a save file here",
+ "settings": "Settings",
+ "contribute": "Contribute",
+ "bugReports": "Bug Reports",
+ "bugReportsText": "If you experience any bug during your exploration, please add it to the
issue tracker. You can also send an email at
barth.paleologue@cosmosjourneyer.com. Sending screenshots and save files can help enormously with the debugging process.",
+ "translation": "Translation",
+ "translationText": "Translating Cosmos Journeyer makes it accessible to more people around the world! You don't need any coding skills, only proficiency in a language not currently supported or that can be enhanced. You can access the translation guide
here.",
+ "knowHowToCode": "Know how to code?",
+ "knowHowToCodeText": "Cosmos Journeyer is an open-source project which means anyone can help build it! Why not you?\n You can check out
the repository of the project for more details. Please take a look at the contributing guidelines before starting to contribute to Cosmos Journeyer.",
+ "supportFinancially": "Support financially",
+ "supportFinanciallyText": "Building Cosmos Journeyer takes a lot of time and effort while being free for everyone. Please consider sponsoring the project on
Patreon or
Ko-fi. Your support will help me dedicate more time to the project and make it even better!",
+ "credits": "Credits",
+ "programming": "Programming",
+ "font": "Font",
+ "music": "Music",
+ "soundEffects": "Sound Effects",
+ "about": "About",
+ "aboutText": "Hello fellow explorer!\nI am the creator of Cosmos Journeyer, and I am glad you're interested in this project. It was years in the making you see: back in 2016 already, when I was working on my 3D planetarium, I dreamed about making the planets fully explorable. But then I was limited by how little I knew about computer graphics.\n\nI only started Cosmos Journeyer years later as a way to escape from the stress of my studies in French \"classes préparatoires\". At first, it was only a small procedural planet generator, which was called PlanetEngine. But as ideas kept on coming, I continued working on it for years and the project grew way beyond what I had imagined at first.\n\nAs I understand now that such projects cannot be achieved alone, I decided to open-source Cosmos Journeyer so that anyone can freely use and modify it to their liking and even contribute to the project.\n\nI hope you will enjoy CosmosJourneyer as much as I enjoy making it!",
+ "emailContact": "If you have any question about Cosmos Journeyer, feel free to contact me at
barth.paleologue@cosmosjourneyer.com"
+}
\ No newline at end of file
diff --git a/src/locales/en-US/starMap.json b/src/locales/en-US/starMap.json
new file mode 100644
index 000000000..5c3c6a898
--- /dev/null
+++ b/src/locales/en-US/starMap.json
@@ -0,0 +1,5 @@
+{
+ "distance": "Distance",
+ "planets": "Planets",
+ "setAsDestination": "Set as Destination"
+}
\ No newline at end of file
diff --git a/src/locales/en-US/units.json b/src/locales/en-US/units.json
new file mode 100644
index 000000000..8b877bce7
--- /dev/null
+++ b/src/locales/en-US/units.json
@@ -0,0 +1,4 @@
+{
+ "ly": "ly",
+ "ls": "ls"
+}
\ No newline at end of file
diff --git a/src/locales/fr-FR/common.json b/src/locales/fr-FR/common.json
new file mode 100644
index 000000000..3051e4081
--- /dev/null
+++ b/src/locales/fr-FR/common.json
@@ -0,0 +1,4 @@
+{
+ "loading": "Chargement...",
+ "fullscreen": "Appuyez sur F11 pour entrer en plein écran !"
+}
\ No newline at end of file
diff --git a/src/locales/fr-FR/mainMenu.json b/src/locales/fr-FR/mainMenu.json
new file mode 100644
index 000000000..27a9bf7d7
--- /dev/null
+++ b/src/locales/fr-FR/mainMenu.json
@@ -0,0 +1,8 @@
+{
+ "newJourney": "Nouveau Voyage",
+ "loadSave": "Charger une partie",
+ "settings": "Paramètres",
+ "contribute": "Contribuer",
+ "credits": "Crédits",
+ "about": "A propos"
+}
\ No newline at end of file
diff --git a/src/locales/fr-FR/notifications.json b/src/locales/fr-FR/notifications.json
new file mode 100644
index 000000000..4f1aa3520
--- /dev/null
+++ b/src/locales/fr-FR/notifications.json
@@ -0,0 +1,8 @@
+{
+ "howToFly": "La souris contrôle le tangage et le roulis du vaisseau. La position neutre se trouve au centre de l'écran.",
+ "landingSequenceEngaged": "Début de la séquence d'atterrissage.",
+ "landingComplete": "Atterrissage réussi ! Utilisez {{bindingsString}} pour sortir du vaisseau.",
+ "copiedToClipboard": "Copié dans le presse-papiers.",
+ "howToLiftOff": "Maintenez {{bindingsString}} pour décoller.",
+ "howToHyperSpace": "Alignez votre vaisseau avec la cible du système de destination à l'aide du radar de cible en bas à droite de l'écran. Appuyez ensuite sur {{bindingsString}} pour enclencher le saut hyperspatial."
+}
\ No newline at end of file
diff --git a/src/locales/fr-FR/objectTypes.json b/src/locales/fr-FR/objectTypes.json
new file mode 100644
index 000000000..1542edad6
--- /dev/null
+++ b/src/locales/fr-FR/objectTypes.json
@@ -0,0 +1,11 @@
+{
+ "starSystem": "Système Solaire",
+ "star": "Etoile de type {{stellarType}}",
+ "neutronStar": "Etoile à Neutrons",
+ "blackHole": "Trou Noir",
+ "gasPlanet": "Planète Gazeuse",
+ "telluricPlanet": "Planète Tellurique",
+ "telluricMoon": "Lune Tellurique",
+ "spaceStation": "Station Spatiale",
+ "anomaly": "Anomalie"
+}
\ No newline at end of file
diff --git a/src/locales/fr-FR/pauseMenu.json b/src/locales/fr-FR/pauseMenu.json
new file mode 100644
index 000000000..89f315243
--- /dev/null
+++ b/src/locales/fr-FR/pauseMenu.json
@@ -0,0 +1,8 @@
+{
+ "resume": "Reprendre",
+ "save": "Sauvegarder",
+ "settings": "Paramètres",
+ "contribute": "Contribuer",
+ "share": "Partager la position",
+ "screenshot": "Capture d'écran"
+}
\ No newline at end of file
diff --git a/src/locales/fr-FR/sidePanel.json b/src/locales/fr-FR/sidePanel.json
new file mode 100644
index 000000000..53b674207
--- /dev/null
+++ b/src/locales/fr-FR/sidePanel.json
@@ -0,0 +1,21 @@
+{
+ "dropASaveFileHere": "Déposez un fichier de sauvegarde ici",
+ "settings": "Paramètres",
+ "contribute": "Contribuer",
+ "bugReports": "Signaler un bug",
+ "bugReportsText": "Si vous rencontrez un bug lors de votre exploration, merci de l'ajouter au
tracker de bugs. Vous pouvez aussi envoyer un email à
barth.paleologue@cosmosjourneyer.com. Envoyer des captures d'écran et des fichiers de sauvegarde peut grandement aider le processus de débogage.",
+ "translation": "Traduction",
+ "translationText": "Traduire Cosmos Journeyer le rend accessible à plus de personnes à travers le monde ! Vous n'avez pas besoin de compétences en programmation, seulement d'une maîtrise d'une langue non supportée ou qui peut être améliorée. Vous pouvez accéder au guide de traduction
ici.",
+ "knowHowToCode": "Vous savez coder ?",
+ "knowHowToCodeText": "Cosmos Journeyer est un projet open-source, ce qui signifie que n'importe qui peut aider à le construire ! Pourquoi pas vous ?\n Vous pouvez consulter
le dépôt du projet pour plus de détails. Merci de lire les directives de contribution avant de commencer à contribuer à Cosmos Journeyer.",
+ "supportFinancially": "Soutenir financièrement",
+ "supportFinanciallyText": "Construire Cosmos Journeyer demande beaucoup de temps et d'efforts tout en étant gratuit pour tout le monde. Si le coeur vous en dit, vous pouvez sponsoriser le projet via
Patreon ou
Ko-fi. Votre soutien m'aidera à consacrer plus de temps au projet et à le rendre encore meilleur !",
+ "credits": "Crédits",
+ "programming": "Programmation",
+ "font": "Police",
+ "music": "Musique",
+ "soundEffects": "Effets sonores",
+ "about": "À propos",
+ "aboutText": "Bienvenue cher explorateur !\nJe suis le créateur de Cosmos Journeyer, et je suis ravi que vous soyez intéressé. Longtemps, j'ai rêvé de faire ce project. En 2016 déjà lorsque je travaillais sur mon Planétarium en 3D, j'imaginais rendre les planètes entièrement explorables. Mais mes connaissances en informatique graphique étaient alors trop limitées.\n\nJ'ai commencé Cosmos Journeyer bien des années plus tard, comme une façon d'échapper au stress des concours des classes préparatoires. Cela a commencé par un petit générateur de planètes, que j'appelais PlanetEngine (\"moteur à planète\"). Mais plus je travaillais dessus, et plus j'avais des nouvelles idées. Après plus de 3 années de travail, je peux dire que le projet est allé bien au delà de ce que j'imaginais pouvoir faire au début.\n\nIl serait illusoire de penser que je puisse seul terminer Cosmos Journeyer un jour. C'est pourquoi j'ai décidé de rendre le projet open-source, afin que chacun puisse l'utiliser et le modifier à sa guise, et même contribuer au projet dans les années à venir.\n\nJ'espère que vous aimerez Cosmos Journeyer autant que j'aime le créer !",
+ "emailContact": "Si vous avez des questions sur Cosmos Journeyer, n'hésitez pas à me contacter à
barth.paleologue@cosmosjourneyer.com"
+}
\ No newline at end of file
diff --git a/src/locales/fr-FR/starMap.json b/src/locales/fr-FR/starMap.json
new file mode 100644
index 000000000..e07b86e2f
--- /dev/null
+++ b/src/locales/fr-FR/starMap.json
@@ -0,0 +1,5 @@
+{
+ "distance": "Distance",
+ "planets": "Planètes",
+ "setAsDestination": "Définir comme destination"
+}
\ No newline at end of file
diff --git a/src/locales/fr-FR/units.json b/src/locales/fr-FR/units.json
new file mode 100644
index 000000000..9d352fb54
--- /dev/null
+++ b/src/locales/fr-FR/units.json
@@ -0,0 +1,4 @@
+{
+ "ly": "al",
+ "ls": "sl"
+}
\ No newline at end of file
diff --git a/src/shaders/butterflyMaterial/butterflyFragment.glsl b/src/shaders/butterflyMaterial/butterflyFragment.glsl
index a3dbc59b8..49d1feaf8 100644
--- a/src/shaders/butterflyMaterial/butterflyFragment.glsl
+++ b/src/shaders/butterflyMaterial/butterflyFragment.glsl
@@ -29,6 +29,12 @@ varying vec2 vUV;
varying mat4 normalMatrix;
varying vec3 vNormal;
+// This is used to render the grass blade to the depth buffer properly
+// (see https://forum.babylonjs.com/t/how-to-write-shadermaterial-to-depthrenderer/47227/3 and https://playground.babylonjs.com/#6GFJNR#161)
+#ifdef FORDEPTH
+varying float vDepthMetric;
+#endif
+
varying vec3 vOriginalWorldPosition;
// src: https://gist.github.com/mairod/a75e7b44f68110e1576d77419d608786
@@ -72,5 +78,9 @@ void main() {
// ambient lighting
ndl = clamp(ndl + 0.1, 0.0, 1.0);
- gl_FragColor = vec4(finalColor.rgb * ndl, 1.0);// apply color and lighting
+ #ifdef FORDEPTH
+ gl_FragColor = vec4(vDepthMetric, 0.0, 0.0, 1.0);
+ #else
+ gl_FragColor = vec4(finalColor.rgb * ndl, 1.0);
+ #endif
}
\ No newline at end of file
diff --git a/src/shaders/butterflyMaterial/butterflyVertex.glsl b/src/shaders/butterflyMaterial/butterflyVertex.glsl
index 602f7cdcd..5d6a1c1e9 100644
--- a/src/shaders/butterflyMaterial/butterflyVertex.glsl
+++ b/src/shaders/butterflyMaterial/butterflyVertex.glsl
@@ -37,6 +37,13 @@ varying vec3 vNormal;
varying vec3 vOriginalWorldPosition;
+// This is used to render the grass blade to the depth buffer properly
+// (see https://forum.babylonjs.com/t/how-to-write-shadermaterial-to-depthrenderer/47227/3 and https://playground.babylonjs.com/#6GFJNR#161)
+#ifdef FORDEPTH
+uniform vec2 depthValues;
+varying float vDepthMetric;
+#endif
+
#include "../utils/rotateAround.glsl";
float easeOut(float t, float a) {
@@ -92,4 +99,8 @@ void main() {
normalMatrix = transpose(inverse(finalWorld));
vNormal = normal;
+
+ #ifdef FORDEPTH
+ vDepthMetric = (-gl_Position.z + depthValues.x) / (depthValues.y);
+ #endif
}
\ No newline at end of file
diff --git a/src/shaders/grassMaterial/grassFragment.glsl b/src/shaders/grassMaterial/grassFragment.glsl
index c9b190841..b2e595641 100644
--- a/src/shaders/grassMaterial/grassFragment.glsl
+++ b/src/shaders/grassMaterial/grassFragment.glsl
@@ -26,7 +26,16 @@ varying vec3 vPosition;
varying mat4 normalMatrix;
varying vec3 vNormal;
+// This is used to render the grass blade to the depth buffer properly
+// (see https://forum.babylonjs.com/t/how-to-write-shadermaterial-to-depthrenderer/47227/3 and https://playground.babylonjs.com/#6GFJNR#161)
+#ifdef FORDEPTH
+varying float vDepthMetric;
+#endif
+
void main() {
+ #ifdef FORDEPTH
+ gl_FragColor = vec4(vDepthMetric, 0.0, 0.0, 1.0);
+ #else
vec3 baseColor = vec3(0.05, 0.2, 0.01);
vec3 tipColor = vec3(0.5, 0.5, 0.1);
@@ -46,4 +55,5 @@ void main() {
float ao = mix(aoForDensity, 1.0, pow(vPosition.y, 2.0));
gl_FragColor = vec4(finalColor * ndl * ao, 1.0);// apply color and lighting
+ #endif
}
\ No newline at end of file
diff --git a/src/shaders/grassMaterial/grassVertex.glsl b/src/shaders/grassMaterial/grassVertex.glsl
index 51c5b1404..5499d8214 100644
--- a/src/shaders/grassMaterial/grassVertex.glsl
+++ b/src/shaders/grassMaterial/grassVertex.glsl
@@ -35,6 +35,13 @@ varying vec3 vPosition;
varying mat4 normalMatrix;
varying vec3 vNormal;
+// This is used to render the grass blade to the depth buffer properly
+// (see https://forum.babylonjs.com/t/how-to-write-shadermaterial-to-depthrenderer/47227/3 and https://playground.babylonjs.com/#6GFJNR#161)
+#ifdef FORDEPTH
+uniform vec2 depthValues;
+varying float vDepthMetric;
+#endif
+
#include "../utils/rotateAround.glsl";
float easeOut(float t, float a) {
@@ -101,4 +108,8 @@ void main() {
normalMatrix = transpose(inverse(finalWorld));
vNormal = leaningNormal;
+
+ #ifdef FORDEPTH
+ vDepthMetric = (-gl_Position.z + depthValues.x) / (depthValues.y);
+ #endif
}
\ No newline at end of file
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 32ebedc49..4bd642955 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -60,7 +60,7 @@ body {
width: fit-content;
position: absolute;
top: 65vh;
- left: 5%;
+ left: 2.5vw;
transform: translateY(-50%);
transition: 0.2s ease-in-out;
@@ -107,6 +107,8 @@ body {
@import "inputs.scss";
+ @import "loadingScreen.scss";
+
#renderer {
z-index: 1;
float: left;
diff --git a/src/styles/loadingScreen.scss b/src/styles/loadingScreen.scss
new file mode 100644
index 000000000..4fdcc5746
--- /dev/null
+++ b/src/styles/loadingScreen.scss
@@ -0,0 +1,48 @@
+#babylonjsLoadingDiv {
+ opacity: 0;
+ transition: opacity 1.5s ease;
+ pointer-events: none;
+ display: grid;
+ grid-template-rows: 100%;
+ grid-template-columns: 100%;
+ justify-items: center;
+ align-items: center;
+}
+
+.imageSpinnerContainer {
+ width: 300px;
+ grid-column: 1;
+ grid-row: 1;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ position: absolute;
+
+ .loadingSpinner {
+ animation: spin1 0.75s infinite linear;
+ transform-origin: 50% 50%;
+ }
+}
+
+.loadingText {
+ margin-top: 160px;
+ font-family: Nasalization, sans-serif;
+ font-size: 1.5em;
+ color: white;
+ z-index: 1;
+ text-align: center;
+
+ position: absolute;
+ left: 0;
+ width: 100%;
+ top: 50%;
+}
+
+@keyframes spin1 {
+ 0% {
+ transform: rotate(0deg);
+ }
+ 100% {
+ transform: rotate(360deg);
+ }
+}
\ No newline at end of file
diff --git a/src/styles/mainMenu.scss b/src/styles/mainMenu.scss
index 549807582..f8b0c5ffe 100644
--- a/src/styles/mainMenu.scss
+++ b/src/styles/mainMenu.scss
@@ -53,7 +53,7 @@
}
-.rightPanel {
+.sidePanel {
position: absolute;
max-width: 1400px;
width: 72%;
@@ -131,6 +131,10 @@
font-size: 1.25em;
padding: 0 20px;
+ &[data-i18n] {
+ white-space: pre-line; // necessary to use \n in the text
+ }
+
&.signature {
text-align: right;
font-style: italic;
diff --git a/src/ts/alphaTestis.ts b/src/ts/alphaTestis.ts
index 84ffe5f59..43a001cb5 100644
--- a/src/ts/alphaTestis.ts
+++ b/src/ts/alphaTestis.ts
@@ -81,11 +81,10 @@ const planet = StarSystemHelper.MakeTelluricPlanet(starSystem, planetModel);
planet.model.ringsUniforms = new RingsUniforms(planet.model.rng);
planet.postProcesses.push(PostProcessType.RING);
-const spacestation = new SpaceStation(starSystemView.scene, planet);
-starSystemView.getStarSystem().addSpaceStation(spacestation);
+const [spaceStation] = StarSystemHelper.MakeSpaceStations(starSystem, planet, 1);
-//physicsViewer.showBody(spacestation.aggregate.body);
-/*for(const landingpad of spacestation.landingPads) {
+//physicsViewer.showBody(spaceStation.aggregate.body);
+/*for(const landingpad of spaceStation.landingPads) {
physicsViewer.showBody(landingpad.aggregate.body);
}*/
@@ -167,7 +166,7 @@ document.addEventListener("keydown", (e) => {
if (engine.isPaused()) return;
if (e.key === "o") {
- const landingPad = spacestation.handleDockingRequest();
+ const landingPad = spaceStation.handleDockingRequest();
if (landingPad !== null && starSystemView.scene.getActiveControls() === spaceshipController) {
spaceshipController.spaceship.engageLandingOnPad(landingPad);
}
diff --git a/src/ts/architecture/orbitalObject.ts b/src/ts/architecture/orbitalObject.ts
index 64f57d2e0..977ca1737 100644
--- a/src/ts/architecture/orbitalObject.ts
+++ b/src/ts/architecture/orbitalObject.ts
@@ -53,7 +53,7 @@ export interface OrbitalObject extends Transformable, BoundingSphere, TypedObjec
parent: OrbitalObject | null;
}
-export class OrbitalObject {
+export class OrbitalObjectUtils {
/**
* Returns the next position of the object on its orbit. This does not update the position of the object (see UpdateOrbitalPosition)
* @param object The object we want to compute the next position of
@@ -95,7 +95,7 @@ export class OrbitalObject {
if (orbit.period === 0 || object.parent === null) return;
const oldPosition = object.getTransform().getAbsolutePosition();
- const newPosition = OrbitalObject.GetNextOrbitalPosition(object, deltaTime);
+ const newPosition = OrbitalObjectUtils.GetNextOrbitalPosition(object, deltaTime);
translate(object.getTransform(), newPosition.subtractInPlace(oldPosition));
}
@@ -117,7 +117,7 @@ export class OrbitalObject {
* @constructor
*/
static UpdateRotation(object: OrbitalObject, deltaTime: number): void {
- const dtheta = OrbitalObject.GetRotationAngle(object, deltaTime);
+ const dtheta = OrbitalObjectUtils.GetRotationAngle(object, deltaTime);
if (dtheta === 0) return;
const elementaryRotationQuaternion = Quaternion.RotationAxis(object.getRotationAxis(), dtheta);
diff --git a/src/ts/assets.ts b/src/ts/assets.ts
index 2748b213d..fc342cd75 100644
--- a/src/ts/assets.ts
+++ b/src/ts/assets.ts
@@ -17,7 +17,6 @@
import "@babylonjs/loaders";
import "@babylonjs/core/Loading/Plugins/babylonFileLoader";
-import "@babylonjs/core/Loading/loadingScreen";
import "@babylonjs/core/Animations/animatable";
import rockNormalMap from "../asset/textures/rockn.png";
@@ -86,8 +85,11 @@ import { MeshBuilder } from "@babylonjs/core/Meshes/meshBuilder";
import { ProceduralTexture } from "@babylonjs/core/Materials/Textures/Procedurals/proceduralTexture";
import { createButterfly } from "./proceduralAssets/butterfly/butterfly";
import { createGrassBlade } from "./proceduralAssets/grass/grassBlade";
+import { ShaderMaterial } from "@babylonjs/core/Materials/shaderMaterial";
import { ButterflyMaterial } from "./proceduralAssets/butterfly/butterflyMaterial";
import { GrassMaterial } from "./proceduralAssets/grass/grassMaterial";
+import { LoadingScreen } from "./uberCore/loadingScreen";
+import i18next from "./i18n";
export class Assets {
static IS_READY = false;
@@ -132,7 +134,10 @@ export class Assets {
public static GRASS_BLADE: Mesh;
public static BUTTERFLY_MATERIAL: ButterflyMaterial;
+ public static BUTTERFLY_DEPTH_MATERIAL: ButterflyMaterial;
+
public static GRASS_MATERIAL: GrassMaterial;
+ public static GRASS_DEPTH_MATERIAL: GrassMaterial;
public static OUCH_SOUND: Sound;
public static ENGINE_RUNNING_SOUND: Sound;
@@ -311,14 +316,18 @@ export class Assets {
Assets.BUTTERFLY = createButterfly(scene);
Assets.BUTTERFLY.isVisible = false;
- Assets.BUTTERFLY_MATERIAL = new ButterflyMaterial(scene);
+ Assets.BUTTERFLY_MATERIAL = new ButterflyMaterial(scene, false);
Assets.BUTTERFLY.material = Assets.BUTTERFLY_MATERIAL;
+ Assets.BUTTERFLY_DEPTH_MATERIAL = new ButterflyMaterial(scene, true);
+
Assets.GRASS_BLADE = createGrassBlade(scene, 3);
Assets.GRASS_BLADE.isVisible = false;
- Assets.GRASS_MATERIAL = new GrassMaterial(scene);
+ Assets.GRASS_MATERIAL = new GrassMaterial(scene, false);
Assets.GRASS_BLADE.material = Assets.GRASS_MATERIAL;
+ Assets.GRASS_DEPTH_MATERIAL = new GrassMaterial(scene, true);
+
const ouchSoundTask = Assets.MANAGER.addBinaryFileTask("ouchSoundTask", ouchSound);
ouchSoundTask.onSuccess = function (task) {
Assets.OUCH_SOUND = new Sound("OuchSound", task.data, scene);
@@ -471,7 +480,7 @@ export class Assets {
});
Assets.MANAGER.onProgress = (remainingCount, totalCount) => {
- scene.getEngine().loadingScreen.loadingUIText = `Loading assets... ${totalCount - remainingCount}/${totalCount}`;
+ (scene.getEngine().loadingScreen as LoadingScreen).setProgressPercentage(100 * (totalCount - remainingCount) / totalCount);
};
Assets.SCATTER_CUBE = MeshBuilder.CreateBox("cube", { size: 1 }, scene);
@@ -481,7 +490,7 @@ export class Assets {
Assets.MANAGER.onFinish = () => {
console.log("Assets loaded");
- scene.getEngine().loadingScreen.loadingUIText = "Press F11 to go fullscreen";
+ scene.getEngine().loadingScreen.loadingUIText = i18next.t("common:fullscreen");
Assets.IS_READY = true;
};
@@ -534,8 +543,8 @@ export class Assets {
return Assets.LANDING_PAD.instantiateHierarchy(null, { doNotInstantiate: false }) as InstancedMesh;
}
- static DebugMaterial(name: string, diffuse = false, wireframe = false) {
- const mat = new StandardMaterial(`${name}DebugMaterial`);
+ static DebugMaterial(name: string, diffuse: boolean, wireframe: boolean, scene: Scene) {
+ const mat = new StandardMaterial(`${name}DebugMaterial`, scene);
if (!diffuse) {
mat.emissiveColor = Color3.Random();
mat.disableLighting = true;
diff --git a/src/ts/cosmosJourneyer.ts b/src/ts/cosmosJourneyer.ts
index 2eccc2404..433542ec1 100644
--- a/src/ts/cosmosJourneyer.ts
+++ b/src/ts/cosmosJourneyer.ts
@@ -49,16 +49,17 @@ import { GeneralInputs } from "./inputs/generalInputs";
import { createNotification } from "./utils/notification";
import { StarSystemInputs } from "./inputs/starSystemInputs";
import { pressInteractionToStrings } from "./utils/inputControlsString";
-import { DefaultControlsInputs } from "./defaultController/defaultControlsInputs";
+import { LoadingScreen } from "./uberCore/loadingScreen";
+import i18n from "./i18n";
-enum EngineState {
+const enum EngineState {
UNINITIALIZED,
RUNNING,
PAUSED
}
/**
- * Main class of CosmosJourneyer. It handles the underlying BabylonJS engine, and the communication between
+ * Main class of Cosmos Journeyer. It handles the underlying BabylonJS engine, and the communication between
* the starmap view and the star system view. It also provides utility methods to take screenshots and record videos.
* It also handles the pause menu.
*/
@@ -93,10 +94,7 @@ export class CosmosJourneyer {
this.starSystemView.setSystemAsTarget(seed);
const bindingsString = pressInteractionToStrings(StarSystemInputs.map.jumpToSystem).join(" or ");
- createNotification(
- `Align your ship with the system target using the target helper on the bottom right of your screen then press ${bindingsString} to make a hyperspace jump.`,
- 20000
- );
+ createNotification(i18n.t("notifications:howToHyperSpace", { bindingsString: bindingsString }), 20000);
});
// Init the active scene
@@ -107,7 +105,7 @@ export class CosmosJourneyer {
this.mainMenu = new MainMenu(starSystemView);
this.mainMenu.onStartObservable.add(() => {
- createNotification("Your pointer controls the pitch and roll of your spaceship. The neutral position is at the center of the screen.", 20000);
+ createNotification(i18n.t("notifications:howToFly"), 20000);
this.starMap.setCurrentStarSystem(this.starSystemView.getStarSystem().model.seed);
this.starSystemView.switchToSpaceshipControls();
this.starSystemView.getSpaceshipControls().spaceship.enableWarpDrive();
@@ -135,7 +133,7 @@ export class CosmosJourneyer {
const payload = `universeCoordinates=${urlData}`;
const url = new URL(`https://barthpaleologue.github.io/CosmosJourneyer/?${payload}`);
navigator.clipboard.writeText(url.toString()).then(() => {
- createNotification("Copied to clipboard", 2000);
+ createNotification(i18n.t("notifications:copiedToClipboard"), 2000);
});
});
this.pauseMenu.onSave.add(() => this.downloadSaveFile());
@@ -197,6 +195,7 @@ export class CosmosJourneyer {
});
engine.useReverseDepthBuffer = true;
+ engine.loadingScreen = new LoadingScreen(canvas);
engine.loadingScreen.displayLoadingUI();
window.addEventListener("resize", () => {
engine.resize(true);
@@ -419,6 +418,10 @@ export class CosmosJourneyer {
// re-centers the star system
this.starSystemView.getStarSystem().applyFloatingOrigin();
+
+ // set the ui target to the nearest orbital object
+ this.starSystemView.ui.setTarget(nearestOrbitalObject);
+ this.starSystemView.helmetOverlay.setTarget(nearestOrbitalObject.getTransform());
});
await this.starSystemView.loadStarSystem(new StarSystemController(seed, this.starSystemView.scene), true);
diff --git a/src/ts/i18n.ts b/src/ts/i18n.ts
new file mode 100644
index 000000000..c290536bb
--- /dev/null
+++ b/src/ts/i18n.ts
@@ -0,0 +1,44 @@
+import i18next, { Resource, init, t } from "i18next";
+
+/**
+ * Load all the resources from the locales folder and return them in the i18next format.
+ * This takes place at build time, so the resources are bundled with the application.
+ */
+function loadResources() {
+ const requireContext = require.context("../locales/", true, /\.json$/);
+ const resources: Resource = {}; // { "en-US": { "notifications": { ... } }, "es-ES": { "notifications": { ... } } }
+
+ requireContext.keys().forEach((key: string) => {
+ const languageFolder = key.split("/")[1]; // (./en-US/notifications.json) => en-US
+ const nameSpace = key.split("/")[2].split(".")[0]; // (./en-US/notifications.json) => notifications
+ const fileContent = requireContext(key);
+
+ resources[languageFolder] = resources[languageFolder] || {};
+ resources[languageFolder][nameSpace] = fileContent;
+ });
+
+ return resources;
+}
+
+// init language to url parameter if defined, otherwise use the browser language
+const urlParams = new URLSearchParams(window.location.search);
+const language = urlParams.get("lang") || navigator.language;
+
+await init({
+ lng: language, // change this if you want to test a specific language
+ debug: process.env.NODE_ENV === 'development',
+ fallbackLng: "en-US",
+ resources: loadResources(),
+});
+
+// perform all static translations
+document.querySelectorAll("*[data-i18n]").forEach((element) => {
+ const key = element.getAttribute("data-i18n");
+ if (key === null) throw new Error("data-i18n attribute is null");
+
+ // this should be safe as we are not doing any interpolation
+ // (as long as the translation are reviewed before being merged of course)
+ element.innerHTML = t(key);
+});
+
+export default i18next;
diff --git a/src/ts/landingSimulator.ts b/src/ts/landingSimulator.ts
index 105f1a2bb..b56c004df 100644
--- a/src/ts/landingSimulator.ts
+++ b/src/ts/landingSimulator.ts
@@ -65,7 +65,7 @@ const physicsViewer = new PhysicsViewer();
/*physicsViewer.showBody(spaceship.aggregate.body);
physicsViewer.showBody(landingPad.aggregate.body);*/
-const spacestation = new SpaceStation(scene);
+const spacestation = new SpaceStation(scene, 42);
setRotationQuaternion(spacestation.getTransform(), Quaternion.RotationAxis(Axis.X, Math.PI / 2));
translate(spacestation.getTransform(), new Vector3(0, -100, 0));
diff --git a/src/ts/mainMenu/mainMenu.ts b/src/ts/mainMenu/mainMenu.ts
index 06bdc96c1..8019d5553 100644
--- a/src/ts/mainMenu/mainMenu.ts
+++ b/src/ts/mainMenu/mainMenu.ts
@@ -18,6 +18,7 @@ import { Assets } from "../assets";
import { Settings } from "../settings";
import { GasPlanet } from "../planets/gasPlanet/gasPlanet";
import { initSettingsPanel } from "./settingsPanel";
+import i18n from "../i18n";
export class MainMenu {
readonly scene: UberScene;
@@ -114,6 +115,13 @@ Math.trunc((Math.random() * 2 - 1) * 1000),
});
});
+ // Translate all main menu elements
+ document.querySelectorAll("#mainMenu *[data-i18n]").forEach((element) => {
+ const key = element.getAttribute("data-i18n");
+ if (key === null) throw new Error("data-i18n attribute is null");
+ element.textContent = i18n.t(key);
+ });
+
const loadSavePanel = document.getElementById("loadSavePanel");
if (loadSavePanel === null) throw new Error("#loadSavePanel does not exist!");
this.loadSavePanel = loadSavePanel;
@@ -132,7 +140,9 @@ Math.trunc((Math.random() * 2 - 1) * 1000),
if (aboutPanel === null) throw new Error("#about does not exist!");
this.aboutPanel = aboutPanel;
- document.getElementById("startButton")?.addEventListener("click", () => {
+ const startButton = document.getElementById("startButton");
+ if (startButton === null) throw new Error("#startButton does not exist!");
+ startButton.addEventListener("click", () => {
this.startAnimation(() => this.onStartObservable.notifyObservers());
});
@@ -328,6 +338,8 @@ Math.trunc((Math.random() * 2 - 1) * 1000),
this.htmlRoot.style.display = "none";
Assets.MAIN_MENU_BACKGROUND_MUSIC.stop();
onAnimationFinished();
+
+ return;
}
const currentProgress = translationAnimation.getProgress();
@@ -336,6 +348,7 @@ Math.trunc((Math.random() * 2 - 1) * 1000),
this.controls.getActiveCamera().getViewMatrix();
this.starSystemController.applyFloatingOrigin();
+ this.starSystemController.updateShaders(0.0, this.starSystemView.postProcessManager);
};
this.scene.onBeforePhysicsObservable.add(animationCallback);
diff --git a/src/ts/mandelbulb/mandelbulb.ts b/src/ts/mandelbulb/mandelbulb.ts
index 04c89282e..da8f0eacb 100644
--- a/src/ts/mandelbulb/mandelbulb.ts
+++ b/src/ts/mandelbulb/mandelbulb.ts
@@ -27,6 +27,7 @@ import { RingsUniforms } from "../postProcesses/rings/ringsUniform";
import { Vector3 } from "@babylonjs/core/Maths/math.vector";
import { Cullable } from "../bodies/cullable";
import { OrbitalObjectPhysicalProperties } from "../architecture/physicalProperties";
+import i18n from "../i18n";
export class Mandelbulb implements CelestialBody, Cullable {
readonly name: string;
@@ -89,7 +90,7 @@ export class Mandelbulb implements CelestialBody, Cullable {
}
getTypeName(): string {
- return "Anomaly";
+ return i18n.t("objectTypes:anomaly");
}
computeCulling(camera: Camera): void {
diff --git a/src/ts/model/common.ts b/src/ts/model/common.ts
index 84fdb7b13..66621c3aa 100644
--- a/src/ts/model/common.ts
+++ b/src/ts/model/common.ts
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see
.
-export enum GenerationSteps {
+export const enum GenerationSteps {
AXIAL_TILT = 100,
ORBIT = 200,
ORBITAL_PERIOD = 500,
@@ -33,14 +33,14 @@ export enum GenerationSteps {
TEMPERATURE = 1100,
STELLAR_TYPE = 1900,
- PRESSURE = 1100,
- WATER_AMOUNT = 1200,
+ PRESSURE = 1800,
+ WATER_AMOUNT = 1700,
TERRAIN = 1500,
- SPACE_STATION = 2000
+ SPACE_STATIONS = 2000
}
-export enum BodyType {
+export const enum BodyType {
STAR,
TELLURIC_PLANET,
GAS_PLANET,
diff --git a/src/ts/orbit/axisRenderer.ts b/src/ts/orbit/axisRenderer.ts
index b2e63e225..07d399750 100644
--- a/src/ts/orbit/axisRenderer.ts
+++ b/src/ts/orbit/axisRenderer.ts
@@ -20,6 +20,7 @@ import { Color3, Vector3 } from "@babylonjs/core/Maths/math";
import { StandardMaterial } from "@babylonjs/core/Materials/standardMaterial";
import { BoundingSphere } from "../architecture/boundingSphere";
import { Transformable } from "../architecture/transformable";
+import { Scene } from "@babylonjs/core/scene";
/**
* Visual helper designed to display the rotation axis of given objects
@@ -34,10 +35,11 @@ export class AxisRenderer {
/**
* Disposes all previously created axis meshes by calling reset() and then creates new axis meshes for the given objects
* @param objects
+ * @param scene
*/
- setObjects(objects: (Transformable & BoundingSphere)[]) {
+ setOrbitalObjects(objects: (Transformable & BoundingSphere)[], scene: Scene) {
if (this.axisMaterial === null) {
- this.axisMaterial = new StandardMaterial("axisMaterial");
+ this.axisMaterial = new StandardMaterial("axisMaterial", scene);
this.axisMaterial.emissiveColor = Color3.White();
this.axisMaterial.disableLighting = true;
}
diff --git a/src/ts/orbit/orbitRenderer.ts b/src/ts/orbit/orbitRenderer.ts
index b4c39b3c5..478ea97e5 100644
--- a/src/ts/orbit/orbitRenderer.ts
+++ b/src/ts/orbit/orbitRenderer.ts
@@ -21,6 +21,7 @@ import { StandardMaterial } from "@babylonjs/core/Materials/standardMaterial";
import { setUpVector } from "../uberCore/transforms/basicTransform";
import { getPointOnOrbitLocal } from "./orbit";
import { OrbitalObject } from "../architecture/orbitalObject";
+import { Scene } from "@babylonjs/core/scene";
export class OrbitRenderer {
private orbitMeshes: LinesMesh[] = [];
@@ -31,7 +32,13 @@ export class OrbitRenderer {
private _isVisible = false;
- setOrbitalObjects(orbitalObjects: OrbitalObject[]) {
+ setOrbitalObjects(orbitalObjects: OrbitalObject[], scene: Scene) {
+ if (this.orbitMaterial === null) {
+ this.orbitMaterial = new StandardMaterial("orbitMaterial", scene);
+ this.orbitMaterial.emissiveColor = Color3.White();
+ this.orbitMaterial.disableLighting = true;
+ }
+
this.reset();
this.orbitalObjects = orbitalObjects;
@@ -89,11 +96,5 @@ export class OrbitRenderer {
this.orbitMeshes.forEach((orbitMesh) => orbitMesh.dispose());
this.orbitMeshes = [];
this.orbitalObjects = [];
-
- if (this.orbitMaterial === null) {
- this.orbitMaterial = new StandardMaterial("orbitMaterial");
- this.orbitMaterial.emissiveColor = Color3.White();
- this.orbitMaterial.disableLighting = true;
- }
}
}
diff --git a/src/ts/physicSpaceship.ts b/src/ts/physicSpaceship.ts
index 8c8e54ed0..07f107d05 100644
--- a/src/ts/physicSpaceship.ts
+++ b/src/ts/physicSpaceship.ts
@@ -84,13 +84,13 @@ const chunkForge = new ChunkForgeWorkers(Settings.VERTEX_RESOLUTION);
const sphere = MeshBuilder.CreateSphere("sphere", { diameter: 2, segments: 32 }, scene);
sphere.position.y = 4;
sphere.position.x = 4;
-sphere.material = Assets.DebugMaterial("sphere", true);
+sphere.material = Assets.DebugMaterial("sphere", true, false, scene);
shadowGenerator.addShadowCaster(sphere);
const box = MeshBuilder.CreateBox("box", { size: 2 }, scene);
box.position.y = 4;
box.position.x = -4;
-box.material = Assets.DebugMaterial("box", true);
+box.material = Assets.DebugMaterial("box", true, false, scene);
shadowGenerator.addShadowCaster(box);
const spaceship = new Spaceship(scene);
@@ -103,7 +103,7 @@ const capsule = MeshBuilder.CreateCapsule("capsule", { radius: 0.6, height: 2 },
capsule.position.y = 4;
capsule.position.x = -4;
capsule.position.z = 4;
-capsule.material = Assets.DebugMaterial("capsule", true);
+capsule.material = Assets.DebugMaterial("capsule", true, false, scene);
capsule.visibility = 0.5;
shadowGenerator.addShadowCaster(capsule);
diff --git a/src/ts/planets/common.ts b/src/ts/planets/common.ts
index 9df22be50..48c314435 100644
--- a/src/ts/planets/common.ts
+++ b/src/ts/planets/common.ts
@@ -19,8 +19,14 @@ import { centeredRand } from "extended-random";
import { GenerationSteps } from "../model/common";
import { Settings } from "../settings";
import { PlanetModel } from "../architecture/planet";
+import { CelestialBodyModel } from "../architecture/celestialBody";
export function getMoonSeed(model: PlanetModel, index: number) {
if (index > model.nbMoons) throw new Error("Moon out of bound! " + index);
return centeredRand(model.rng, GenerationSteps.MOONS + index) * Settings.SEED_HALF_RANGE;
}
+
+export function getSpaceStationSeed(model: CelestialBodyModel, index: number) {
+ if (index > model.getNbSpaceStations()) throw new Error("Space station out of bound! " + index);
+ return centeredRand(model.rng, GenerationSteps.SPACE_STATIONS + index) * Settings.SEED_HALF_RANGE;
+}
diff --git a/src/ts/planets/gasPlanet/gasPlanet.ts b/src/ts/planets/gasPlanet/gasPlanet.ts
index e7e3a5d51..4ac39c80d 100644
--- a/src/ts/planets/gasPlanet/gasPlanet.ts
+++ b/src/ts/planets/gasPlanet/gasPlanet.ts
@@ -37,6 +37,7 @@ import { Cullable } from "../../bodies/cullable";
import { RingsUniforms } from "../../postProcesses/rings/ringsUniform";
import { OrbitalObjectPhysicalProperties } from "../../architecture/physicalProperties";
import { Transformable } from "../../architecture/transformable";
+import i18n from "../../i18n";
export class GasPlanet implements Planet, Cullable {
private readonly mesh: Mesh;
@@ -116,7 +117,7 @@ export class GasPlanet implements Planet, Cullable {
}
getTypeName(): string {
- return "Gas Planet";
+ return i18n.t("objectTypes:gasPlanet");
}
public computeCulling(camera: Camera): void {
diff --git a/src/ts/planets/gasPlanet/gasPlanetMaterial.ts b/src/ts/planets/gasPlanet/gasPlanetMaterial.ts
index 474730a72..b3ac2d1d9 100644
--- a/src/ts/planets/gasPlanet/gasPlanetMaterial.ts
+++ b/src/ts/planets/gasPlanet/gasPlanetMaterial.ts
@@ -35,6 +35,8 @@ export class GasPlanetMaterial extends ShaderMaterial {
readonly colorSettings: GazColorSettings;
private clock = 0;
+ private stellarObjects: Transformable[] = [];
+
constructor(planetName: string, planet: TransformNode, model: GasPlanetModel, scene: Scene) {
const shaderName = "gasPlanetMaterial";
if (Effect.ShadersStore[`${shaderName}FragmentShader`] === undefined) {
@@ -88,6 +90,20 @@ export class GasPlanetMaterial extends ShaderMaterial {
this.setColor3("color3", this.colorSettings.color3);
this.updateConstants();
+
+ this.onBindObservable.add(() => {
+ this.getEffect().setMatrix("normalMatrix", this.planet.getWorldMatrix().clone().invert().transpose());
+
+ const activeCamera = scene.activeCamera;
+ if(activeCamera === null) throw new Error("There is no active camera for GasPlanetMaterial!");
+ this.getEffect().setVector3("playerPosition", activeCamera.globalPosition);
+
+ this.getEffect().setArray3("star_positions", flattenVector3Array(this.stellarObjects.map((star) => star.getTransform().getAbsolutePosition())));
+ this.getEffect().setArray3("star_colors", flattenColor3Array(this.stellarObjects.map((star) => (star instanceof Star ? star.model.color : Color3.White()))));
+ this.getEffect().setInt("nbStars", this.stellarObjects.length);
+
+ this.getEffect().setFloat("time", this.clock % 100000);
+ });
}
public updateConstants(): void {
@@ -96,15 +112,6 @@ export class GasPlanetMaterial extends ShaderMaterial {
public update(player: Camera, stellarObjects: Transformable[], deltaTime: number) {
this.clock += deltaTime;
-
- this.setMatrix("normalMatrix", this.planet.getWorldMatrix().clone().invert().transpose());
-
- this.setVector3("playerPosition", player.globalPosition);
-
- this.setArray3("star_positions", flattenVector3Array(stellarObjects.map((star) => star.getTransform().getAbsolutePosition())));
- this.setArray3("star_colors", flattenColor3Array(stellarObjects.map((star) => (star instanceof Star ? star.model.color : Color3.White()))));
- this.setInt("nbStars", stellarObjects.length);
-
- this.setFloat("time", this.clock % 100000);
+ this.stellarObjects = stellarObjects;
}
}
diff --git a/src/ts/planets/gasPlanet/gasPlanetModel.ts b/src/ts/planets/gasPlanet/gasPlanetModel.ts
index 89dd2a84b..d8a45e29f 100644
--- a/src/ts/planets/gasPlanet/gasPlanetModel.ts
+++ b/src/ts/planets/gasPlanet/gasPlanetModel.ts
@@ -99,8 +99,8 @@ export class GasPlanetModel implements PlanetModel {
}
public getNbSpaceStations(): number {
- if (uniformRandBool(0.2, this.rng, GenerationSteps.SPACE_STATION)) return 1;
- if (uniformRandBool(0.1, this.rng, GenerationSteps.SPACE_STATION + 10)) return 2;
+ if (uniformRandBool(0.2, this.rng, GenerationSteps.SPACE_STATIONS)) return 1;
+ if (uniformRandBool(0.1, this.rng, GenerationSteps.SPACE_STATIONS + 10)) return 2;
return 0;
}
}
diff --git a/src/ts/planets/telluricPlanet/colorSettingsInterface.ts b/src/ts/planets/telluricPlanet/colorSettingsInterface.ts
index f2ce3257e..d415aa83b 100644
--- a/src/ts/planets/telluricPlanet/colorSettingsInterface.ts
+++ b/src/ts/planets/telluricPlanet/colorSettingsInterface.ts
@@ -17,7 +17,7 @@
import { Color3 } from "@babylonjs/core/Maths/math.color";
-export enum ColorMode {
+export const enum ColorMode {
DEFAULT,
MOISTURE,
TEMPERATURE,
diff --git a/src/ts/planets/telluricPlanet/telluricPlanet.ts b/src/ts/planets/telluricPlanet/telluricPlanet.ts
index 18b1e28e3..91a4d3304 100644
--- a/src/ts/planets/telluricPlanet/telluricPlanet.ts
+++ b/src/ts/planets/telluricPlanet/telluricPlanet.ts
@@ -43,6 +43,7 @@ import { RingsUniforms } from "../../postProcesses/rings/ringsUniform";
import { OrbitalObjectPhysicalProperties } from "../../architecture/physicalProperties";
import { rotate } from "../../uberCore/transforms/basicTransform";
import { BodyType } from "../../model/common";
+import i18n from "../../i18n";
export class TelluricPlanet implements Planet, Cullable {
readonly name: string;
@@ -150,9 +151,9 @@ export class TelluricPlanet implements Planet, Cullable {
getTypeName(): string {
if (this.parent?.model.bodyType === BodyType.TELLURIC_PLANET || this.parent?.model.bodyType === BodyType.GAS_PLANET) {
- return "Telluric Moon";
+ return i18n.t("objectTypes:telluricMoon");
}
- return "Telluric Planet";
+ return i18n.t("objectTypes:telluricPlanet");
}
/**
diff --git a/src/ts/planets/telluricPlanet/telluricPlanetMaterial.ts b/src/ts/planets/telluricPlanet/telluricPlanetMaterial.ts
index f395e829b..2213180fa 100644
--- a/src/ts/planets/telluricPlanet/telluricPlanetMaterial.ts
+++ b/src/ts/planets/telluricPlanet/telluricPlanetMaterial.ts
@@ -52,6 +52,8 @@ export class TelluricPlanetMaterial extends ShaderMaterial {
*/
private readonly planetModel: TelluricPlanetModel;
+ private stellarObjects: Transformable[] = [];
+
/**
* Creates a new telluric planet material
* @param planetName The name of the planet
@@ -208,16 +210,24 @@ export class TelluricPlanetMaterial extends ShaderMaterial {
}
public update(cameraPosition: Vector3, stellarObjects: Transformable[]) {
- const inversePlanetWorldMatrix = this.planetTransform.getWorldMatrix().clone().invert();
- this.setMatrix("normalMatrix", inversePlanetWorldMatrix.transpose());
- this.setMatrix("inversePlanetWorldMatrix", inversePlanetWorldMatrix);
+ this.stellarObjects = stellarObjects;
- this.setVector3("playerPosition", cameraPosition);
+ // The add once is important because the material will be bound for every chunk of the planet
+ // we don't want to compute the same matrix inverse for every chunk
+ this.onBindObservable.addOnce(() => {
+ const inversePlanetWorldMatrix = this.planetTransform.getWorldMatrix().clone().invert();
+ this.getEffect().setMatrix("normalMatrix", inversePlanetWorldMatrix.transpose());
+ this.getEffect().setMatrix("inversePlanetWorldMatrix", inversePlanetWorldMatrix);
- this.setArray3("star_positions", flattenVector3Array(stellarObjects.map((star) => star.getTransform().getAbsolutePosition())));
- this.setArray3("star_colors", flattenColor3Array(stellarObjects.map((star) => (star instanceof Star ? star.model.color : Color3.White()))));
- this.setInt("nbStars", stellarObjects.length);
+ const activeCamera = this.getScene().activeCamera;
+ if (activeCamera === null) throw new Error("There is no active camera for TelluricPlanetMaterial!");
+ this.getEffect().setVector3("playerPosition", activeCamera.globalPosition);
- this.setVector3("planetPosition", this.planetTransform.getAbsolutePosition());
+ this.getEffect().setArray3("star_positions", flattenVector3Array(this.stellarObjects.map((star) => star.getTransform().getAbsolutePosition())));
+ this.getEffect().setArray3("star_colors", flattenColor3Array(this.stellarObjects.map((star) => (star instanceof Star ? star.model.color : Color3.White()))));
+ this.getEffect().setInt("nbStars", this.stellarObjects.length);
+
+ this.getEffect().setVector3("planetPosition", this.planetTransform.getAbsolutePosition());
+ });
}
}
diff --git a/src/ts/planets/telluricPlanet/telluricPlanetModel.ts b/src/ts/planets/telluricPlanet/telluricPlanetModel.ts
index b72819447..993106983 100644
--- a/src/ts/planets/telluricPlanet/telluricPlanetModel.ts
+++ b/src/ts/planets/telluricPlanet/telluricPlanetModel.ts
@@ -160,8 +160,8 @@ export class TelluricPlanetModel implements PlanetModel {
}
public getNbSpaceStations(): number {
- if (uniformRandBool(0.2, this.rng, GenerationSteps.SPACE_STATION)) return 1;
- if (uniformRandBool(0.1, this.rng, GenerationSteps.SPACE_STATION + 10)) return 2;
+ if (uniformRandBool(0.2, this.rng, GenerationSteps.SPACE_STATIONS)) return 1;
+ if (uniformRandBool(0.1, this.rng, GenerationSteps.SPACE_STATIONS + 10)) return 2;
return 0;
}
}
diff --git a/src/ts/planets/telluricPlanet/terrain/chunks/chunkTree.ts b/src/ts/planets/telluricPlanet/terrain/chunks/chunkTree.ts
index 64e9e67ba..c4c20124d 100644
--- a/src/ts/planets/telluricPlanet/terrain/chunks/chunkTree.ts
+++ b/src/ts/planets/telluricPlanet/terrain/chunks/chunkTree.ts
@@ -32,6 +32,7 @@ import { DeleteSemaphore } from "./deleteSemaphore";
import { UberScene } from "../../../../uberCore/uberScene";
import { getRotationQuaternion } from "../../../../uberCore/transforms/basicTransform";
import { ChunkForge } from "./chunkForge";
+import { clamp } from "../../../../utils/math";
/**
* A quadTree is defined recursively
@@ -138,6 +139,10 @@ export class ChunkTree {
this.deleteSemaphores = this.deleteSemaphores.filter((mutex) => !mutex.isResolved());
this.tree = this.updateLODRecursively(observerPosition, chunkForge);
+
+ this.executeOnEveryChunk((chunk) => {
+ chunk.updatePosition();
+ });
}
private getAverageHeight(tree: QuadTree): number {
@@ -172,41 +177,35 @@ export class ChunkTree {
if (walked.length === this.maxDepth) return tree;
const nodeRelativePosition = getChunkSphereSpacePositionFromPath(walked, this.direction, this.rootChunkLength / 2, getRotationQuaternion(this.parent));
- const nodePositionW = nodeRelativePosition.add(this.parent.getAbsolutePosition());
- const direction = nodePositionW.subtract(this.parent.getAbsolutePosition()).normalize();
- const additionalHeight = this.getAverageHeight(tree);
- const chunkApproxPosition = nodePositionW.add(direction.scale(additionalHeight));
- const distanceToNodeSquared = Vector3.DistanceSquared(chunkApproxPosition, observerPositionW);
+ const nodePositionSphere = nodeRelativePosition.normalizeToNew();
+ const observerPositionSphere = observerPositionW.subtract(this.parent.getAbsolutePosition()).normalize();
- const subdivisionDistanceThreshold = Settings.CHUNK_RENDERING_DISTANCE_MULTIPLIER * (this.rootChunkLength / 2 ** walked.length);
- const deletionDistanceThreshold = 15e3 + 1.1 * Settings.CHUNK_RENDERING_DISTANCE_MULTIPLIER * (this.rootChunkLength / 2 ** (walked.length - 1));
+ const totalRadius =
+ this.planetModel.radius +
+ (this.planetModel.terrainSettings.max_mountain_height +
+ this.planetModel.terrainSettings.continent_base_height +
+ this.planetModel.terrainSettings.max_bump_height) * 0.5;
- // the 1.5 is to avoid creation/deletion oscillations
- if (distanceToNodeSquared > deletionDistanceThreshold ** 2 && walked.length >= this.minDepth && tree instanceof Array) {
- const newChunk = this.createChunk(walked, chunkForge);
- if (tree.length === 0 && walked.length === 0) {
- return newChunk;
- }
- this.requestDeletion(tree, [newChunk]);
- return newChunk;
- }
+ const observerRelativePosition = observerPositionW.subtract(this.parent.getAbsolutePosition());
+ const observerDistanceToCenter = observerRelativePosition.length();
- if (tree instanceof Array) {
- return [
- this.updateLODRecursively(observerPositionW, chunkForge, tree[0], walked.concat([0])),
- this.updateLODRecursively(observerPositionW, chunkForge, tree[1], walked.concat([1])),
- this.updateLODRecursively(observerPositionW, chunkForge, tree[2], walked.concat([2])),
- this.updateLODRecursively(observerPositionW, chunkForge, tree[3], walked.concat([3]))
- ];
- }
+ const nodeGreatCircleDistance = Math.acos(Vector3.Dot(nodePositionSphere, observerPositionSphere));
+ const nodeLength = this.rootChunkLength / 2 ** walked.length;
- if (distanceToNodeSquared < subdivisionDistanceThreshold ** 2 || walked.length < this.minDepth) {
- if (tree instanceof PlanetChunk) {
- if (!tree.isReady()) return tree;
- if (!tree.mesh.isVisible) return tree;
- if (!tree.mesh.isEnabled()) return tree;
- }
+ const chunkGreatDistanceFactor = Math.max(0.0, nodeGreatCircleDistance - 8 * nodeLength / (2 * Math.PI * this.planetModel.radius));
+ const observerDistanceFactor = Math.max(0.0, observerDistanceToCenter - totalRadius) / this.planetModel.radius;
+
+ let kernel = this.maxDepth;
+ kernel -= Math.log2(1.0 + chunkGreatDistanceFactor * 2 ** (this.maxDepth - this.minDepth)) * 0.8;
+ kernel -= Math.log2(1.0 + observerDistanceFactor * 2 ** (this.maxDepth - this.minDepth)) * 0.8;
+
+ const targetLOD = clamp(Math.floor(kernel), this.minDepth, this.maxDepth);
+
+ if (tree instanceof PlanetChunk && targetLOD > walked.length) {
+ if (!tree.isReady()) return tree;
+ if (!tree.mesh.isVisible) return tree;
+ if (!tree.mesh.isEnabled()) return tree;
const newTree = [
this.createChunk(walked.concat([0]), chunkForge),
@@ -218,9 +217,22 @@ export class ChunkTree {
return newTree;
}
- if (tree instanceof PlanetChunk) return tree;
+ if (tree instanceof Array) {
+ if (targetLOD < walked.length - 1) {
+ const newChunk = this.createChunk(walked, chunkForge);
+ this.requestDeletion(tree, [newChunk]);
+ return newChunk;
+ }
+
+ return [
+ this.updateLODRecursively(observerPositionW, chunkForge, tree[0], walked.concat([0])),
+ this.updateLODRecursively(observerPositionW, chunkForge, tree[1], walked.concat([1])),
+ this.updateLODRecursively(observerPositionW, chunkForge, tree[2], walked.concat([2])),
+ this.updateLODRecursively(observerPositionW, chunkForge, tree[3], walked.concat([3]))
+ ];
+ }
- throw new Error("This should never happen");
+ return tree;
}
/**
@@ -232,7 +244,7 @@ export class ChunkTree {
private createChunk(path: number[], chunkForge: ChunkForge): PlanetChunk {
const chunk = new PlanetChunk(path, this.direction, this.parentAggregate, this.material, this.planetModel, this.rootChunkLength, this.scene);
- chunk.onRecieveVertexDataObservable.add(() => {
+ chunk.onReceiveVertexDataObservable.add(() => {
this.onChunkCreatedObservable.notifyObservers(chunk);
});
diff --git a/src/ts/planets/telluricPlanet/terrain/chunks/deleteSemaphore.ts b/src/ts/planets/telluricPlanet/terrain/chunks/deleteSemaphore.ts
index 57b4a6cba..e0f7cc023 100644
--- a/src/ts/planets/telluricPlanet/terrain/chunks/deleteSemaphore.ts
+++ b/src/ts/planets/telluricPlanet/terrain/chunks/deleteSemaphore.ts
@@ -32,7 +32,7 @@ export class DeleteSemaphore {
this.chunksToDelete = chunksToDelete;
for (const chunk of newChunks) {
- chunk.onRecieveVertexDataObservable.add(() => this.countdown());
+ chunk.onReceiveVertexDataObservable.add(() => this.countdown());
}
}
@@ -47,6 +47,9 @@ export class DeleteSemaphore {
for (const chunk of this.chunksToDelete) {
chunk.dispose();
}
+
+ this.chunksToDelete.length = 0;
+ this.newChunks.length = 0;
}
/**
diff --git a/src/ts/planets/telluricPlanet/terrain/chunks/planetChunk.ts b/src/ts/planets/telluricPlanet/terrain/chunks/planetChunk.ts
index 96719f63a..e84e7c79c 100644
--- a/src/ts/planets/telluricPlanet/terrain/chunks/planetChunk.ts
+++ b/src/ts/planets/telluricPlanet/terrain/chunks/planetChunk.ts
@@ -34,19 +34,21 @@ import { IPatch } from "../instancePatch/iPatch";
import { TelluricPlanetModel } from "../../telluricPlanetModel";
import { BoundingSphere } from "../../../../architecture/boundingSphere";
import { PhysicsMotionType, PhysicsShapeType } from "@babylonjs/core/Physics/v2/IPhysicsEnginePlugin";
-import { LockConstraint } from "@babylonjs/core/Physics/v2/physicsConstraint";
import { Transformable } from "../../../../architecture/transformable";
import { CollisionMask } from "../../../../settings";
import { InstancePatch } from "../instancePatch/instancePatch";
+import { AbstractMesh } from "@babylonjs/core/Meshes/abstractMesh";
+import { UberScene } from "../../../../uberCore/uberScene";
export class PlanetChunk implements Transformable, BoundingSphere {
public readonly mesh: Mesh;
private readonly depth: number;
public readonly cubePosition: Vector3;
+ private readonly planetLocalPosition: Vector3;
- readonly planetModel: TelluricPlanetModel;
+ private readonly planetModel: TelluricPlanetModel;
- readonly chunkSideLength: number;
+ private readonly chunkSideLength: number;
private loaded = false;
@@ -54,11 +56,10 @@ export class PlanetChunk implements Transformable, BoundingSphere {
readonly instancePatches: IPatch[] = [];
- readonly onRecieveVertexDataObservable = new Observable
();
+ readonly onReceiveVertexDataObservable = new Observable();
readonly onDisposeObservable = new Observable();
- aggregate: PhysicsAggregate | null = null;
- readonly parentAggregate: PhysicsAggregate;
+ private aggregate: PhysicsAggregate | null = null;
private averageHeight = 0;
@@ -66,6 +67,8 @@ export class PlanetChunk implements Transformable, BoundingSphere {
private disposed = false;
+ private readonly scene: Scene;
+
constructor(path: number[], direction: Direction, parentAggregate: PhysicsAggregate, material: Material, planetModel: TelluricPlanetModel, rootLength: number, scene: Scene) {
const id = `D${direction}P${path.join("")}`;
@@ -78,16 +81,17 @@ export class PlanetChunk implements Transformable, BoundingSphere {
this.mesh = new Mesh(`Chunk${id}`, scene);
this.mesh.setEnabled(false);
+ this.scene = scene;
+
this.mesh.material = material;
- //this.mesh.material = Assets.DebugMaterial(id, false, false);
+ //this.mesh.material = Assets.DebugMaterial(id, false, false, scene);
this.mesh.parent = parentAggregate.transformNode;
- //this.mesh.occlusionQueryAlgorithmType = AbstractMesh.OCCLUSION_ALGORITHM_TYPE_CONSERVATIVE;
- //this.mesh.occlusionType = AbstractMesh.OCCLUSION_TYPE_OPTIMISTIC;
+ this.mesh.occlusionQueryAlgorithmType = AbstractMesh.OCCLUSION_ALGORITHM_TYPE_CONSERVATIVE;
+ this.mesh.occlusionType = AbstractMesh.OCCLUSION_TYPE_OPTIMISTIC;
this.parent = parentAggregate.transformNode;
- this.parentAggregate = parentAggregate;
// computing the position of the chunk on the side of the planet
const position = getChunkPlaneSpacePositionFromPath(rootLength, path);
@@ -100,6 +104,7 @@ export class PlanetChunk implements Transformable, BoundingSphere {
position.normalize().scaleInPlace(rootLength / 2);
+ this.planetLocalPosition = position.clone();
this.getTransform().position = position;
}
@@ -139,8 +144,6 @@ export class PlanetChunk implements Transformable, BoundingSphere {
this.aggregate.body.disablePreStep = false;
this.aggregate.shape.filterMembershipMask = CollisionMask.ENVIRONMENT;
this.aggregate.shape.filterCollideMask = CollisionMask.DYNAMIC_OBJECTS;
- const constraint = new LockConstraint(Vector3.Zero(), this.getTransform().position.negate(), new Vector3(0, 1, 0), new Vector3(0, 1, 0), this.mesh.getScene());
- this.parentAggregate.body.addConstraint(this.aggregate.body, constraint);
}
this.mesh.setEnabled(true);
@@ -148,7 +151,7 @@ export class PlanetChunk implements Transformable, BoundingSphere {
this.averageHeight = averageHeight;
- this.onRecieveVertexDataObservable.notifyObservers();
+ this.onReceiveVertexDataObservable.notifyObservers();
if (instancesMatrixBuffer.length === 0) return;
@@ -172,9 +175,23 @@ export class PlanetChunk implements Transformable, BoundingSphere {
const grassPatch = new ThinInstancePatch(this.parent, instancesMatrixBuffer);
grassPatch.createInstances(Assets.GRASS_BLADE);
this.instancePatches.push(grassPatch);
+
+ for(const depthRenderer of Object.values(this.scene._depthRenderer)) {
+ depthRenderer.setMaterialForRendering([butterflyPatch.getBaseMesh()], Assets.BUTTERFLY_DEPTH_MATERIAL);
+ depthRenderer.setMaterialForRendering([grassPatch.getBaseMesh()], Assets.GRASS_DEPTH_MATERIAL);
+ }
}
}
+ /**
+ * When the chunk has a Havok body, parenting is ignored so this method must be called to compensate.
+ * If the chunk has no Havok body, this method does nothing
+ */
+ public updatePosition() {
+ if (this.aggregate === null) return;
+ this.getTransform().setAbsolutePosition(Vector3.TransformCoordinates(this.planetLocalPosition, this.parent.getWorldMatrix()));
+ }
+
public getAverageHeight(): number {
return this.averageHeight;
}
@@ -202,7 +219,7 @@ export class PlanetChunk implements Transformable, BoundingSphere {
this.helpers.forEach((helper) => helper.dispose());
this.instancePatches.forEach((patch) => patch.dispose());
this.mesh.dispose();
- this.onRecieveVertexDataObservable.clear();
+ this.onReceiveVertexDataObservable.clear();
this.onDisposeObservable.clear();
this.disposed = true;
diff --git a/src/ts/planets/telluricPlanet/terrain/chunks/taskTypes.ts b/src/ts/planets/telluricPlanet/terrain/chunks/taskTypes.ts
index 60129c6b5..4a3c39f54 100644
--- a/src/ts/planets/telluricPlanet/terrain/chunks/taskTypes.ts
+++ b/src/ts/planets/telluricPlanet/terrain/chunks/taskTypes.ts
@@ -21,7 +21,7 @@ import { TerrainSettings } from "../terrainSettings";
import { Vector3 } from "@babylonjs/core/Maths/math.vector";
import { VertexData } from "@babylonjs/core/Meshes/mesh.vertexData";
-export enum TaskType {
+export const enum TaskType {
BUILD,
APPLY
}
diff --git a/src/ts/planets/telluricPlanet/terrain/instancePatch/hierarchyInstancePatch.ts b/src/ts/planets/telluricPlanet/terrain/instancePatch/hierarchyInstancePatch.ts
index 90aea05ad..b01193580 100644
--- a/src/ts/planets/telluricPlanet/terrain/instancePatch/hierarchyInstancePatch.ts
+++ b/src/ts/planets/telluricPlanet/terrain/instancePatch/hierarchyInstancePatch.ts
@@ -89,6 +89,11 @@ export class HierarchyInstancePatch implements IPatch {
this.baseRoot.setEnabled(enabled);
}
+ public getBaseMesh(): Mesh {
+ if (this.baseRoot === null) throw new Error("Tried to get base mesh but no base mesh was set.");
+ return this.baseRoot as Mesh;
+ }
+
public getNbInstances(): number {
if (this.baseRoot === null) return 0;
return this.instances.length;
diff --git a/src/ts/planets/telluricPlanet/terrain/instancePatch/iPatch.ts b/src/ts/planets/telluricPlanet/terrain/instancePatch/iPatch.ts
index b4a00b6e4..e0cfae8a0 100644
--- a/src/ts/planets/telluricPlanet/terrain/instancePatch/iPatch.ts
+++ b/src/ts/planets/telluricPlanet/terrain/instancePatch/iPatch.ts
@@ -16,6 +16,7 @@
// along with this program. If not, see .
import { TransformNode } from "@babylonjs/core/Meshes/transformNode";
+import { Mesh } from "@babylonjs/core/Meshes/mesh";
export interface IPatch {
/**
@@ -38,6 +39,8 @@ export interface IPatch {
*/
getNbInstances(): number;
+ getBaseMesh(): Mesh;
+
setEnabled(enabled: boolean): void;
/**
diff --git a/src/ts/planets/telluricPlanet/terrain/instancePatch/instancePatch.ts b/src/ts/planets/telluricPlanet/terrain/instancePatch/instancePatch.ts
index a60acace2..7a5a5e1c6 100644
--- a/src/ts/planets/telluricPlanet/terrain/instancePatch/instancePatch.ts
+++ b/src/ts/planets/telluricPlanet/terrain/instancePatch/instancePatch.ts
@@ -84,6 +84,11 @@ export class InstancePatch implements IPatch {
}
}
+ public getBaseMesh(): Mesh {
+ if (this.baseMesh === null) throw new Error("Tried to get base mesh but no base mesh was set.");
+ return this.baseMesh;
+ }
+
public getNbInstances(): number {
return this.instances.length;
}
diff --git a/src/ts/planets/telluricPlanet/terrain/instancePatch/thinInstancePatch.ts b/src/ts/planets/telluricPlanet/terrain/instancePatch/thinInstancePatch.ts
index 2f7ab758d..fcf178163 100644
--- a/src/ts/planets/telluricPlanet/terrain/instancePatch/thinInstancePatch.ts
+++ b/src/ts/planets/telluricPlanet/terrain/instancePatch/thinInstancePatch.ts
@@ -80,6 +80,11 @@ export class ThinInstancePatch implements IPatch {
this.baseMesh.setEnabled(enabled);
}
+ public getBaseMesh(): Mesh {
+ if (this.baseMesh === null) throw new Error("Tried to get base mesh but no base mesh was set.");
+ return this.baseMesh;
+ }
+
public dispose() {
this.clearInstances();
if (this.baseMesh !== null) this.baseMesh.dispose();
diff --git a/src/ts/postProcesses/clouds/cloudsUniforms.ts b/src/ts/postProcesses/clouds/cloudsUniforms.ts
index 8181a5026..008260f27 100644
--- a/src/ts/postProcesses/clouds/cloudsUniforms.ts
+++ b/src/ts/postProcesses/clouds/cloudsUniforms.ts
@@ -173,7 +173,7 @@ export class CloudsUniforms {
this.lut = lut;
}
- return new Promise((resolve, reject) => {
+ return new Promise((resolve) => {
if (this.lut === null) throw new Error("LUT is null when creating promise");
this.lut.executeWhenReady(() => {
if (this.lut === null) throw new Error("LUT is null when executing when ready");
diff --git a/src/ts/postProcesses/postProcessManager.ts b/src/ts/postProcesses/postProcessManager.ts
index fbdce40c9..fdc58402a 100644
--- a/src/ts/postProcesses/postProcessManager.ts
+++ b/src/ts/postProcesses/postProcessManager.ts
@@ -172,7 +172,7 @@ export class PostProcessManager {
this.renderingPipelineManager = scene.postProcessRenderPipelineManager;
- this.colorCorrection = new ColorCorrection("colorCorrection", scene.getEngine());
+ this.colorCorrection = new ColorCorrection("colorCorrection", scene);
this.colorCorrection.exposure = 1.5;
this.colorCorrection.gamma = 1.0;
this.colorCorrection.saturation = 1.2;
diff --git a/src/ts/postProcesses/postProcessTypes.ts b/src/ts/postProcesses/postProcessTypes.ts
index 1d714a395..e0ff2102f 100644
--- a/src/ts/postProcesses/postProcessTypes.ts
+++ b/src/ts/postProcesses/postProcessTypes.ts
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-export enum PostProcessType {
+export const enum PostProcessType {
VOLUMETRIC_LIGHT,
OCEAN,
CLOUDS,
diff --git a/src/ts/postProcesses/rings/ringsUniform.ts b/src/ts/postProcesses/rings/ringsUniform.ts
index 2ffb72aae..898049833 100644
--- a/src/ts/postProcesses/rings/ringsUniform.ts
+++ b/src/ts/postProcesses/rings/ringsUniform.ts
@@ -176,7 +176,7 @@ export class RingsUniforms {
this.ringLut = lut;
}
- return new Promise((resolve, reject) => {
+ return new Promise((resolve) => {
if (this.ringLut === null) throw new Error("Ring LUT was null when creating promise");
this.ringLut.executeWhenReady(() => {
if (this.ringLut === null) throw new Error("Ring LUT was null when executing when ready");
diff --git a/src/ts/postProcesses/volumetricLight.ts b/src/ts/postProcesses/volumetricLight.ts
index 1246c7a3b..bd6665bf2 100644
--- a/src/ts/postProcesses/volumetricLight.ts
+++ b/src/ts/postProcesses/volumetricLight.ts
@@ -31,6 +31,9 @@ export class VolumetricLight extends VolumetricLightScatteringPostProcess implem
if (scene.activeCamera === null) throw new Error("no camera");
super(`${star.name}VolumetricLight`, 1, null, star.mesh, 100, Texture.BILINEAR_SAMPLINGMODE, scene.getEngine(), false, scene);
+ // This is necessary because BabylonJS post process sets the scene using the camera. However, I don't pass a camera to the constructor as I use a PostProcessRenderPipeline.
+ this._scene = scene;
+
this.object = star;
this.exposure = 0.26;
diff --git a/src/ts/proceduralAssets/butterfly/butterflyMaterial.ts b/src/ts/proceduralAssets/butterfly/butterflyMaterial.ts
index e25af3fd9..544a07190 100644
--- a/src/ts/proceduralAssets/butterfly/butterflyMaterial.ts
+++ b/src/ts/proceduralAssets/butterfly/butterflyMaterial.ts
@@ -28,15 +28,24 @@ import { Transformable } from "../../architecture/transformable";
export class ButterflyMaterial extends ShaderMaterial {
private elapsedSeconds = 0;
- constructor(scene: Scene) {
+ private stars: Transformable[] = [];
+ private playerPosition: Vector3 = Vector3.Zero();
+
+ constructor(scene: Scene, isDepthMaterial: boolean) {
const shaderName = "butterflyMaterial";
Effect.ShadersStore[`${shaderName}FragmentShader`] = butterflyFragment;
Effect.ShadersStore[`${shaderName}VertexShader`] = butterflyVertex;
+ const defines = ["#define INSTANCES"];
+ if (isDepthMaterial) defines.push("#define FORDEPTH");
+
+ const uniforms = ["world", "worldView", "worldViewProjection", "view", "projection", "viewProjection", "time", "lightDirection", "playerPosition"];
+ if(isDepthMaterial) uniforms.push("depthValues");
+
super(shaderName, scene, shaderName, {
attributes: ["position", "normal", "uv"],
- uniforms: ["world", "worldView", "worldViewProjection", "view", "projection", "viewProjection", "time", "lightDirection", "playerPosition"],
- defines: ["#define INSTANCES"],
+ uniforms: uniforms,
+ defines: defines,
samplers: ["butterflyTexture"]
});
@@ -45,18 +54,22 @@ export class ButterflyMaterial extends ShaderMaterial {
this.setFloat("time", 0);
this.setTexture("butterflyTexture", new Texture(butterflyTexture, scene));
this.backFaceCulling = false;
+
+ this.onBindObservable.add(() => {
+ if (this.stars.length > 0) {
+ const star = this.stars[0];
+ const lightDirection = star.getTransform().getAbsolutePosition().subtract(this.playerPosition).normalize();
+ this.getEffect().setVector3("lightDirection", lightDirection);
+ }
+
+ this.getEffect().setVector3("playerPosition", this.playerPosition);
+ this.getEffect().setFloat("time", this.elapsedSeconds);
+ });
}
update(stars: Transformable[], playerPosition: Vector3, deltaSeconds: number) {
this.elapsedSeconds += deltaSeconds;
-
- if (stars.length > 0) {
- const star = stars[0];
- const lightDirection = star.getTransform().getAbsolutePosition().subtract(playerPosition).normalize();
- this.setVector3("lightDirection", lightDirection);
- }
-
- this.setVector3("playerPosition", playerPosition);
- this.setFloat("time", this.elapsedSeconds);
+ this.stars = stars;
+ this.playerPosition = playerPosition;
}
}
diff --git a/src/ts/proceduralAssets/grass/grassMaterial.ts b/src/ts/proceduralAssets/grass/grassMaterial.ts
index 2be220bb3..98ae0350c 100644
--- a/src/ts/proceduralAssets/grass/grassMaterial.ts
+++ b/src/ts/proceduralAssets/grass/grassMaterial.ts
@@ -28,15 +28,24 @@ import { Vector3 } from "@babylonjs/core/Maths/math.vector";
export class GrassMaterial extends ShaderMaterial {
private elapsedSeconds = 0;
- constructor(scene: Scene) {
+ private stars: Transformable[] = [];
+ private playerPosition: Vector3 = Vector3.Zero();
+
+ constructor(scene: Scene, isDepthMaterial: boolean) {
const shaderName = "grassMaterial";
Effect.ShadersStore[`${shaderName}FragmentShader`] = grassFragment;
Effect.ShadersStore[`${shaderName}VertexShader`] = grassVertex;
+ const defines = ["#define INSTANCES"];
+ if (isDepthMaterial) defines.push("#define FORDEPTH");
+
+ const uniforms = ["world", "worldView", "worldViewProjection", "view", "projection", "viewProjection", "time", "lightDirection", "cameraPosition", "playerPosition"];
+ if(isDepthMaterial) uniforms.push("depthValues");
+
super(shaderName, scene, shaderName, {
attributes: ["position", "normal"],
- uniforms: ["world", "worldView", "worldViewProjection", "view", "projection", "viewProjection", "time", "lightDirection", "cameraPosition", "playerPosition"],
- defines: ["#define INSTANCES"],
+ uniforms: uniforms,
+ defines: defines,
samplers: ["perlinNoise"]
});
@@ -44,18 +53,22 @@ export class GrassMaterial extends ShaderMaterial {
this.backFaceCulling = false;
this.setTexture("perlinNoise", perlinTexture);
+
+ this.onBindObservable.add(() => {
+ if (this.stars.length > 0) {
+ const star = this.stars[0];
+ const lightDirection = star.getTransform().getAbsolutePosition().subtract(this.playerPosition).normalize();
+ this.getEffect().setVector3("lightDirection", lightDirection);
+ }
+
+ this.getEffect().setVector3("playerPosition", this.playerPosition);
+ this.getEffect().setFloat("time", this.elapsedSeconds);
+ });
}
update(stars: Transformable[], playerPosition: Vector3, deltaSeconds: number) {
this.elapsedSeconds += deltaSeconds;
-
- if (stars.length > 0) {
- const star = stars[0];
- const lightDirection = star.getTransform().getAbsolutePosition().subtract(playerPosition).normalize();
- this.setVector3("lightDirection", lightDirection);
- }
-
- this.setVector3("playerPosition", playerPosition);
- this.setFloat("time", this.elapsedSeconds);
+ this.stars = stars;
+ this.playerPosition = playerPosition;
}
}
diff --git a/src/ts/spacelegs/characterControlsInputs.ts b/src/ts/spacelegs/characterControlsInputs.ts
index ef13c689b..53d61cfc0 100644
--- a/src/ts/spacelegs/characterControlsInputs.ts
+++ b/src/ts/spacelegs/characterControlsInputs.ts
@@ -60,4 +60,4 @@ export const CharacterInputs = new InputMap<{
run: runAction
});
-CharacterInputs.setEnabled(false);
\ No newline at end of file
+CharacterInputs.setEnabled(false);
diff --git a/src/ts/spaceship/shipControls.ts b/src/ts/spaceship/shipControls.ts
index 8995b3428..677a39a85 100644
--- a/src/ts/spaceship/shipControls.ts
+++ b/src/ts/spaceship/shipControls.ts
@@ -30,6 +30,7 @@ import { createNotification } from "../utils/notification";
import { StarSystemInputs } from "../inputs/starSystemInputs";
import { buttonInputToString, pressInteractionToStrings } from "../utils/inputControlsString";
import { ButtonInputControl } from "@brianchirls/game-input/browser";
+import i18n from "../i18n";
export class ShipControls implements Controls {
readonly spaceship: Spaceship;
@@ -90,11 +91,11 @@ export class ShipControls implements Controls {
this.spaceship.onLandingObservable.add(() => {
const bindingsString = pressInteractionToStrings(StarSystemInputs.map.toggleSpaceShipCharacter).join(", ");
- createNotification(`Landing complete! Use ${bindingsString} to disembark.`, 5000);
+ createNotification(i18n.t("notifications:landingComplete", { bindingsString: bindingsString }), 5000);
});
this.spaceship.onLandingEngaged.add(() => {
- createNotification(`Landing sequence engaged.`, 5000);
+ createNotification(i18n.t("notifications:landingSequenceEngaged"), 5000);
});
}
diff --git a/src/ts/spaceship/spaceShipControlsInputs.ts b/src/ts/spaceship/spaceShipControlsInputs.ts
index fc01904c7..846bd5cd8 100644
--- a/src/ts/spaceship/spaceShipControlsInputs.ts
+++ b/src/ts/spaceship/spaceShipControlsInputs.ts
@@ -95,4 +95,4 @@ export const SpaceShipControlsInputs = new InputMap<{
throttleToZero: throttleToZeroInteraction
});
-SpaceShipControlsInputs.setEnabled(false);
\ No newline at end of file
+SpaceShipControlsInputs.setEnabled(false);
diff --git a/src/ts/spaceship/spaceship.ts b/src/ts/spaceship/spaceship.ts
index 214b250e4..1d001f8c8 100644
--- a/src/ts/spaceship/spaceship.ts
+++ b/src/ts/spaceship/spaceship.ts
@@ -43,7 +43,7 @@ import { AudioManager } from "../audio/audioManager";
import { MainThruster } from "./mainThruster";
import { AudioMasks } from "../audio/audioMasks";
-enum ShipState {
+const enum ShipState {
FLYING,
LANDING,
LANDED
@@ -139,7 +139,7 @@ export class Spaceship implements Transformable {
this.disableWarpDriveSound = new AudioInstance(Assets.DISABLE_WARP_DRIVE_SOUND, AudioMasks.STAR_SYSTEM_VIEW, 1, true, this.getTransform());
this.acceleratingWarpDriveSound = new AudioInstance(Assets.ACCELERATING_WARP_DRIVE_SOUND, AudioMasks.STAR_SYSTEM_VIEW, 0, false, this.getTransform());
this.deceleratingWarpDriveSound = new AudioInstance(Assets.DECELERATING_WARP_DRIVE_SOUND, AudioMasks.STAR_SYSTEM_VIEW, 0, false, this.getTransform());
- this.hyperSpaceSound = new AudioInstance(Assets.HYPER_SPACE_SOUND, AudioMasks.HYPER_SPACE, 0.0, false, this.getTransform());
+ this.hyperSpaceSound = new AudioInstance(Assets.HYPER_SPACE_SOUND, AudioMasks.HYPER_SPACE, 0, false, this.getTransform());
this.thrusterSound = new AudioInstance(Assets.THRUSTER_SOUND, AudioMasks.STAR_SYSTEM_VIEW, 0, false, this.getTransform());
AudioManager.RegisterSound(this.enableWarpDriveSound);
@@ -335,7 +335,7 @@ export class Spaceship implements Transformable {
}
public update(deltaTime: number) {
- this.mainEngineTargetSpeed = this.mainEngineThrottle * 500;
+ this.mainEngineTargetSpeed = Math.sign(this.mainEngineThrottle) * this.mainEngineThrottle ** 2 * 500;
const warpSpeed = getForwardDirection(this.aggregate.transformNode).scale(this.warpDrive.getWarpSpeed());
diff --git a/src/ts/spaceship/warpDrive.ts b/src/ts/spaceship/warpDrive.ts
index 0dbcdc3b9..16e3c4fdd 100644
--- a/src/ts/spaceship/warpDrive.ts
+++ b/src/ts/spaceship/warpDrive.ts
@@ -19,7 +19,7 @@ import { Settings } from "../settings";
import { clamp } from "../utils/math";
import { moveTowards } from "../utils/moveTowards";
-enum WarpDriveState {
+const enum WarpDriveState {
/**
* The warp drive is disabled. It can be enabled by the user.
*/
diff --git a/src/ts/spaceshipExtended/spaceship.ts b/src/ts/spaceshipExtended/spaceship.ts
index 762481767..b4a03fb9c 100644
--- a/src/ts/spaceshipExtended/spaceship.ts
+++ b/src/ts/spaceshipExtended/spaceship.ts
@@ -81,7 +81,7 @@ this.centerOfMassHelper.material = Assets.DebugMaterial("centerOfMassHelper", tr
scene
);
helperLine.scaling.scaleInPlace(5);
- helperLine.material = Assets.DebugMaterial(`helperLine${child.name}`, true);
+ helperLine.material = Assets.DebugMaterial(`helperLine${child.name}`, true, false, scene);
helperLine.parent = child;
} else if (child.name.includes("mainThruster")) {
@@ -98,7 +98,7 @@ this.centerOfMassHelper.material = Assets.DebugMaterial("centerOfMassHelper", tr
scene
);
helperLine.scaling.scaleInPlace(5);
- helperLine.material = Assets.DebugMaterial(`helperLine${child.name}`, true);
+ helperLine.material = Assets.DebugMaterial(`helperLine${child.name}`, true, false, scene);
helperLine.parent = child;
} else {
@@ -217,7 +217,7 @@ targetTorqueLocal.addInPlace(targetTorque2Local).normalize();*/
},
this.instanceRoot.getScene()
);
- this.targetThrustHelper.material = Assets.DebugMaterial("targetThrustHelper", true);
+ this.targetThrustHelper.material = Assets.DebugMaterial("targetThrustHelper", true, false, this.instanceRoot.getScene());
const thrusterConfiguration = getThrusterConfiguration(targetThrustLocal, targetTorqueLocal, this.inverseHoverThrusterMatrix);
for (let i = 0; i < thrusterConfiguration.length; i++) {
diff --git a/src/ts/spacestation/spaceStation.ts b/src/ts/spacestation/spaceStation.ts
index 2eec86115..c8de0ffb0 100644
--- a/src/ts/spacestation/spaceStation.ts
+++ b/src/ts/spacestation/spaceStation.ts
@@ -32,10 +32,11 @@ import { PhysicsAggregate } from "@babylonjs/core/Physics/v2/physicsAggregate";
import { LandingPad } from "../landingPad/landingPad";
import { PhysicsShapeConvexHull, PhysicsShapeMesh } from "@babylonjs/core/Physics/v2/physicsShape";
import { Mesh } from "@babylonjs/core/Meshes/mesh";
-import { LockConstraint } from "@babylonjs/core/Physics/v2/physicsConstraint";
import { CollisionMask } from "../settings";
import { CelestialBody } from "../architecture/celestialBody";
import { PhysicsMotionType, PhysicsShapeType } from "@babylonjs/core/Physics/v2/IPhysicsEnginePlugin";
+import { generateSpaceStationName } from "../utils/spaceStationNameGenerator";
+import i18n from "../i18n";
export class SpaceStation implements OrbitalObject, Cullable {
readonly name: string;
@@ -50,23 +51,22 @@ export class SpaceStation implements OrbitalObject, Cullable {
readonly ringInstances: InstancedMesh[] = [];
readonly ringAggregates: PhysicsAggregate[] = [];
+ readonly ringsLocalPosition: Vector3[] = [];
+ readonly ringsRadius: number[] = [];
readonly landingPads: LandingPad[] = [];
readonly parent: OrbitalObject | null = null;
- constructor(scene: Scene, parentBody: CelestialBody | null = null) {
- //TODO: do not hardcode name
- this.name = "Spacestation";
+ constructor(scene: Scene, model: SpaceStationModel | number, parentBody: CelestialBody | null = null) {
+ this.model = model instanceof SpaceStationModel ? model : new SpaceStationModel(model, parentBody?.model);
- //TODO: do not hardcode seed
- const seed = 1;
-
- this.model = new SpaceStationModel(seed, parentBody?.model);
+ this.name = generateSpaceStationName(this.model.rng, 2756);
this.parent = parentBody;
this.instance = Assets.CreateSpaceStationInstance();
+ this.instance.name = this.name;
this.aggregate = new PhysicsAggregate(
this.getTransform(),
@@ -99,9 +99,6 @@ export class SpaceStation implements OrbitalObject, Cullable {
const landingPad = new LandingPad(scene, mesh);
this.landingPads.push(landingPad);
- /*const constraint = new LockConstraint(Vector3.Zero(), landingPad.getTransform().position.negate(), new Vector3(0, 1, 0), new Vector3(0, 1, 0), scene);
- this.aggregate.body.addConstraint(landingPad.aggregate.body, constraint);*/
-
continue;
}
@@ -112,8 +109,9 @@ export class SpaceStation implements OrbitalObject, Cullable {
ringAggregate.body.disablePreStep = false;
this.ringAggregates.push(ringAggregate);
- const constraint = new LockConstraint(Vector3.Zero(), mesh.position.negate(), new Vector3(0, 1, 0), new Vector3(0, 1, 0), scene);
- this.aggregate.body.addConstraint(ringAggregate.body, constraint);
+ this.ringsRadius.push(mesh.getBoundingInfo().boundingSphere.radius);
+
+ this.ringsLocalPosition.push(mesh.position.clone());
continue;
}
@@ -129,6 +127,24 @@ export class SpaceStation implements OrbitalObject, Cullable {
console.log("found", this.landingPads.length, "landing pads");
}
+ updateRings(deltaSeconds: number): void {
+ for (let i = 0; i < this.ringInstances.length; i++) {
+ const ringAggregate = this.ringAggregates[i];
+ const localPosition = this.ringsLocalPosition[i];
+ const ringRadius = this.ringsRadius[i];
+
+ // g = v * v / r and T = 2 * pi * r / v => v = sqrt(g * r) and T = 2 * pi * r / sqrt(g * r) = 2 * pi * sqrt(r / g)
+ const rotationPeriod = 2 * Math.PI * Math.sqrt(ringRadius / 9.81);
+
+ const clockwise = i % 2 === 0 ? 1 : -1;
+
+ ringAggregate.transformNode.rotate(Vector3.Up(), deltaSeconds * clockwise * ((2 * Math.PI) / rotationPeriod));
+
+ // this is necessary because Havok ignores regular parenting
+ ringAggregate.transformNode.setAbsolutePosition(Vector3.TransformCoordinates(localPosition, this.getTransform().getWorldMatrix()));
+ }
+ }
+
handleDockingRequest(): LandingPad | null {
const availableLandingPads = this.landingPads;
const nbPads = availableLandingPads.length;
@@ -159,7 +175,7 @@ export class SpaceStation implements OrbitalObject, Cullable {
}
getTypeName(): string {
- return "Space Station";
+ return i18n.t("objectTypes:spaceStation");
}
public computeCulling(camera: Camera): void {
diff --git a/src/ts/spacestation/spacestationModel.ts b/src/ts/spacestation/spacestationModel.ts
index 316dcce51..87a3c0ddc 100644
--- a/src/ts/spacestation/spacestationModel.ts
+++ b/src/ts/spacestation/spacestationModel.ts
@@ -23,6 +23,8 @@ import { Vector3 } from "@babylonjs/core/Maths/math.vector";
import { OrbitalObjectModel } from "../architecture/orbitalObject";
import { OrbitalObjectPhysicalProperties } from "../architecture/physicalProperties";
import { CelestialBodyModel } from "../architecture/celestialBody";
+import { normalRandom } from "extended-random";
+import { clamp } from "../utils/math";
export class SpaceStationModel implements OrbitalObjectModel {
readonly seed: number;
@@ -39,7 +41,7 @@ export class SpaceStationModel implements OrbitalObjectModel {
this.parentBody = parentBody ?? null;
this.childrenBodies = [];
- const orbitRadius = 3 * (parentBody?.radius ?? 0);
+ const orbitRadius = (2 + clamp(normalRandom(2, 1, this.rng, GenerationSteps.ORBIT), 0, 10)) * (parentBody?.radius ?? 0);
this.orbit = {
radius: orbitRadius,
@@ -51,7 +53,7 @@ export class SpaceStationModel implements OrbitalObjectModel {
this.physicalProperties = {
mass: 1,
- rotationPeriod: 60 * 2,
+ rotationPeriod: 0,
axialTilt: 2 * this.rng(GenerationSteps.AXIAL_TILT) * Math.PI
};
}
diff --git a/src/ts/starSystem/starSystemController.ts b/src/ts/starSystem/starSystemController.ts
index 4d2d439c8..4cc473827 100644
--- a/src/ts/starSystem/starSystemController.ts
+++ b/src/ts/starSystem/starSystemController.ts
@@ -33,7 +33,7 @@ import { BlackHole } from "../stellarObjects/blackHole/blackHole";
import { NeutronStar } from "../stellarObjects/neutronStar/neutronStar";
import { SystemSeed } from "../utils/systemSeed";
import { ChunkForge } from "../planets/telluricPlanet/terrain/chunks/chunkForge";
-import { OrbitalObject } from "../architecture/orbitalObject";
+import { OrbitalObject, OrbitalObjectUtils } from "../architecture/orbitalObject";
import { CelestialBody } from "../architecture/celestialBody";
import { StellarObject } from "../architecture/stellarObject";
import { Planet } from "../architecture/planet";
@@ -368,7 +368,7 @@ export class StarSystemController {
// By doing so, their rotation axis on themselves except the fixed one must as well be rotated in the same way.
// Last but not least, the background starfield must be rotated in the opposite direction to give the impression the moon is rotating.
if (shouldCompensateRotation) {
- const dthetaNearest = OrbitalObject.GetRotationAngle(nearestBody, deltaTime);
+ const dthetaNearest = OrbitalObjectUtils.GetRotationAngle(nearestBody, deltaTime);
for (const object of this.orbitalObjects) {
const orbit = object.getOrbitProperties();
@@ -392,7 +392,7 @@ export class StarSystemController {
this.universeRotation.copyFrom(starfieldAdditionalRotation.multiply(this.universeRotation));
} else {
// if we don't compensate the rotation of the nearest body, we must simply update its rotation
- OrbitalObject.UpdateRotation(nearestBody, deltaTime);
+ OrbitalObjectUtils.UpdateRotation(nearestBody, deltaTime);
}
// TRANSLATION COMPENSATION
@@ -400,7 +400,7 @@ export class StarSystemController {
// compute what would be its next position if it were to move normally.
// This gives us a translation vector that we can negate and apply to all other bodies.
const initialPosition = nearestBody.getTransform().getAbsolutePosition().clone();
- const newPosition = OrbitalObject.GetNextOrbitalPosition(nearestBody, deltaTime);
+ const newPosition = OrbitalObjectUtils.GetNextOrbitalPosition(nearestBody, deltaTime);
const nearestBodyDisplacement = newPosition.subtract(initialPosition);
if (shouldCompensateTranslation) {
const negatedDisplacement = nearestBodyDisplacement.negate();
@@ -423,8 +423,8 @@ export class StarSystemController {
for (const object of this.orbitalObjects) {
if (object === nearestBody) continue;
- OrbitalObject.UpdateOrbitalPosition(object, deltaTime);
- OrbitalObject.UpdateRotation(object, deltaTime);
+ OrbitalObjectUtils.UpdateOrbitalPosition(object, deltaTime);
+ OrbitalObjectUtils.UpdateRotation(object, deltaTime);
}
controller.update(deltaTime);
@@ -432,10 +432,7 @@ export class StarSystemController {
for (const body of this.telluricPlanets) {
// Meshes with LOD are updated (surface quadtrees)
body.updateLOD(controller.getTransform().getAbsolutePosition(), chunkForge);
- }
-
- for (const object of this.telluricPlanets) {
- object.computeCulling(controller.getActiveCamera());
+ body.computeCulling(controller.getActiveCamera());
}
for (const object of this.gasPlanets) {
@@ -443,6 +440,7 @@ export class StarSystemController {
}
for (const object of this.spaceStations) {
+ object.updateRings(deltaTime);
object.computeCulling(controller.getActiveCamera());
}
diff --git a/src/ts/starSystem/starSystemHelper.ts b/src/ts/starSystem/starSystemHelper.ts
index ba8ba1b97..a2d6845a1 100644
--- a/src/ts/starSystem/starSystemHelper.ts
+++ b/src/ts/starSystem/starSystemHelper.ts
@@ -21,7 +21,6 @@ import { Star } from "../stellarObjects/star/star";
import { starName } from "../utils/parseToStrings";
import { MandelbulbModel } from "../mandelbulb/mandelbulbModel";
import { Mandelbulb } from "../mandelbulb/mandelbulb";
-import { romanNumeral } from "../utils/nameGenerator";
import { BlackHoleModel } from "../stellarObjects/blackHole/blackHoleModel";
import { BlackHole } from "../stellarObjects/blackHole/blackHole";
import { NeutronStarModel } from "../stellarObjects/neutronStar/neutronStarModel";
@@ -30,12 +29,14 @@ import { TelluricPlanetModel } from "../planets/telluricPlanet/telluricPlanetMod
import { TelluricPlanet } from "../planets/telluricPlanet/telluricPlanet";
import { GasPlanetModel } from "../planets/gasPlanet/gasPlanetModel";
import { GasPlanet } from "../planets/gasPlanet/gasPlanet";
-import { getMoonSeed } from "../planets/common";
+import { getMoonSeed, getSpaceStationSeed } from "../planets/common";
import { Planet } from "../architecture/planet";
import { StellarObject } from "../architecture/stellarObject";
import { BodyType } from "../model/common";
import { SpaceStation } from "../spacestation/spaceStation";
import { CelestialBody } from "../architecture/celestialBody";
+import { romanNumeral } from "../utils/romanNumerals";
+import { SpaceStationModel } from "../spacestation/spacestationModel";
export class StarSystemHelper {
public static MakeStar(starsystem: StarSystemController, model?: number | StarModel): Star {
@@ -171,8 +172,8 @@ export class StarSystemHelper {
}
}
- public static MakeSpaceStation(starsystem: StarSystemController, body: CelestialBody): SpaceStation {
- const spacestation = new SpaceStation(starsystem.scene, body);
+ public static MakeSpaceStation(starsystem: StarSystemController, model: SpaceStationModel | number, body: CelestialBody): SpaceStation {
+ const spacestation = new SpaceStation(starsystem.scene, model, body);
starsystem.addSpaceStation(spacestation);
return spacestation;
}
@@ -181,7 +182,8 @@ export class StarSystemHelper {
console.assert(n >= 0, `Cannot make a negative amount of space stations : ${n}`);
const spaceStations = [];
for (let i = 0; i < n; i++) {
- const spacestation = StarSystemHelper.MakeSpaceStation(starsystem, body);
+ const seed = getSpaceStationSeed(body.model, i);
+ const spacestation = StarSystemHelper.MakeSpaceStation(starsystem, seed, body);
spaceStations.push(spacestation);
}
diff --git a/src/ts/starSystem/starSystemModel.ts b/src/ts/starSystem/starSystemModel.ts
index d52aea2d5..55f7a447a 100644
--- a/src/ts/starSystem/starSystemModel.ts
+++ b/src/ts/starSystem/starSystemModel.ts
@@ -19,16 +19,16 @@ import { seededSquirrelNoise } from "squirrel-noise";
import { centeredRand, randRangeInt, uniformRandBool } from "extended-random";
import { Settings } from "../settings";
import { BodyType } from "../model/common";
-import { generateName } from "../utils/nameGenerator";
+import { generateStarName } from "../utils/starNameGenerator";
import { SystemSeed } from "../utils/systemSeed";
-enum GenerationSteps {
+const enum GenerationSteps {
NAME,
NB_STARS = 20,
GENERATE_STARS = 21,
NB_PLANETS = 30,
GENERATE_PLANETS = 200,
- CHOOSE_PLANET_TYPE = 200
+ CHOOSE_PLANET_TYPE = 400
}
export class StarSystemModel {
@@ -41,7 +41,7 @@ export class StarSystemModel {
this.seed = seed;
this.rng = seededSquirrelNoise(this.seed.hash);
- this.name = generateName(this.rng, GenerationSteps.NAME);
+ this.name = generateStarName(this.rng, GenerationSteps.NAME);
}
setName(name: string) {
diff --git a/src/ts/starSystem/starSystemView.ts b/src/ts/starSystem/starSystemView.ts
index 3d17b588b..9e6f43f05 100644
--- a/src/ts/starSystem/starSystemView.ts
+++ b/src/ts/starSystem/starSystemView.ts
@@ -57,7 +57,7 @@ import { axisCompositeToString } from "../utils/inputControlsString";
import { SpaceShipControlsInputs } from "../spaceship/spaceShipControlsInputs";
import { AxisComposite } from "@brianchirls/game-input/browser";
import { BodyType } from "../model/common";
-import { getMoonSeed } from "../planets/common";
+import { getMoonSeed, getSpaceStationSeed } from "../planets/common";
import { Planet } from "../architecture/planet";
import { AudioManager } from "../audio/audioManager";
import { AudioMasks } from "../audio/audioMasks";
@@ -66,6 +66,7 @@ import { PostProcessManager } from "../postProcesses/postProcessManager";
import { wait } from "../utils/wait";
import { CharacterInputs } from "../spacelegs/characterControlsInputs";
import { DefaultControlsInputs } from "../defaultController/defaultControlsInputs";
+import i18n from "../i18n";
/**
* The star system view is the part of Cosmos Journeyer responsible to display the current star system, along with the
@@ -320,7 +321,7 @@ export class StarSystemView implements View {
if (!(control instanceof AxisComposite)) {
throw new Error("Up down is not an axis composite");
}
- createNotification(`Hold ${axisCompositeToString(control)[1][1]} to lift off.`, 5000);
+ createNotification(i18n.t("notifications:howToLiftOff", { bindingsString: axisCompositeToString(control)[1][1] }), 5000);
}
}
});
@@ -422,7 +423,8 @@ export class StarSystemView implements View {
const planet = planets[i];
for (let j = 0; j < planet.model.getNbSpaceStations(); j++) {
console.log("Space station:", j + 1, "of", planet.model.getNbSpaceStations());
- const spaceStation = StarSystemHelper.MakeSpaceStation(starSystem, planet);
+ const seed = getSpaceStationSeed(planet.model, j);
+ const spaceStation = StarSystemHelper.MakeSpaceStation(starSystem, seed, planet);
spaceStation.getTransform().setAbsolutePosition(new Vector3(offset * ++objectIndex, 0, 0));
await wait(timeOut);
@@ -439,8 +441,8 @@ export class StarSystemView implements View {
starSystem.initPositions(2, this.chunkForge, this.postProcessManager);
this.ui.createObjectOverlays(starSystem.getOrbitalObjects());
- this.orbitRenderer.setOrbitalObjects(starSystem.getOrbitalObjects());
- this.axisRenderer.setObjects(starSystem.getOrbitalObjects());
+ this.orbitRenderer.setOrbitalObjects(starSystem.getOrbitalObjects(), this.scene);
+ this.axisRenderer.setOrbitalObjects(starSystem.getOrbitalObjects(), this.scene);
this.helmetOverlay.setTarget(null);
@@ -531,7 +533,9 @@ export class StarSystemView implements View {
this.orbitRenderer.update();
Assets.BUTTERFLY_MATERIAL.update(starSystem.stellarObjects, this.scene.getActiveControls().getTransform().getAbsolutePosition(), deltaSeconds);
+ Assets.BUTTERFLY_DEPTH_MATERIAL.update(starSystem.stellarObjects, this.scene.getActiveControls().getTransform().getAbsolutePosition(), deltaSeconds);
Assets.GRASS_MATERIAL.update(starSystem.stellarObjects, this.scene.getActiveControls().getTransform().getAbsolutePosition(), deltaSeconds);
+ Assets.GRASS_DEPTH_MATERIAL.update(starSystem.stellarObjects, this.scene.getActiveControls().getTransform().getAbsolutePosition(), deltaSeconds);
}
/**
diff --git a/src/ts/starmap/starMap.ts b/src/ts/starmap/starMap.ts
index 37edd986a..5d0b3f0aa 100644
--- a/src/ts/starmap/starMap.ts
+++ b/src/ts/starmap/starMap.ts
@@ -58,6 +58,7 @@ import { AudioMasks } from "../audio/audioMasks";
import { Settings } from "../settings";
import { parseDistance } from "../utils/parseToStrings";
import { StarMapInputs } from "../inputs/starMapInputs";
+import i18n from "../i18n";
export class StarMap implements View {
readonly scene: Scene;
@@ -470,18 +471,18 @@ export class StarMap implements View {
if (this.currentSystemSeed !== null) {
const currentInstance = this.seedToInstanceMap.get(this.currentSystemSeed.toString()) as InstancedMesh;
const distance = StarMap.StarMapDistanceToLy(Vector3.Distance(currentInstance.getAbsolutePosition(), initializedInstance.getAbsolutePosition()));
- text += `Distance: ${parseDistance(distance)}\n`;
+ text += `${i18n.t("starMap:distance")}: ${parseDistance(distance)}\n`;
}
if (starModel === null) throw new Error("Star model is null!");
let typeString = "";
- if (starModel.bodyType === BodyType.BLACK_HOLE) typeString = "Black hole";
- else if (starModel.bodyType === BodyType.NEUTRON_STAR) typeString = "Neutron star";
- else typeString = getStellarTypeString(starModel.stellarType);
- text += `Type: ${typeString}\n`;
+ if (starModel.bodyType === BodyType.BLACK_HOLE) typeString = i18n.t("objectTypes:blackHole");
+ else if (starModel.bodyType === BodyType.NEUTRON_STAR) typeString = i18n.t("objectTypes:neutronStar");
+ else typeString = i18n.t("objectTypes:star", { stellarType: getStellarTypeString(starModel.stellarType) });
+ text += `${typeString}\n`;
- text += `Planets: ${starSystemModel.getNbPlanets()}\n`;
+ text += `${i18n.t("starMap:planets")}: ${starSystemModel.getNbPlanets()}\n`;
this.starMapUI.attachUIToMesh(initializedInstance);
this.starMapUI.setSelectedSystem({ name: starSystemModel.getName(), text });
diff --git a/src/ts/starmap/starMapUI.ts b/src/ts/starmap/starMapUI.ts
index ad479171f..565806343 100644
--- a/src/ts/starmap/starMapUI.ts
+++ b/src/ts/starmap/starMapUI.ts
@@ -32,6 +32,7 @@ import { Settings } from "../settings";
import { Engine } from "@babylonjs/core/Engines/engine";
import { Vector3 } from "@babylonjs/core/Maths/math.vector";
import { FreeCamera } from "@babylonjs/core/Cameras/freeCamera";
+import i18n from "../i18n";
export class StarMapUI {
readonly gui: AdvancedDynamicTexture;
@@ -92,7 +93,7 @@ export class StarMapUI {
this.descriptionPanel.textHorizontalAlignment = TextBlock.HORIZONTAL_ALIGNMENT_LEFT;
this.descriptionPanel.setPadding(0, 15, 10, 15);
- this.warpButton = Button.CreateSimpleButton("warpButton", "Set Warp Destination");
+ this.warpButton = Button.CreateSimpleButton("warpButton", i18n.t("starMap:setAsDestination"));
//this.warpButton.width = "100px";
this.warpButton.height = "40px";
this.warpButton.background = "midnightblue";
diff --git a/src/ts/stellarObjects/blackHole/blackHole.ts b/src/ts/stellarObjects/blackHole/blackHole.ts
index ab0409e35..fdef9a6f9 100644
--- a/src/ts/stellarObjects/blackHole/blackHole.ts
+++ b/src/ts/stellarObjects/blackHole/blackHole.ts
@@ -30,6 +30,7 @@ import { TransformNode } from "@babylonjs/core/Meshes";
import { OrbitProperties } from "../../orbit/orbitProperties";
import { RingsUniforms } from "../../postProcesses/rings/ringsUniform";
import { OrbitalObjectPhysicalProperties } from "../../architecture/physicalProperties";
+import i18n from "../../i18n";
export class BlackHole implements StellarObject, Cullable {
readonly name: string;
@@ -88,7 +89,7 @@ export class BlackHole implements StellarObject, Cullable {
}
getTypeName(): string {
- return "Black Hole";
+ return i18n.t("objectTypes:blackHole");
}
public computeCulling(camera: Camera): void {
diff --git a/src/ts/stellarObjects/blackHole/blackHoleModel.ts b/src/ts/stellarObjects/blackHole/blackHoleModel.ts
index d057ae929..a08e33661 100644
--- a/src/ts/stellarObjects/blackHole/blackHoleModel.ts
+++ b/src/ts/stellarObjects/blackHole/blackHoleModel.ts
@@ -73,7 +73,7 @@ export class BlackHoleModel implements StellarObjectModel {
}
public getNbSpaceStations(): number {
- if (uniformRandBool(0.1, this.rng, GenerationSteps.SPACE_STATION)) return 1;
+ if (uniformRandBool(0.1, this.rng, GenerationSteps.SPACE_STATIONS)) return 1;
return 0;
}
}
diff --git a/src/ts/stellarObjects/common.ts b/src/ts/stellarObjects/common.ts
index f73298753..8d0325a45 100644
--- a/src/ts/stellarObjects/common.ts
+++ b/src/ts/stellarObjects/common.ts
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-export enum StellarType {
+export const enum StellarType {
/** 30,000 - 50,000 K */
O,
/** 10,000 - 30,000 K */
diff --git a/src/ts/stellarObjects/neutronStar/neutronStar.ts b/src/ts/stellarObjects/neutronStar/neutronStar.ts
index 60ec13f9d..4520ac7cc 100644
--- a/src/ts/stellarObjects/neutronStar/neutronStar.ts
+++ b/src/ts/stellarObjects/neutronStar/neutronStar.ts
@@ -40,6 +40,7 @@ import { OrbitalObjectPhysicalProperties } from "../../architecture/physicalProp
import { RingsUniforms } from "../../postProcesses/rings/ringsUniform";
import { Camera } from "@babylonjs/core/Cameras/camera";
import { isSizeOnScreenEnough } from "../../utils/isObjectVisibleOnScreen";
+import i18n from "../../i18n";
export class NeutronStar implements StellarObject, Cullable {
readonly model: NeutronStarModel;
@@ -112,7 +113,7 @@ export class NeutronStar implements StellarObject, Cullable {
}
getTypeName(): string {
- return "Neutron Star";
+ return i18n.t("objectTypes:neutronStar");
}
getRotationAxis(): Vector3 {
diff --git a/src/ts/stellarObjects/neutronStar/neutronStarModel.ts b/src/ts/stellarObjects/neutronStar/neutronStarModel.ts
index 2e7c7b7dd..239ef80b1 100644
--- a/src/ts/stellarObjects/neutronStar/neutronStarModel.ts
+++ b/src/ts/stellarObjects/neutronStar/neutronStarModel.ts
@@ -87,7 +87,7 @@ export class NeutronStarModel implements StellarObjectModel {
}
public getNbSpaceStations(): number {
- if (uniformRandBool(0.00001, this.rng, GenerationSteps.SPACE_STATION)) return 1;
+ if (uniformRandBool(0.00001, this.rng, GenerationSteps.SPACE_STATIONS)) return 1;
return 0;
}
}
diff --git a/src/ts/stellarObjects/star/star.ts b/src/ts/stellarObjects/star/star.ts
index 3902f4bcc..c4b0fba8c 100644
--- a/src/ts/stellarObjects/star/star.ts
+++ b/src/ts/stellarObjects/star/star.ts
@@ -42,6 +42,7 @@ import { Cullable } from "../../bodies/cullable";
import { OrbitProperties } from "../../orbit/orbitProperties";
import { RingsUniforms } from "../../postProcesses/rings/ringsUniform";
import { OrbitalObjectPhysicalProperties } from "../../architecture/physicalProperties";
+import i18n from "../../i18n";
export class Star implements StellarObject, Cullable {
readonly name: string;
@@ -84,6 +85,7 @@ export class Star implements StellarObject, Cullable {
scene
)
: Assets.CreateBananaClone(2 * this.model.radius);
+ this.mesh.name = name; // enforce name in the case of cloning the banana
this.aggregate = new PhysicsAggregate(
this.getTransform(),
@@ -139,7 +141,7 @@ export class Star implements StellarObject, Cullable {
}
getTypeName(): string {
- return `${getStellarTypeString(this.model.stellarType)} star`;
+ return i18n.t("objectTypes:star", { stellarType: getStellarTypeString(this.model.stellarType) });
}
public updateMaterial(deltaTime: number): void {
@@ -160,7 +162,7 @@ export class Star implements StellarObject, Cullable {
public dispose(): void {
this.mesh.dispose();
- this.light.dispose();
this.material.dispose();
+ this.light.dispose();
}
}
diff --git a/src/ts/stellarObjects/star/starMaterial.ts b/src/ts/stellarObjects/star/starMaterial.ts
index 4de704466..0e0610dc4 100644
--- a/src/ts/stellarObjects/star/starMaterial.ts
+++ b/src/ts/stellarObjects/star/starMaterial.ts
@@ -31,7 +31,7 @@ export class StarMaterial extends ShaderMaterial {
starModel: StellarObjectModel;
starSeed: number;
- private internalClock = 0;
+ private elapsedSeconds = 0;
constructor(star: TransformNode, model: StellarObjectModel, scene: Scene) {
const shaderName = "starMaterial";
@@ -62,14 +62,16 @@ export class StarMaterial extends ShaderMaterial {
this.star = star;
this.starModel = model;
this.starSeed = model.seed;
- }
- public update(deltaTime: number) {
- this.internalClock += deltaTime;
+ this.onBindObservable.add(() => {
+ this.getEffect().setFloat("time", this.elapsedSeconds % 100000);
+ this.getEffect().setColor3("starColor", this.starModel.color);
+ this.getEffect().setFloat("seed", this.starSeed);
+ this.getEffect().setVector3("starPosition", this.star.getAbsolutePosition());
+ });
+ }
- this.setFloat("time", this.internalClock % 100000);
- this.setColor3("starColor", this.starModel.color);
- this.setFloat("seed", this.starSeed);
- this.setVector3("starPosition", this.star.getAbsolutePosition());
+ public update(deltaSeconds: number) {
+ this.elapsedSeconds += deltaSeconds;
}
}
diff --git a/src/ts/stellarObjects/star/starModel.ts b/src/ts/stellarObjects/star/starModel.ts
index 08278b212..af0b765b5 100644
--- a/src/ts/stellarObjects/star/starModel.ts
+++ b/src/ts/stellarObjects/star/starModel.ts
@@ -98,7 +98,7 @@ export class StarModel implements StellarObjectModel {
}
public getNbSpaceStations(): number {
- if (uniformRandBool(0.001, this.rng, GenerationSteps.SPACE_STATION)) return 1;
+ if (uniformRandBool(0.001, this.rng, GenerationSteps.SPACE_STATIONS)) return 1;
return 0;
}
diff --git a/src/ts/uberCore/loadingScreen.ts b/src/ts/uberCore/loadingScreen.ts
new file mode 100644
index 000000000..88a2bd810
--- /dev/null
+++ b/src/ts/uberCore/loadingScreen.ts
@@ -0,0 +1,168 @@
+import { ILoadingScreen } from "@babylonjs/core/Loading/loadingScreen";
+import { Nullable } from "@babylonjs/core/types";
+import i18next from "../i18n";
+
+export class LoadingScreen implements ILoadingScreen {
+ private loadingDiv: Nullable = null;
+ private loadingTextDiv: Nullable = null;
+
+ /**
+ * Creates a new default loading screen
+ * @param canvas defines the canvas used to render the scene
+ * @param loadingText defines the default text to display
+ * @param loadingDivBackgroundColor defines the default background color
+ */
+ constructor(private canvas: HTMLCanvasElement, private loadingText = "", private loadingDivBackgroundColor = "black") {}
+
+ /**
+ * Function called to display the loading screen
+ */
+ public displayLoadingUI(): void {
+ if (this.loadingDiv) {
+ // Do not add a loading screen if there is already one
+ return;
+ }
+
+ this.loadingDiv = document.createElement("div");
+ this.loadingDiv.id = "babylonjsLoadingDiv";
+
+ // Loading text
+ this.loadingTextDiv = document.createElement("div");
+ this.loadingTextDiv.classList.add("loadingText");
+
+ this.loadingDiv.appendChild(this.loadingTextDiv);
+
+ //set the predefined text
+ this.loadingTextDiv.innerText = this.loadingText;
+
+ const svgSupport = !!window.SVGSVGElement;
+ // Loading img
+ const imgBack = new Image();
+ imgBack.src = !svgSupport
+ ? "https://cdn.babylonjs.com/Assets/babylonLogo.png"
+ : `data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxODAuMTcgMjA4LjA0Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2ZmZjt9LmNscy0ye2ZpbGw6I2UwNjg0Yjt9LmNscy0ze2ZpbGw6I2JiNDY0Yjt9LmNscy00e2ZpbGw6I2UwZGVkODt9LmNscy01e2ZpbGw6I2Q1ZDJjYTt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkJhYnlsb25Mb2dvPC90aXRsZT48ZyBpZD0iTGF5ZXJfMiIgZGF0YS1uYW1lPSJMYXllciAyIj48ZyBpZD0iUGFnZV9FbGVtZW50cyIgZGF0YS1uYW1lPSJQYWdlIEVsZW1lbnRzIj48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik05MC4wOSwwLDAsNTJWMTU2bDkwLjA5LDUyLDkwLjA4LTUyVjUyWiIvPjxwb2x5Z29uIGNsYXNzPSJjbHMtMiIgcG9pbnRzPSIxODAuMTcgNTIuMDEgMTUxLjk3IDM1LjczIDEyNC44NSA1MS4zOSAxNTMuMDUgNjcuNjcgMTgwLjE3IDUyLjAxIi8+PHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjI3LjEyIDY3LjY3IDExNy4yMSAxNS42NiA5MC4wOCAwIDAgNTIuMDEgMjcuMTIgNjcuNjciLz48cG9seWdvbiBjbGFzcz0iY2xzLTIiIHBvaW50cz0iNjEuODkgMTIwLjMgOTAuMDggMTM2LjU4IDExOC4yOCAxMjAuMyA5MC4wOCAxMDQuMDIgNjEuODkgMTIwLjMiLz48cG9seWdvbiBjbGFzcz0iY2xzLTMiIHBvaW50cz0iMTUzLjA1IDY3LjY3IDE1My4wNSAxNDAuMzcgOTAuMDggMTc2LjcyIDI3LjEyIDE0MC4zNyAyNy4xMiA2Ny42NyAwIDUyLjAxIDAgMTU2LjAzIDkwLjA4IDIwOC4wNCAxODAuMTcgMTU2LjAzIDE4MC4xNyA1Mi4wMSAxNTMuMDUgNjcuNjciLz48cG9seWdvbiBjbGFzcz0iY2xzLTMiIHBvaW50cz0iOTAuMDggNzEuNDYgNjEuODkgODcuNzQgNjEuODkgMTIwLjMgOTAuMDggMTA0LjAyIDExOC4yOCAxMjAuMyAxMTguMjggODcuNzQgOTAuMDggNzEuNDYiLz48cG9seWdvbiBjbGFzcz0iY2xzLTQiIHBvaW50cz0iMTUzLjA1IDY3LjY3IDExOC4yOCA4Ny43NCAxMTguMjggMTIwLjMgOTAuMDggMTM2LjU4IDkwLjA4IDE3Ni43MiAxNTMuMDUgMTQwLjM3IDE1My4wNSA2Ny42NyIvPjxwb2x5Z29uIGNsYXNzPSJjbHMtNSIgcG9pbnRzPSIyNy4xMiA2Ny42NyA2MS44OSA4Ny43NCA2MS44OSAxMjAuMyA5MC4wOCAxMzYuNTggOTAuMDggMTc2LjcyIDI3LjEyIDE0MC4zNyAyNy4xMiA2Ny42NyIvPjwvZz48L2c+PC9zdmc+`;
+
+ imgBack.style.width = "150px";
+ imgBack.style.gridColumn = "1";
+ imgBack.style.gridRow = "1";
+ imgBack.style.top = "50%";
+ imgBack.style.left = "50%";
+ imgBack.style.transform = "translate(-50%, -50%)";
+ imgBack.style.position = "absolute";
+
+ const imageSpinnerContainer = document.createElement("div");
+ imageSpinnerContainer.classList.add("imageSpinnerContainer");
+
+ // Loading spinner
+ const imgSpinner = new Image();
+ imgSpinner.classList.add("loadingSpinner");
+ imgSpinner.src = !svgSupport
+ ? "https://cdn.babylonjs.com/Assets/loadingIcon.png"
+ : `data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzOTIgMzkyIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2UwNjg0Yjt9LmNscy0ye2ZpbGw6bm9uZTt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlNwaW5uZXJJY29uPC90aXRsZT48ZyBpZD0iTGF5ZXJfMiIgZGF0YS1uYW1lPSJMYXllciAyIj48ZyBpZD0iU3Bpbm5lciI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNDAuMjEsMTI2LjQzYzMuNy03LjMxLDcuNjctMTQuNDQsMTItMjEuMzJsMy4zNi01LjEsMy41Mi01YzEuMjMtMS42MywyLjQxLTMuMjksMy42NS00LjkxczIuNTMtMy4yMSwzLjgyLTQuNzlBMTg1LjIsMTg1LjIsMCwwLDEsODMuNCw2Ny40M2EyMDgsMjA4LDAsMCwxLDE5LTE1LjY2YzMuMzUtMi40MSw2Ljc0LTQuNzgsMTAuMjUtN3M3LjExLTQuMjgsMTAuNzUtNi4zMmM3LjI5LTQsMTQuNzMtOCwyMi41My0xMS40OSwzLjktMS43Miw3Ljg4LTMuMywxMi00LjY0YTEwNC4yMiwxMDQuMjIsMCwwLDEsMTIuNDQtMy4yMyw2Mi40NCw2Mi40NCwwLDAsMSwxMi43OC0xLjM5QTI1LjkyLDI1LjkyLDAsMCwxLDE5NiwyMS40NGE2LjU1LDYuNTUsMCwwLDEsMi4wNSw5LDYuNjYsNi42NiwwLDAsMS0xLjY0LDEuNzhsLS40MS4yOWEyMi4wNywyMi4wNywwLDAsMS01Ljc4LDMsMzAuNDIsMzAuNDIsMCwwLDEtNS42NywxLjYyLDM3LjgyLDM3LjgyLDAsMCwxLTUuNjkuNzFjLTEsMC0xLjkuMTgtMi44NS4yNmwtMi44NS4yNHEtNS43Mi41MS0xMS40OCwxLjFjLTMuODQuNC03LjcxLjgyLTExLjU4LDEuNGExMTIuMzQsMTEyLjM0LDAsMCwwLTIyLjk0LDUuNjFjLTMuNzIsMS4zNS03LjM0LDMtMTAuOTQsNC42NHMtNy4xNCwzLjUxLTEwLjYsNS41MUExNTEuNiwxNTEuNiwwLDAsMCw2OC41Niw4N0M2Ny4yMyw4OC40OCw2Niw5MCw2NC42NCw5MS41NnMtMi41MSwzLjE1LTMuNzUsNC43M2wtMy41NCw0LjljLTEuMTMsMS42Ni0yLjIzLDMuMzUtMy4zMyw1YTEyNywxMjcsMCwwLDAtMTAuOTMsMjEuNDksMS41OCwxLjU4LDAsMSwxLTMtMS4xNVM0MC4xOSwxMjYuNDcsNDAuMjEsMTI2LjQzWiIvPjxyZWN0IGNsYXNzPSJjbHMtMiIgd2lkdGg9IjM5MiIgaGVpZ2h0PSIzOTIiLz48L2c+PC9nPjwvc3ZnPg==`;
+
+ if (!svgSupport) {
+ const logoSize = { w: 16, h: 18.5 };
+ const loadingSize = { w: 30, h: 30 };
+ // set styling correctly
+ imgBack.style.width = `${logoSize.w}vh`;
+ imgBack.style.height = `${logoSize.h}vh`;
+ imgBack.style.left = `calc(50% - ${logoSize.w / 2}vh)`;
+ imgBack.style.top = `calc(50% - ${logoSize.h / 2}vh)`;
+
+ imgSpinner.style.width = `${loadingSize.w}vh`;
+ imgSpinner.style.height = `${loadingSize.h}vh`;
+ imgSpinner.style.left = `calc(50% - ${loadingSize.w / 2}vh)`;
+ imgSpinner.style.top = `calc(50% - ${loadingSize.h / 2}vh)`;
+ }
+
+ imageSpinnerContainer.appendChild(imgSpinner);
+
+ this.loadingDiv.appendChild(imgBack);
+ this.loadingDiv.appendChild(imageSpinnerContainer);
+
+ this.resizeLoadingUI();
+
+ window.addEventListener("resize", this.resizeLoadingUI);
+
+ this.loadingDiv.style.backgroundColor = this.loadingDivBackgroundColor;
+ document.body.appendChild(this.loadingDiv);
+
+ this.loadingDiv.style.opacity = "1";
+ }
+
+ /**
+ * Function called to hide the loading screen
+ */
+ public hideLoadingUI(): void {
+ if (!this.loadingDiv) {
+ return;
+ }
+
+ const onTransitionEnd = () => {
+ if (this.loadingTextDiv) {
+ this.loadingTextDiv.remove();
+ this.loadingTextDiv = null;
+ }
+ if (this.loadingDiv) {
+ this.loadingDiv.remove();
+ this.loadingDiv = null;
+ }
+ window.removeEventListener("resize", this.resizeLoadingUI);
+ };
+
+ this.loadingDiv.style.opacity = "0";
+ this.loadingDiv.addEventListener("transitionend", onTransitionEnd);
+ }
+
+ public setProgressPercentage(percentage: number) {
+ this.loadingUIText = `${i18next.t("common:loading")} ${percentage.toFixed(0)}%`;
+ }
+
+ /**
+ * Gets or sets the text to display while loading
+ */
+ public set loadingUIText(text: string) {
+ this.loadingText = text;
+
+ if (this.loadingTextDiv) {
+ this.loadingTextDiv.innerHTML = this.loadingText;
+ }
+ }
+
+ public get loadingUIText(): string {
+ return this.loadingText;
+ }
+
+ /**
+ * Gets or sets the color to use for the background
+ */
+ public get loadingUIBackgroundColor(): string {
+ return this.loadingDivBackgroundColor;
+ }
+
+ public set loadingUIBackgroundColor(color: string) {
+ this.loadingDivBackgroundColor = color;
+
+ if (!this.loadingDiv) {
+ return;
+ }
+
+ this.loadingDiv.style.backgroundColor = this.loadingDivBackgroundColor;
+ }
+
+ // Resize
+ private resizeLoadingUI = () => {
+ const canvasRect = this.canvas.getBoundingClientRect();
+ const canvasPositioning = window.getComputedStyle(this.canvas).position;
+
+ if (!this.loadingDiv) {
+ return;
+ }
+
+ this.loadingDiv.style.position = canvasPositioning === "fixed" ? "fixed" : "absolute";
+ this.loadingDiv.style.left = canvasRect.left + "px";
+ this.loadingDiv.style.top = canvasRect.top + "px";
+ this.loadingDiv.style.width = canvasRect.width + "px";
+ this.loadingDiv.style.height = canvasRect.height + "px";
+ };
+}
diff --git a/src/ts/uberCore/postProcesses/colorCorrection.ts b/src/ts/uberCore/postProcesses/colorCorrection.ts
index cc4534270..28a957c3d 100644
--- a/src/ts/uberCore/postProcesses/colorCorrection.ts
+++ b/src/ts/uberCore/postProcesses/colorCorrection.ts
@@ -17,9 +17,9 @@
import { PostProcess } from "@babylonjs/core/PostProcesses/postProcess";
import colorCorrectionFragment from "../../../shaders/colorCorrection.glsl";
-import { Engine } from "@babylonjs/core/Engines/engine";
import { Effect } from "@babylonjs/core/Materials/effect";
import { Texture } from "@babylonjs/core/Materials/Textures/texture";
+import { Scene } from "@babylonjs/core/scene";
const shaderName = "colorCorrection";
Effect.ShadersStore[`${shaderName}FragmentShader`] = colorCorrectionFragment;
@@ -31,8 +31,11 @@ export class ColorCorrection extends PostProcess {
gamma = 1;
saturation = 1;
- constructor(name: string, engine: Engine) {
- super(name, shaderName, ["brightness", "contrast", "exposure", "gamma", "saturation"], ["textureSampler"], 1, null, Texture.BILINEAR_SAMPLINGMODE, engine);
+ constructor(name: string, scene: Scene) {
+ super(name, shaderName, ["brightness", "contrast", "exposure", "gamma", "saturation"], ["textureSampler"], 1, null, Texture.BILINEAR_SAMPLINGMODE, scene.getEngine());
+
+ // This is necessary because BabylonJS post process sets the scene using the camera. However, I don't pass a camera to the constructor as I use a PostProcessRenderPipeline.
+ this._scene = scene;
this.onApplyObservable.add((effect: Effect) => {
effect.setFloat("brightness", this.brightness);
diff --git a/src/ts/uberCore/postProcesses/types.ts b/src/ts/uberCore/postProcesses/types.ts
index 1ec94a8b2..80cecf696 100644
--- a/src/ts/uberCore/postProcesses/types.ts
+++ b/src/ts/uberCore/postProcesses/types.ts
@@ -19,7 +19,7 @@ import { Matrix, Quaternion, Vector3, Vector4 } from "@babylonjs/core/Maths/math
import { Color3 } from "@babylonjs/core/Maths/math.color";
import { Texture } from "@babylonjs/core/Materials/Textures/texture";
-export enum UniformEnumType {
+export const enum UniformEnumType {
/**
* The type to use when BabylonJS manages the uniform itself (like textureSampler)
*/
@@ -70,7 +70,7 @@ export enum UniformEnumType {
COLOR_3_ARRAY
}
-export enum SamplerEnumType {
+export const enum SamplerEnumType {
AUTO,
TEXTURE
}
diff --git a/src/ts/uberCore/postProcesses/uberPostProcess.ts b/src/ts/uberCore/postProcesses/uberPostProcess.ts
index 71d52bc69..b827ab97e 100644
--- a/src/ts/uberCore/postProcesses/uberPostProcess.ts
+++ b/src/ts/uberCore/postProcesses/uberPostProcess.ts
@@ -38,6 +38,9 @@ export class UberPostProcess extends PostProcess {
super(name, fragmentName, uniformNames, samplerNames, 1, null, Texture.BILINEAR_SAMPLINGMODE, scene.getEngine(), false, null, Constants.TEXTURETYPE_HALF_FLOAT);
+ // This is necessary because BabylonJS post process sets the scene using the camera. However, I don't pass a camera to the constructor as I use a PostProcessRenderPipeline.
+ this._scene = scene;
+
this.uniforms.push(...uniforms);
this.samplers.push(...samplers);
diff --git a/src/ts/ui/bodyEditor/bodyEditor.ts b/src/ts/ui/bodyEditor/bodyEditor.ts
index a1d507f65..e42a517ec 100644
--- a/src/ts/ui/bodyEditor/bodyEditor.ts
+++ b/src/ts/ui/bodyEditor/bodyEditor.ts
@@ -38,7 +38,7 @@ import { Star } from "../../stellarObjects/star/star";
import { BlackHole } from "../../stellarObjects/blackHole/blackHole";
import { CelestialBody } from "../../architecture/celestialBody";
-export enum EditorVisibility {
+export const enum EditorVisibility {
HIDDEN,
NAVBAR,
FULL
diff --git a/src/ts/ui/pauseMenu.ts b/src/ts/ui/pauseMenu.ts
index 19870e2e4..6bd1397fc 100644
--- a/src/ts/ui/pauseMenu.ts
+++ b/src/ts/ui/pauseMenu.ts
@@ -18,6 +18,7 @@
import { Observable } from "@babylonjs/core/Misc/observable";
import pauseMenuHTML from "../../html/pauseMenu.html";
import { Assets } from "../assets";
+import i18n from "../i18n";
export class PauseMenu {
private readonly rootNode: HTMLElement;
@@ -46,9 +47,11 @@ export class PauseMenu {
this.screenshotButton = document.getElementById("screenshotButton") as HTMLElement;
this.screenshotButton.addEventListener("click", () => this.onScreenshot.notifyObservers());
+ this.screenshotButton.innerText = i18n.t("pauseMenu:screenshot");
this.shareButton = document.getElementById("shareButton") as HTMLElement;
this.shareButton.addEventListener("click", () => this.onShare.notifyObservers());
+ this.shareButton.innerText = i18n.t("pauseMenu:share");
this.contributeButton = document.getElementById("pauseContributeButton") as HTMLElement;
this.contributeButton.addEventListener("click", () => {
@@ -56,6 +59,7 @@ export class PauseMenu {
this.setActivePanel(this.activePanel === this.contibutePanel ? null : this.contibutePanel);
});
+ this.contributeButton.innerText = i18n.t("pauseMenu:contribute");
this.settingsButton = document.getElementById("pauseSettingsButton") as HTMLElement;
this.settingsButton.addEventListener("click", () => {
@@ -63,12 +67,15 @@ export class PauseMenu {
this.setActivePanel(this.activePanel === this.settingsPanel ? null : this.settingsPanel);
});
+ this.settingsButton.innerText = i18n.t("pauseMenu:settings");
this.saveButton = document.getElementById("saveButton") as HTMLElement;
this.saveButton.addEventListener("click", () => this.onSave.notifyObservers());
+ this.saveButton.innerText = i18n.t("pauseMenu:save");
this.resumeButton = document.getElementById("resumeButton") as HTMLElement;
this.resumeButton.addEventListener("click", () => this.onResume.notifyObservers());
+ this.resumeButton.innerText = i18n.t("pauseMenu:resume");
document.querySelectorAll("#pauseMenu li").forEach((li) => {
// play a sound when hovering over a button
diff --git a/src/ts/utils/direction.ts b/src/ts/utils/direction.ts
index 1600fbe99..e644787c3 100644
--- a/src/ts/utils/direction.ts
+++ b/src/ts/utils/direction.ts
@@ -18,7 +18,7 @@
import { Axis } from "@babylonjs/core/Maths/math.axis";
import { Quaternion } from "@babylonjs/core/Maths/math.vector";
-export enum Direction {
+export const enum Direction {
UP,
DOWN,
LEFT,
diff --git a/src/ts/utils/parseToStrings.ts b/src/ts/utils/parseToStrings.ts
index 577adb4b5..e56d15a77 100644
--- a/src/ts/utils/parseToStrings.ts
+++ b/src/ts/utils/parseToStrings.ts
@@ -16,6 +16,7 @@
// along with this program. If not, see .
import { Settings } from "../settings";
+import i18n from "../i18n";
export function parseSpeed(speed: number): string {
if (speed < 1000) {
@@ -37,9 +38,9 @@ export function parseDistance(distance: number): string {
} else if (distance < 20000000) {
return `${(distance / 1000000).toFixed(2)} Mm`;
} else if (distance < 0.3 * Settings.LIGHT_YEAR) {
- return `${(distance / Settings.C).toFixed(2)} ls`;
+ return `${(distance / Settings.C).toFixed(2)} ${i18n.t("units:ls")}`;
} else {
- return `${(distance / Settings.LIGHT_YEAR).toFixed(2)} ly`;
+ return `${(distance / Settings.LIGHT_YEAR).toFixed(2)} ${i18n.t("units:ly")}`;
}
}
@@ -68,6 +69,7 @@ export function parsePercentageFrom01(percentage01: number): string {
}
export const Alphabet = "abcdefghijklmnopqrstuvwxyz";
+
export function starName(baseName: string, index: number): string {
return `${baseName} ${Alphabet[index].toUpperCase()}`;
}
diff --git a/src/ts/utils/romanNumerals.ts b/src/ts/utils/romanNumerals.ts
new file mode 100644
index 000000000..fa7bd51dd
--- /dev/null
+++ b/src/ts/utils/romanNumerals.ts
@@ -0,0 +1,49 @@
+// This file is part of Cosmos Journeyer
+//
+// Copyright (C) 2024 Barthélemy Paléologue
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+/**
+ * Convert a number to a roman numeral string
+ * @param n The number to convert
+ * @returns a string representing the number as a roman numeral
+ */
+export function romanNumeral(n: number): string {
+ const romanNumerals: [number, string][] = [
+ [1000, "M"],
+ [900, "CM"],
+ [500, "D"],
+ [400, "CD"],
+ [100, "C"],
+ [90, "XC"],
+ [50, "L"],
+ [40, "XL"],
+ [10, "X"],
+ [9, "IX"],
+ [5, "V"],
+ [4, "IV"],
+ [1, "I"]
+ ];
+
+ let result = "";
+ for (const [value, symbol] of romanNumerals) {
+ while (n >= value) {
+ result += symbol;
+ n -= value;
+ }
+ }
+
+ return result;
+}
diff --git a/src/ts/utils/spaceStationNameGenerator.ts b/src/ts/utils/spaceStationNameGenerator.ts
new file mode 100644
index 000000000..46fc5512f
--- /dev/null
+++ b/src/ts/utils/spaceStationNameGenerator.ts
@@ -0,0 +1,94 @@
+// This file is part of Cosmos Journeyer
+//
+// Copyright (C) 2024 Barthélemy Paléologue
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+export const SpaceStationNames: string[] = [
+ "Aldrin",
+ "Apollo",
+ "Armstrong",
+ "Asimov",
+ "Babbage",
+ "Blinn",
+ "Boole",
+ "Catmull",
+ "Clark",
+ "Clarke",
+ "Curie",
+ "Einstein",
+ "Feynman",
+ "Gagarin",
+ "Galileo",
+ "Gauss",
+ "Gemini",
+ "Gouraud",
+ "Hawking",
+ "Heinlein",
+ "Herbert",
+ "Kubrick",
+ "Laika",
+ "Lovelace",
+ "Mercury",
+ "Newton",
+ "Pascal",
+ "Phong",
+ "Picard",
+ "Rayleigh",
+ "Stanford",
+ "Sutherland",
+ "Suzanne",
+ "Tolkien",
+ "Tolstoy",
+ "Torvalds",
+ "Turing",
+ "Von Neumann"
+];
+
+export const SpaceStationAdjectives: string[] = [
+ "'s Abode",
+ "'s Bar",
+ "'s Colony",
+ "'s Discovery",
+ "'s Endeavour",
+ "'s Enterprise",
+ "'s Frontier",
+ "Habitat",
+ "Haven",
+ "Interstellar",
+ "'s Journey",
+ "Laboratory",
+ "Orbital",
+ "Outpost",
+ "'s Prospect",
+ "'s Prosperity",
+ "'s Refuge",
+ "'s Sanctuary",
+ "Settlement",
+ "Station",
+ "'s Tranquility",
+ "'s Unity",
+ "'s Vision"
+];
+
+/**
+ * Generate a space station name using a noise based rng and a given sample index
+ * @param rng The noise based rng with a range of [0, 1]
+ * @param sampleIndex The index of the sample to generate
+ */
+export function generateSpaceStationName(rng: (index: number) => number, sampleIndex: number) {
+ const adjective = SpaceStationAdjectives[Math.floor(rng(sampleIndex) * SpaceStationAdjectives.length)];
+ const name = SpaceStationNames[Math.floor(rng(sampleIndex + 1) * SpaceStationNames.length)];
+ return `${name} ${adjective}`;
+}
diff --git a/src/ts/utils/nameGenerator.ts b/src/ts/utils/starNameGenerator.ts
similarity index 84%
rename from src/ts/utils/nameGenerator.ts
rename to src/ts/utils/starNameGenerator.ts
index 340561cc6..1d969d361 100644
--- a/src/ts/utils/nameGenerator.ts
+++ b/src/ts/utils/starNameGenerator.ts
@@ -171,34 +171,12 @@ const greekLetters: string[] = [
"Omega"
];
-export function romanNumeral(n: number): string {
- switch (n) {
- case 1:
- return "I";
- case 2:
- return "II";
- case 3:
- return "III";
- case 4:
- return "IV";
- case 5:
- return "V";
- case 6:
- return "VI";
- case 7:
- return "VII";
- case 8:
- return "VIII";
- case 9:
- return "IX";
- case 10:
- return "X";
- default:
- return n.toString();
- }
-}
-
-export function generateName(rng: (step: number) => number, baseStep = 0): string {
+/**
+ * Generates a star name given a noise based random number generator and the given sample step
+ * @param rng A noise based random number generator with a range of [0, 1]
+ * @param baseStep The sample step
+ */
+export function generateStarName(rng: (step: number) => number, baseStep: number): string {
const constellation = constellationNames[Math.floor(rng(baseStep) * constellationNames.length)];
const greekLetter = greekLetters[Math.floor(rng(baseStep + 1) * greekLetters.length)];
return `${greekLetter} ${constellation}`;
diff --git a/src/ts/utils/systemTarget.ts b/src/ts/utils/systemTarget.ts
index 757f2f4e4..89bb02c16 100644
--- a/src/ts/utils/systemTarget.ts
+++ b/src/ts/utils/systemTarget.ts
@@ -5,6 +5,7 @@ import { BoundingSphere } from "../architecture/boundingSphere";
import { TypedObject } from "../architecture/typedObject";
import { SystemSeed } from "./systemSeed";
import { StarSystemModel } from "../starSystem/starSystemModel";
+import i18n from "../i18n";
export class SystemTarget implements Transformable, BoundingSphere, TypedObject {
readonly name: string;
@@ -35,6 +36,6 @@ export class SystemTarget implements Transformable, BoundingSphere, TypedObject
}
getTypeName(): string {
- return "Star system";
+ return i18n.t("objectTypes:starSystem");
}
}
diff --git a/tests/unit/romanNumerals.test.ts b/tests/unit/romanNumerals.test.ts
new file mode 100644
index 000000000..b1993061f
--- /dev/null
+++ b/tests/unit/romanNumerals.test.ts
@@ -0,0 +1,37 @@
+// This file is part of Cosmos Journeyer
+//
+// Copyright (C) 2024 Barthélemy Paléologue
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+import { romanNumeral } from "../../src/ts/utils/romanNumerals";
+
+test("romanNumeral", () => {
+ expect(romanNumeral(1)).toBe("I");
+ expect(romanNumeral(3)).toBe("III");
+ expect(romanNumeral(4)).toBe("IV");
+ expect(romanNumeral(5)).toBe("V");
+ expect(romanNumeral(9)).toBe("IX");
+ expect(romanNumeral(10)).toBe("X");
+ expect(romanNumeral(11)).toBe("XI");
+ expect(romanNumeral(40)).toBe("XL");
+ expect(romanNumeral(50)).toBe("L");
+ expect(romanNumeral(90)).toBe("XC");
+ expect(romanNumeral(100)).toBe("C");
+ expect(romanNumeral(400)).toBe("CD");
+ expect(romanNumeral(500)).toBe("D");
+ expect(romanNumeral(900)).toBe("CM");
+ expect(romanNumeral(1000)).toBe("M");
+ expect(romanNumeral(3999)).toBe("MMMCMXCIX");
+});
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 1d70cc3fc..69a05e24f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -53,7 +53,8 @@
"node_modules/@types"
], /* List of folders to include type definitions from. */
"types": [
- "jest"
+ "jest",
+ "webpack-env",
], /* Type declaration files to be included in compilation. */
"allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */