Merge pull request #45 from BarthPaleologue/PatchCurrentRelease

1.7.1 - Better spaceship

.github/workflows/build-pull-request.yml

@@ -4,6 +4,7 @@ on:
     branches: [ "main" ]
 jobs:
   build:
+    timeout-minutes: 30
     runs-on: ubuntu-latest
     strategy:
       matrix:

.github/workflows/check-version-bump.yml

@@ -5,6 +5,7 @@ on:
 
 jobs:
   check-version:
+    timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.github/workflows/deploy.yml

@@ -22,8 +22,8 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  # Build job
   build:
+    timeout-minutes: 20
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.github/workflows/eslint.yml

@@ -7,6 +7,7 @@ on:
 jobs:
   eslint:
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     strategy:
       matrix:
         node-version: [16, 18]

.github/workflows/tauri-release.yml

@@ -10,6 +10,7 @@ jobs:
   publish-tauri:
     permissions:
       contents: write
+    timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:

.github/workflows/tests.yml

@@ -10,6 +10,7 @@ on:
 jobs:
   jest:
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     strategy:
       matrix:
         node-version: [16, 18]

package.json

@@ -50,7 +50,7 @@
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   },
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "CosmosJourneyer",
   "name": "cosmos-journeyer",
   "scripts": {

src/html/mainMenu.html

@@ -34,7 +34,7 @@ <h3>Bug reports</h3>
 
     <h3>Know how to code?</h3>
 
-    <p>CosmosJourneyer is an open-source project which means anyone can help built it! Why not you?<br /> You can
+    <p>CosmosJourneyer is an open-source project which means anyone can help build it! Why not you?<br /> You can
       check out
       <a target="_blank"
          href="https://github.com/BarthPaleologue/CosmosJourneyer">the repository of the project</a> for more details.

src/shaders/starfieldFragment.glsl

@@ -60,7 +60,7 @@ void main() {
     vec4 starfieldColor = texture2D(starfieldTexture, starfieldUV);
     starfieldColor.rgb = pow(starfieldColor.rgb, vec3(2.2));// deeper blacks
 
-    if (depth == 1.0) {
+    if (screenColor == vec4(0.0) && depth == 1.0) {
         finalColor = vec4(starfieldColor.rgb * visibility, starfieldColor.a);
     }
 

src/shaders/utils/worldFromUV.glsl

@@ -24,5 +24,5 @@ vec3 worldFromUV(vec2 pos, mat4 inverseProjection, mat4 inverseView) {
     vec4 ndc = vec4(pos.xy * 2.0 - 1.0, 1.0, 1.0); // get ndc position (z = 1 because the depth buffer is reversed)
     vec4 posVS = inverseProjection * ndc; // unproject the ndc coordinates : we are now in view space if i understand correctly
     vec4 posWS = inverseView * posVS; // then we use inverse view to get to world space, division by w to get actual coordinates
-    return  posWS.xyz; // the coordinates in world space
+    return  posWS.xyz / posWS.w;
 }

src/ts/orbit/axisRenderer.ts

@@ -72,7 +72,7 @@ export class AxisRenderer {
     setVisibility(visible: boolean) {
         this._isVisible = visible;
         for (const axisMesh of this.axisMeshes) {
-            axisMesh.visibility = visible ? 1 : 0;
+            axisMesh.setEnabled(visible);
         }
     }
 

src/ts/orbit/orbitRenderer.ts

@@ -29,7 +29,7 @@ export class OrbitRenderer {
 
     private orbitMaterial: StandardMaterial | null = null;
 
-    private isVisibile = false;
+    private _isVisible = false;
 
     setOrbitalObjects(orbitalObjects: OrbitalObject[]) {
         this.reset();
@@ -39,7 +39,7 @@ export class OrbitRenderer {
             this.createOrbitMesh(orbitalObject);
         }
 
-        this.setVisibility(this.isVisibile);
+        this.setVisibility(this.isVisible());
     }
 
     private createOrbitMesh(orbitalObject: OrbitalObject) {
@@ -61,17 +61,18 @@ export class OrbitRenderer {
     }
 
     setVisibility(visible: boolean) {
-        this.isVisibile = visible;
+        this._isVisible = visible;
         for (const orbitMesh of this.orbitMeshes) {
-            orbitMesh.visibility = visible ? 1 : 0;
+            orbitMesh.setEnabled(visible);
         }
     }
 
     isVisible(): boolean {
-        return this.isVisibile;
+        return this._isVisible;
     }
 
     update() {
+        if(!this._isVisible) return;
         for (let i = 0; i < this.orbitalObjects.length; i++) {
             const orbitalObject = this.orbitalObjects[i];
             const orbitMesh = this.orbitMeshes[i];
@@ -89,8 +90,10 @@ export class OrbitRenderer {
         this.orbitMeshes = [];
         this.orbitalObjects = [];
 
-        this.orbitMaterial = new StandardMaterial("orbitMaterial");
-        this.orbitMaterial.emissiveColor = Color3.White();
-        this.orbitMaterial.disableLighting = true;
+        if(this.orbitMaterial === null) {
+            this.orbitMaterial = new StandardMaterial("orbitMaterial");
+            this.orbitMaterial.emissiveColor = Color3.White();
+            this.orbitMaterial.disableLighting = true;
+        }
     }
 }

src/ts/spaceship/abstractThruster.ts

@@ -29,16 +29,13 @@ export abstract class AbstractThruster {
 
     protected throttle = 0;
 
-    readonly localNozzleDown: Vector3;
-
     readonly plume: SolidPlume;
 
     readonly parentAggregate: PhysicsAggregate;
 
     protected constructor(mesh: AbstractMesh, direction: Vector3, parentAggregate: PhysicsAggregate) {
         this.mesh = mesh;
 
-        this.localNozzleDown = direction;
         this.plume = new SolidPlume(mesh, mesh.getScene());
 
         this.parentAggregate = parentAggregate;

src/ts/spaceship/shipControls.ts

@@ -47,8 +47,8 @@ export class ShipControls implements Controls {
 
         this.firstPersonCamera = new FreeCamera("firstPersonCamera", Vector3.Zero(), scene);
         this.firstPersonCamera.parent = this.getTransform();
-        this.firstPersonCamera.position = new Vector3(0, 1.2, 3.5);
-
+        this.firstPersonCamera.position = new Vector3(0, 1.2, 4);
+        
         this.thirdPersonCamera = new ArcRotateCamera("thirdPersonCamera", -3.14 / 2, 3.14 / 2.2, ShipControls.BASE_CAMERA_RADIUS, Vector3.Zero(), scene);
         this.thirdPersonCamera.parent = this.getTransform();
         this.thirdPersonCamera.lowerRadiusLimit = 10;
@@ -117,10 +117,15 @@ export class ShipControls implements Controls {
         if (this.spaceship.getWarpDrive().isDisabled()) {
             this.spaceship.increaseMainEngineThrottle(deltaTime * SpaceShipControlsInputs.map.throttle.value);
 
-            this.spaceship.aggregate.body.applyForce(
-                getUpwardDirection(this.getTransform()).scale(9.8 * 10 * SpaceShipControlsInputs.map.upDown.value),
-                this.spaceship.aggregate.body.getObjectCenterWorld()
-            );
+            if(SpaceShipControlsInputs.map.upDown.value !== 0) {
+                if(this.spaceship.isLanded()) {
+                    this.spaceship.takeOff();
+                }
+                this.spaceship.aggregate.body.applyForce(
+                    getUpwardDirection(this.getTransform()).scale(9.8 * 10 * SpaceShipControlsInputs.map.upDown.value),
+                    this.spaceship.aggregate.body.getObjectCenterWorld()
+                );
+            }
         } else {
             this.spaceship.getWarpDrive().increaseTargetThrottle(deltaTime * SpaceShipControlsInputs.map.throttle.value);
         }

src/ts/spaceship/spaceship.ts

@@ -265,6 +265,11 @@ export class Spaceship implements Transformable {
         return this.state === ShipState.LANDED;
     }
 
+    public takeOff() {
+        this.state = ShipState.FLYING;
+        this.aggregate.body.setMotionType(PhysicsMotionType.DYNAMIC);
+    }
+
     private land(deltaTime: number) {
         if (this.targetLandingPad !== null) {
             this.landOnPad(this.targetLandingPad, deltaTime);
@@ -357,9 +362,6 @@ export class Spaceship implements Transformable {
                 });
             } else {
                 this.aggregate.body.applyForce(forwardDirection.scale(-3000), this.aggregate.body.getObjectCenterWorld());
-                this.mainThrusters.forEach(thruster => {
-                    thruster.setThrottle(0);
-                });
             }
 
             // damp other speed

src/ts/utils/solidPlume.ts

@@ -11,7 +11,7 @@ import { TransformNode } from "@babylonjs/core/Meshes";
 
 export class SolidPlume {
     static TUNNEL_LENGTH = 3;
-    static MAX_NB_PARTICLES = 3000;
+    static MAX_NB_PARTICLES = 2000;
 
     targetNbParticles = 0;
     nbParticles = 0;