BarthPaleologue · BarthPaleologue · Oct 10, 2024 · Aug 9, 2024 · Aug 23, 2024 · Aug 23, 2024
diff --git a/package.json b/package.json
@@ -1,23 +1,24 @@
 {
   "devDependencies": {
-    "@babylonjs/core": "^7.25.1",
-    "@babylonjs/gui": "^7.25.1",
+    "@babylonjs/core": "^7.26.0",
+    "@babylonjs/gui": "^7.26.0",
     "@babylonjs/havok": "^1.3.8",
-    "@babylonjs/loaders": "^7.25.1",
+    "@babylonjs/inspector": "^7.26.0",
+    "@babylonjs/loaders": "^7.26.0",
     "@brianchirls/game-input": "^0.1.1",
-    "@tauri-apps/cli": "^1.6.1",
+    "@tauri-apps/cli": "^1.6.2",
     "@types/d3": "^7.4.3",
     "@types/jest": "^29.5.13",
     "@types/seedrandom": "^3.0.8",
     "@types/webpack": "^5.28.5",
     "@types/webpack-env": "^1.18.5",
-    "@typescript-eslint/eslint-plugin": "^8.5.0",
-    "@typescript-eslint/parser": "^8.5.0",
+    "@typescript-eslint/eslint-plugin": "^8.6.0",
+    "@typescript-eslint/parser": "^8.6.0",
     "@webpack-cli/generators": "^3.0.7",
     "cross-env": "^7.0.3",
     "css-loader": "^7.1.2",
     "d3": "^7.9.0",
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
     "eslint-plugin-import": "^2.30.0",
     "extended-random": "^1.2.2",
     "fast-simplex-noise": "^4.0.0",
@@ -30,7 +31,7 @@
     "mini-css-extract-plugin": "^2.9.1",
     "prettier": "^3.3.3",
     "raw-loader": "^4.0.2",
-    "sass": "^1.78.0",
+    "sass": "^1.79.2",
     "sass-loader": "^16.0.1",
     "squirrel-noise": "^1.0.0",
     "style-loader": "^4.0.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src-tauri/.gitignore b/src-tauri/.gitignore
@@ -1,3 +1,4 @@
 # Generated by Cargo
 # will have compiled files and executables
 /target/
+/gen/schemas
diff --git a/src/asset/icons/bookmark.webp b/src/asset/icons/bookmark.webp
diff --git a/src/asset/icons/mission.webp b/src/asset/icons/mission.webp
diff --git a/src/asset/sound/voice/InitiatingPlanetaryLandingCharlotte.mp3 b/src/asset/sound/voice/InitiatingPlanetaryLandingCharlotte.mp3
diff --git a/src/asset/sound/voice/MissionCompleteCharlotte.mp3 b/src/asset/sound/voice/MissionCompleteCharlotte.mp3
diff --git a/src/html/helmetOverlay.html b/src/html/helmetOverlay.html
@@ -1,7 +1,4 @@
 <section id="helmetOverlay">
-    <div id="bodyData">
-        <p id="bodyName"></p>
-    </div>
     <div id="throttle">
         <div id="throttleStripes"></div>
     </div>

diff --git a/src/html/index.html b/src/html/index.html
@@ -19,6 +19,8 @@
 <body>
 <canvas id="renderer"></canvas>
 
+<div id="inspectorLayer"></div>
+
 <div id="loadSavePanel" class="sidePanel">
     <div id="dropFileZone">
         <p data-i18n="sidePanel:dropASaveFileHere">Drop a save file here</p>

diff --git a/src/html/spaceStationUI.html b/src/html/spaceStationUI.html
@@ -1,36 +1,37 @@
 <section id="spaceStationUI">
     <div id="spaceStationHeader">
-        <p>Hello!</p>
+        <p></p>
     </div>
 
     <div id="playerInfo">
-        <p>Balance: poor</p>
+        <h2 class="playerName"></h2>
+        <p class="playerBalance"></p>
     </div>
 
     <div class="mainContainer hidden">
 
     </div>
 
     <div id="spaceStationActions">
-        <div class="spaceStationAction">
+        <div class="spaceStationAction missionsButton">
             <img src="../asset/icons/exploration.webp" alt="Mission icon" />
             <h2>Missions</h2>
             <p>Find your next destination</p>
         </div>
 
-        <div class="spaceStationAction">
+        <div class="spaceStationAction disabled">
             <img src="../asset/icons/exploration.webp" alt="Market icon" />
             <h2>Market</h2>
             <p>Trade commodities at the local market</p>
         </div>
 
-        <div class="spaceStationAction">
+        <div class="spaceStationAction disabled">
             <img src="../asset/icons/exploration.webp" alt="Exploration icon" />
             <h2>Exploration center</h2>
             <p>Sell your exploration data to the Encyclopedia</p>
         </div>
 
-        <div class="spaceStationAction">
+        <div class="spaceStationAction disabled">
             <img src="../asset/icons/exploration.webp" alt="Spaceship icon" />
             <h2>Ship</h2>
             <p>Take care of your ship before your next flight</p>

diff --git a/src/locales/en-US/common.json b/src/locales/en-US/common.json
@@ -1,5 +1,6 @@
 {
     "loading": "Loading, please wait...",
     "fullscreen": "Press F11 to enable fullscreen",
-    "or": "or"
+    "or": "or",
+    "and": "and"
 }
diff --git a/src/locales/en-US/missions/asteroidField.json b/src/locales/en-US/missions/asteroidField.json
@@ -0,0 +1,3 @@
+{
+    "missionCompleted": "Mission completed. Careful with the asteroids CMDR!"
+}
diff --git a/src/locales/en-US/missions/common.json b/src/locales/en-US/missions/common.json
@@ -0,0 +1,5 @@
+{
+    "travelToTargetSystem": "Travel to {{systemName}} ({{distance}}). Press {{starMapKey}} to open the Star Map.",
+    "getCloserToTarget": "Fly closer to {{objectName}}",
+    "here": "here"
+}
diff --git a/src/locales/en-US/missions/flyBy.json b/src/locales/en-US/missions/flyBy.json
@@ -0,0 +1,3 @@
+{
+    "missionCompleted": "Mission completed. Enjoy the view CMDR!"
+}
diff --git a/src/locales/en-US/missions/sightseeing.json b/src/locales/en-US/missions/sightseeing.json
@@ -0,0 +1,8 @@
+{
+    "describeFlyBy": "Fly by the {{objectType}} in {{systemName}} ({{distance}})",
+    "describeTerminatorLanding": "Land near the terminator of {{objectName}} in {{systemName}} ({{distance}})",
+    "describeAsteroidFieldTrek": "Trek in the asteroid field of {{objectName}} in {{systemName}} ({{distance}})",
+    "flyBy": "Fly by",
+    "terminatorLanding": "Terminator landing",
+    "asteroidFieldTrek": "Asteroid field trek"
+}
diff --git a/src/locales/en-US/missions/terminatorLanding.json b/src/locales/en-US/missions/terminatorLanding.json
@@ -0,0 +1,4 @@
+{
+    "getCloserToTerminator": "Get closer to {{objectName}}'s terminator",
+    "missionCompleted": "Mission completed. Enjoy the view CMDR!"
+}
diff --git a/src/locales/en-US/notifications.json b/src/locales/en-US/notifications.json
@@ -2,6 +2,7 @@
     "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.",
+    "landingCancelled": "Landing cancelled",
     "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."

diff --git a/src/locales/en-US/starMap.json b/src/locales/en-US/starMap.json
@@ -3,6 +3,7 @@
     "planets": "Planets",
     "plotItinerary": "Plot Itinerary",
     "bookmark": "Bookmark",
+    "bookmarked": "Bookmarked",
     "distanceToSol": "Distance to Sol",
     "distanceFromCurrent": "Distance",
     "humanPresence": "Human Presence",

diff --git a/src/locales/fr-FR/common.json b/src/locales/fr-FR/common.json
@@ -1,5 +1,6 @@
 {
     "loading": "Chargement...",
     "fullscreen": "Appuyez sur F11 pour entrer en plein écran !",
-    "or": "ou"
+    "or": "ou",
+    "and": "et"
 }
diff --git a/src/locales/fr-FR/missions/asteroidField.json b/src/locales/fr-FR/missions/asteroidField.json
@@ -0,0 +1,3 @@
+{
+    "missionCompleted": "Mission réussie. Attention aux astéroïdes CMDR !"
+}
diff --git a/src/locales/fr-FR/missions/common.json b/src/locales/fr-FR/missions/common.json
@@ -0,0 +1,5 @@
+{
+    "travelToTargetSystem": "Voyagez jusqu'à {{systemName}} ({{distance}}). Appuyez sur {{starMapKey}} pour ouvrir la carte stellaire.",
+    "getCloserToTarget": "Approchez vous de {{objectName}}",
+    "here": "ici"
+}
diff --git a/src/locales/fr-FR/missions/flyBy.json b/src/locales/fr-FR/missions/flyBy.json
@@ -0,0 +1,3 @@
+{
+    "missionCompleted": "Mission réussie. Profitez de la vue CMDR !"
+}
diff --git a/src/locales/fr-FR/missions/sightseeing.json b/src/locales/fr-FR/missions/sightseeing.json
@@ -0,0 +1,8 @@
+{
+    "describeFlyBy": "Survoler {{objectType}} dans {{systemName}} ({{distance}})",
+    "describeTerminatorLanding": "Attérir près du terminateur de {{objectName}} dans {{systemName}} ({{distance}})",
+    "describeAsteroidFieldTrek": "Excursion au sein du champ d'astéroïdes de {{objectName}} dans {{systemName}} ({{distance}})",
+    "flyBy": "Survol",
+    "terminatorLanding": "Atterrissage au terminateur",
+    "asteroidFieldTrek": "Excursion au champ d'astéroïdes"
+}
diff --git a/src/locales/fr-FR/missions/terminatorLanding.json b/src/locales/fr-FR/missions/terminatorLanding.json
@@ -0,0 +1,4 @@
+{
+    "getCloserToTerminator": "Approchez vous du terminateur de {{objectName}}",
+    "missionCompleted": "Mission réussie. Profitez de la vue CMDR !"
+}
diff --git a/src/locales/fr-FR/notifications.json b/src/locales/fr-FR/notifications.json
@@ -2,6 +2,7 @@
     "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.",
+    "landingCancelled": "Atterrissage annulé.",
     "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."

diff --git a/src/locales/fr-FR/objectTypes.json b/src/locales/fr-FR/objectTypes.json
@@ -1,7 +1,7 @@
 {
     "starSystem": "Système Solaire",
-    "star": "Etoile de type {{stellarType}}",
-    "neutronStar": "Etoile à Neutrons",
+    "star": "Étoile de type {{stellarType}}",
+    "neutronStar": "Étoile à Neutrons",
     "blackHole": "Trou Noir",
     "gasPlanet": "Planète Gazeuse",
     "telluricPlanet": "Planète Tellurique",

diff --git a/src/locales/fr-FR/starMap.json b/src/locales/fr-FR/starMap.json
@@ -3,6 +3,7 @@
     "planets": "Planètes",
     "plotItinerary": "Planifier l'itinéraire",
     "bookmark": "Marquer",
+    "bookmarked": "Marqué",
     "distanceToSol": "Distance à Sol",
     "distanceFromCurrent": "Distance",
     "humanPresence": "Présence humaine",

diff --git a/src/shaders/blackhole.glsl b/src/shaders/blackhole.glsl
@@ -72,8 +72,8 @@ vec4 raymarchDisk(vec3 rayDir, vec3 initialPosition) {
 
     vec3 samplePoint = initialPosition;
     float distanceToCenter = length(samplePoint);// distance to the center of the disk
-    float relativeDistance = distanceToCenter / object_radius;
-    float relativeDiskRadius = accretionDiskRadius / object_radius;
+    float relativeDistance = distanceToCenter / schwarzschildRadius;
+    float relativeDiskRadius = accretionDiskRadius / schwarzschildRadius;
 
     vec3 diskNormal = object_rotationAxis;
 
@@ -110,7 +110,7 @@ vec4 raymarchDisk(vec3 rayDir, vec3 initialPosition) {
 
         float intensity = 1.0 - (i / DISK_STEPS);
         distanceToCenter = length(samplePoint);
-        relativeDistance = distanceToCenter / object_radius;
+        relativeDistance = distanceToCenter / schwarzschildRadius;
 
         float diskMask = 1.0;
         diskMask *= smoothstep(1.5, 2.5, relativeDistance); // Fade the disk when too close to the event horizon. 1.5 is the IBCO (innermost bound circular orbit) for a Schwarzschild black hole. It is also called the photon sphere.
@@ -165,7 +165,7 @@ void main() {
     // actual depth of the scene
     float maximumDistance = length(pixelWorldPosition - camera_position) * remap(depth, 0.0, 1.0, camera_near, camera_far);
 
-    float maxBendDistance = max(accretionDiskRadius * 3.0, object_radius * 15.0);
+    float maxBendDistance = max(accretionDiskRadius * 3.0, schwarzschildRadius * 15.0);
 
     float t0, t1;
     if(!rayIntersectSphere(camera_position, rayDir, object_position, maxBendDistance, t0, t1)) {
@@ -211,7 +211,7 @@ void main() {
 
                 float stepSize = 0.92 * projectedDistance / rayDirProjectedDistance;//conservative distance to disk (y==0)
                 float farLimit = distanceToCenter * 0.5;//limit step size far from to BH
-                float closeLimit = distanceToCenter * 0.1 + 0.05 * distanceToCenter2 / object_radius;//limit step size close to BH
+                float closeLimit = distanceToCenter * 0.1 + 0.05 * distanceToCenter2 / schwarzschildRadius;//limit step size close to BH
                 stepSize = min(stepSize, min(farLimit, closeLimit));
 
                 // Frame dragging computation below: (see https://www.shadertoy.com/view/sdjcWm)
@@ -229,17 +229,17 @@ void main() {
 
                 if(hasAccretionDisk) {
                     // the distance in the unit of the schwarzschild radius
-                    float relativeDistance = distanceToCenter / object_radius;
-                    // the glow mask fades the glow when to close to the horizon (the photon sphere has a radius of 1.5 * schwarzschild, so 1.7 is slightly above for artistic reasons)
-                    float glowMask = smoothstep(1.7, 2.5, relativeDistance);
-                    col += 0.5 * vec4(1.0, 0.9, 0.6, 1.0) * (stepSize / object_radius) * glowMask / (relativeDistance * relativeDistance);
+                    float relativeDistance = distanceToCenter / schwarzschildRadius;
+                    // the glow mask fades the glow when to close to the horizon (the photon sphere has a radius of 1.5 * schwarzschild, so 1.0 is slightly below for artistic reasons: bloom leaks at the camera level)
+                    float glowMask = smoothstep(1.0, 2.5, relativeDistance);
+                    col += 0.5 * vec4(1.0, 0.9, 0.6, 1.0) * (stepSize / schwarzschildRadius) * glowMask / (relativeDistance * relativeDistance);
                 }
             }
 
-            if (distanceToCenter < object_radius) {
+            if (distanceToCenter < schwarzschildRadius) {
                 suckedInBH = true;
                 break;
-            } else if (distanceToCenter > object_radius * 5000.0) {
+            } else if (distanceToCenter > schwarzschildRadius * 5000.0) {
                 escapedBH = true;
                 break;
             } else if (projectedDistance <= accretionDiskHeight) {
@@ -274,10 +274,11 @@ void main() {
     behindBH = behindBH && dot(closestPointEndRay - camera_position, object_position - camera_position) >= 0.0;
 
     vec4 bg = vec4(0.0);
-    if(uv.x >= 0.0 && uv.x <= 1.0 && uv.y >= 0.0 && uv.y <= 1.0 && behindBH) {
+    if(uv.x > 0.0 && uv.x < 1.0 && uv.y > 0.0 && uv.y < 1.0 && behindBH) {
         bg = texture2D(textureSampler, uv);
     } else {
         rayDir = vec3(starfieldRotation * vec4(rayDir, 1.0));
+        rayDir.z *= -1.0;
         bg = texture(starfieldTexture, rayDir);
     }
 

diff --git a/src/shaders/lensflare.glsl b/src/shaders/lensflare.glsl
@@ -25,6 +25,8 @@ float getSun(vec2 uv){
     return length(uv) < 0.009 ? 1.0 : 0.0;
 }
 
+#define CHEAP_FLARE
+
 //from: https://www.shadertoy.com/view/XdfXRX
 vec3 lensflares(vec2 uv, vec2 pos)
 {

diff --git a/src/shaders/ringsFragment.glsl b/src/shaders/ringsFragment.glsl
@@ -69,16 +69,21 @@ void main() {
 
                 vec3 ringShadeColor = rings_color;
 
-                // hypothèse des rayons parallèles
-                int nbLightSources = nbStars;
+                float softShadowFactor = 1.0;
                 for (int i = 0; i < nbStars; i++) {
+                    // hypothèse des rayons parallèles
                     vec3 rayToSun = normalize(star_positions[i] - object_position);
                     float t2, t3;
                     if (rayIntersectSphere(samplePoint, rayToSun, object_position, object_radius, t2, t3)) {
-                        nbLightSources -= 1;
+                        vec3 closestPointToPlanetCenter = samplePoint + rayToSun * (t2 + t3) * 0.5;
+                        float closestDistanceToPlanetCenter = length(closestPointToPlanetCenter - object_position);
+                        float r01 = remap(closestDistanceToPlanetCenter, 0.0, object_radius, 0.0, 1.0);
+                        softShadowFactor = min(softShadowFactor, 0.2 + 0.8 * smoothstep(0.85, 1.0, r01));
+                    } else {
+                        softShadowFactor = 1.0;
                     }
                 }
-                if (nbLightSources == 0) ringShadeColor *= 0.1;
+                ringShadeColor *= softShadowFactor;
 
                 finalColor = vec4(mix(finalColor.rgb * (1.0 - ringDensity), ringShadeColor, ringDensity), 1.0);
             }

diff --git a/src/shaders/telluricPlanetMaterial/fragment.glsl b/src/shaders/telluricPlanetMaterial/fragment.glsl
@@ -244,7 +244,7 @@ void main() {
 
     float metallic = steepFactor * steepMetallic + plainFactor * plainMetallic + (desertFactor+beachFactor) * desertMetallic + snowFactor * snowMetallic;
 
-    vec3 normalW = vec3(world * vec4(normal, 0.0));
+    vec3 normalW = vNormalW;
 
     // pbr accumulation
     vec3 Lo = vec3(0.0);

diff --git a/src/shaders/telluricPlanetMaterial/vertex.glsl b/src/shaders/telluricPlanetMaterial/vertex.glsl
@@ -26,6 +26,7 @@ uniform mat4 worldViewProjection;
 uniform vec3 chunkPositionPlanetSpace;
 
 uniform mat4 planetWorldMatrix;
+uniform float planetRadius;
 
 uniform vec3 cameraPosition;
 
@@ -46,6 +47,13 @@ void main() {
     vPositionW = vec3(world * vec4(position, 1.0));
     vNormalW = vec3(world * vec4(normal, 0.0));
 
+    // smooth normal when far away from the planet
+    vec3 planetPosition = vec3(planetWorldMatrix[3]);
+    float distanceToPlanet = max(0.0, length(cameraPosition - planetPosition) - planetRadius);
+    vec3 planetNormalW = normalize(vPositionW - planetPosition);
+
+    vNormalW = mix(vNormalW, planetNormalW, 0.9 * smoothstep(20e3, 300e3, distanceToPlanet));
+
 	vPosition = chunkPositionPlanetSpace + position;
 
 	vUnitSamplePoint = normalize(vPosition);

diff --git a/src/shaders/utils/pbr.glsl b/src/shaders/utils/pbr.glsl
@@ -79,7 +79,6 @@ vec3 calculateLight(vec3 albedo, vec3 normal, float roughness, float metallic, v
 
     float NdotL = max(dot(normal, lightDir), 0.0);
 
-    vec3 ambient = vec3(0.005) * albedo * radiance;
     vec3 diffuse = kD * (albedo)/ PI;
-    return (diffuse + specular) * radiance * NdotL + ambient;
+    return (diffuse + specular) * radiance * NdotL;
 }