fix: flakey tests

excaliburjs · Dec 6, 2024 · 6c0b939 · 6c0b939
1 parent a96da8f
commit 6c0b939
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 55 deletions.
diff --git a/src/engine/Collision/BodyComponent.ts b/src/engine/Collision/BodyComponent.ts
@@ -10,7 +10,7 @@ import { clamp } from '../Math/util';
 import { ColliderComponent } from './ColliderComponent';
 import { Transform } from '../Math/transform';
 import { EventEmitter } from '../EventEmitter';
-import { DefaultPhysicsConfig, PhysicsConfig } from './PhysicsConfig';
+import { getDefaultPhysicsConfig, PhysicsConfig } from './PhysicsConfig';
 import { DeepRequired } from '../Util/Required';
 import { Entity } from '../EntityComponentSystem';
 
@@ -52,7 +52,7 @@ export class BodyComponent extends Component implements Clonable<BodyComponent>
 
   private _bodyConfig: DeepRequired<Pick<PhysicsConfig, 'bodies'>['bodies']>;
   private static _DEFAULT_CONFIG: DeepRequired<Pick<PhysicsConfig, 'bodies'>['bodies']> = {
-    ...DefaultPhysicsConfig.bodies
+    ...getDefaultPhysicsConfig().bodies
   };
   public wakeThreshold: number;
 
@@ -63,12 +63,12 @@ export class BodyComponent extends Component implements Clonable<BodyComponent>
       this.group = options.group ?? this.group;
       this.useGravity = options.useGravity ?? this.useGravity;
       this._bodyConfig = {
-        ...DefaultPhysicsConfig.bodies,
+        ...getDefaultPhysicsConfig().bodies,
         ...options.config
       };
     } else {
       this._bodyConfig = {
-        ...DefaultPhysicsConfig.bodies
+        ...getDefaultPhysicsConfig().bodies
       };
     }
     this.updatePhysicsConfig(this._bodyConfig);
@@ -85,7 +85,7 @@ export class BodyComponent extends Component implements Clonable<BodyComponent>
    */
   public updatePhysicsConfig(config: DeepRequired<Pick<PhysicsConfig, 'bodies'>['bodies']>) {
     this._bodyConfig = {
-      ...DefaultPhysicsConfig.bodies,
+      ...getDefaultPhysicsConfig().bodies,
       ...config
     };
     this.canSleep = this._bodyConfig.canSleepByDefault;

diff --git a/src/engine/Collision/Colliders/CompositeCollider.ts b/src/engine/Collision/Colliders/CompositeCollider.ts
@@ -13,12 +13,12 @@ import { DynamicTreeCollisionProcessor } from '../Detection/DynamicTreeCollision
 import { RayCastHit } from '../Detection/RayCastHit';
 import { Collider } from './Collider';
 import { Transform } from '../../Math/transform';
-import { DefaultPhysicsConfig } from '../PhysicsConfig';
+import { getDefaultPhysicsConfig } from '../PhysicsConfig';
 
 export class CompositeCollider extends Collider {
   private _transform: Transform;
   private _collisionProcessor = new DynamicTreeCollisionProcessor({
-    ...DefaultPhysicsConfig
+    ...getDefaultPhysicsConfig()
   });
   private _dynamicAABBTree = new DynamicTree({
     boundsPadding: 5,

diff --git a/src/engine/Collision/PhysicsConfig.ts b/src/engine/Collision/PhysicsConfig.ts
@@ -216,9 +216,9 @@ export interface PhysicsConfig {
   };
 }
 
-export const DefaultPhysicsConfig: DeepRequired<PhysicsConfig> = {
+export const getDefaultPhysicsConfig: () => DeepRequired<PhysicsConfig> = () => ({
   enabled: true,
-  gravity: vec(0, 0),
+  gravity: vec(0, 0).clone(),
   solver: SolverStrategy.Arcade,
   substep: 1,
   colliders: {
@@ -254,4 +254,4 @@ export const DefaultPhysicsConfig: DeepRequired<PhysicsConfig> = {
     steeringFactor: 0.2,
     warmStart: true
   }
-};
+});
diff --git a/src/engine/Engine.ts b/src/engine/Engine.ts
@@ -50,7 +50,7 @@ import { Toaster } from './Util/Toaster';
 import { InputMapper } from './Input/InputMapper';
 import { GoToOptions, SceneMap, Director, StartOptions, SceneWithOptions, WithRoot } from './Director/Director';
 import { InputHost } from './Input/InputHost';
-import { DefaultPhysicsConfig, PhysicsConfig } from './Collision/PhysicsConfig';
+import { getDefaultPhysicsConfig, PhysicsConfig } from './Collision/PhysicsConfig';
 import { DeepRequired } from './Util/Required';
 import { Context, createContext, useContext } from './Context';
 import { DefaultGarbageCollectionOptions, GarbageCollectionOptions, GarbageCollector } from './GarbageCollector';
@@ -1039,12 +1039,12 @@ O|===|* >________________>\n\
 
     if (typeof options.physics === 'boolean') {
       this.physics = {
-        ...DefaultPhysicsConfig,
+        ...getDefaultPhysicsConfig(),
         enabled: options.physics
       };
     } else {
       this.physics = {
-        ...DefaultPhysicsConfig
+        ...getDefaultPhysicsConfig()
       };
       mergeDeep(this.physics, options.physics);
     }

diff --git a/src/engine/Graphics/TiledAnimation.ts b/src/engine/Graphics/TiledAnimation.ts
@@ -75,7 +75,7 @@ export class TiledAnimation extends Animation {
         promises.push(tiledSprite.ready);
       }
     }
-    Promise.allSettled(promises).then(() => this._ready.resolve());
+    Promise.all(promises).then(() => this._ready.resolve());
   }
 
   public static fromAnimation(animation: Animation, options?: Omit<TiledAnimationOptions, 'animation'>): TiledAnimation {

diff --git a/src/engine/Particles/GpuParticleEmitter.ts b/src/engine/Particles/GpuParticleEmitter.ts
@@ -1,4 +1,4 @@
-import { Actor, clamp, Engine, ExcaliburGraphicsContextWebGL, GraphicsComponent, Random, vec, Vector } from '../';
+import { Actor, clamp, Engine, ExcaliburGraphicsContextWebGL, GraphicsComponent, ParticleRenderer, Random, vec, Vector } from '../';
 import { EmitterType } from './EmitterType';
 import { ParticleEmitterArgs, ParticleTransform } from './Particles';
 import { GpuParticleConfig, GpuParticleRenderer } from './GpuParticleRenderer';
@@ -96,6 +96,6 @@ export class GpuParticleEmitter extends Actor {
   }
 
   draw(ctx: ExcaliburGraphicsContextWebGL, elapsed: number) {
-    ctx.draw<ex.ParticleRenderer>('ex.particle', this.renderer, elapsed);
+    ctx.draw<ParticleRenderer>('ex.particle', this.renderer, elapsed);
   }
 }
diff --git a/src/engine/Scene.ts b/src/engine/Scene.ts
@@ -38,7 +38,7 @@ import { DefaultLoader } from './Director/DefaultLoader';
 import { Transition } from './Director';
 import { InputHost } from './Input/InputHost';
 import { PointerScope } from './Input/PointerScope';
-import { DefaultPhysicsConfig } from './Collision/PhysicsConfig';
+import { getDefaultPhysicsConfig } from './Collision/PhysicsConfig';
 
 export class PreLoadEvent {
   loader: DefaultLoader;
@@ -110,7 +110,7 @@ export class Scene<TActivationData = unknown> implements CanInitialize, CanActiv
    *
    * Can be used to perform scene ray casts, track colliders, broadphase, and narrowphase.
    */
-  public physics = new PhysicsWorld(DefaultPhysicsConfig);
+  public physics = new PhysicsWorld(getDefaultPhysicsConfig());
 
   /**
    * The actors in the current scene

diff --git a/src/spec/ArcadeSolverSpec.ts b/src/spec/ArcadeSolverSpec.ts
@@ -1,7 +1,7 @@
 import * as ex from '@excalibur';
 import { ExcaliburMatchers } from 'excalibur-jasmine';
 import { TestUtils } from './util/TestUtils';
-import { DefaultPhysicsConfig } from '../engine/Collision/PhysicsConfig';
+import { getDefaultPhysicsConfig } from '../engine/Collision/PhysicsConfig';
 
 describe('An ArcadeSolver', () => {
   beforeAll(() => {
@@ -24,7 +24,7 @@ describe('An ArcadeSolver', () => {
     const contacts = [...pair1.collide(), ...pair2.collide()];
     expect(contacts.length).toBe(2);
 
-    const sut = new ex.ArcadeSolver(DefaultPhysicsConfig.arcade);
+    const sut = new ex.ArcadeSolver(getDefaultPhysicsConfig().arcade);
 
     for (const contact of contacts) {
       sut.solvePosition(contact);
@@ -92,7 +92,7 @@ describe('An ArcadeSolver', () => {
   });
 
   it('should cancel collision contacts where there is no more overlap', () => {
-    const arcadeSolver = new ex.ArcadeSolver(DefaultPhysicsConfig.arcade);
+    const arcadeSolver = new ex.ArcadeSolver(getDefaultPhysicsConfig().arcade);
 
     const player = new ex.Actor({
       x: 0,
@@ -143,7 +143,7 @@ describe('An ArcadeSolver', () => {
   });
 
   it('should NOT cancel collisions where the bodies are moving away from the contact', () => {
-    const arcadeSolver = new ex.ArcadeSolver(DefaultPhysicsConfig.arcade);
+    const arcadeSolver = new ex.ArcadeSolver(getDefaultPhysicsConfig().arcade);
 
     const player = new ex.Actor({
       x: 0,
@@ -198,7 +198,7 @@ describe('An ArcadeSolver', () => {
   });
 
   it('should cancel near zero mtv collisions', () => {
-    const arcadeSolver = new ex.ArcadeSolver(DefaultPhysicsConfig.arcade);
+    const arcadeSolver = new ex.ArcadeSolver(getDefaultPhysicsConfig().arcade);
 
     const player = new ex.Actor({
       x: 0,
@@ -235,7 +235,7 @@ describe('An ArcadeSolver', () => {
   });
 
   it('should cancel near zero overlap collisions', () => {
-    const arcadeSolver = new ex.ArcadeSolver(DefaultPhysicsConfig.arcade);
+    const arcadeSolver = new ex.ArcadeSolver(getDefaultPhysicsConfig().arcade);
 
     const player = new ex.Actor({
       x: 0,
@@ -272,7 +272,7 @@ describe('An ArcadeSolver', () => {
   });
 
   it('should cancel zero overlap collisions during presolve', () => {
-    const arcadeSolver = new ex.ArcadeSolver(DefaultPhysicsConfig.arcade);
+    const arcadeSolver = new ex.ArcadeSolver(getDefaultPhysicsConfig().arcade);
 
     const player = new ex.Actor({
       x: 0,

diff --git a/src/spec/CollisionContactSpec.ts b/src/spec/CollisionContactSpec.ts
@@ -2,7 +2,7 @@ import * as ex from '@excalibur';
 import { TransformComponent } from '@excalibur';
 import { EulerIntegrator } from '../engine/Collision/Integrator';
 import { MotionComponent } from '../engine/EntityComponentSystem/Components/MotionComponent';
-import { DefaultPhysicsConfig } from '../engine/Collision/PhysicsConfig';
+import { getDefaultPhysicsConfig } from '../engine/Collision/PhysicsConfig';
 import { ExcaliburMatchers } from 'excalibur-jasmine';
 
 describe('A CollisionContact', () => {
@@ -59,7 +59,7 @@ describe('A CollisionContact', () => {
       new ex.SeparationInfo()
     );
 
-    const solver = new ex.ArcadeSolver(DefaultPhysicsConfig.arcade);
+    const solver = new ex.ArcadeSolver(getDefaultPhysicsConfig().arcade);
     solver.solve([cc]);
 
     expect(actorA.pos.x).toBe(-0.5);
@@ -88,7 +88,7 @@ describe('A CollisionContact', () => {
       new ex.SeparationInfo()
     );
 
-    const solver = new ex.ArcadeSolver(DefaultPhysicsConfig.arcade);
+    const solver = new ex.ArcadeSolver(getDefaultPhysicsConfig().arcade);
     solver.solve([cc]);
 
     expect(actorAPreCollide).toHaveBeenCalledTimes(1);
@@ -120,7 +120,7 @@ describe('A CollisionContact', () => {
       null
     );
     // slop is normally 1 pixel, we are testing at a pixel scale here
-    const solver = new ex.RealisticSolver({ ...DefaultPhysicsConfig.realistic, slop: 0 });
+    const solver = new ex.RealisticSolver({ ...getDefaultPhysicsConfig().realistic, slop: 0 });
     // Realistic solver converges over time
     for (let i = 0; i < 4; i++) {
       solver.solve([cc]);
@@ -165,7 +165,7 @@ describe('A CollisionContact', () => {
       null
     );
     // slop is normally 1 pixel, we are testing at a pixel scale here
-    const solver = new ex.RealisticSolver({ ...DefaultPhysicsConfig.realistic, slop: 0 });
+    const solver = new ex.RealisticSolver({ ...getDefaultPhysicsConfig().realistic, slop: 0 });
 
     solver.solve([cc]);
     // Realistic solver uses velocity impulses to correct overlap
@@ -209,7 +209,7 @@ describe('A CollisionContact', () => {
       [new ex.Vector(10, 0), new ex.Vector(10, 10)],
       null
     );
-    const solver = new ex.RealisticSolver(DefaultPhysicsConfig.realistic);
+    const solver = new ex.RealisticSolver({ ...getDefaultPhysicsConfig().realistic });
     solver.solve([cc]);
     // Realistic solver uses velocity impulses to correct overlap
     EulerIntegrator.integrate(actorA.get(TransformComponent), actorA.get(MotionComponent), ex.Vector.Zero, 30);
@@ -247,7 +247,7 @@ describe('A CollisionContact', () => {
       null
     );
     const solver = new ex.RealisticSolver({
-      ...DefaultPhysicsConfig.realistic,
+      ...getDefaultPhysicsConfig().realistic,
       slop: 0
     });
     solver.solve([cc]);
@@ -288,7 +288,7 @@ describe('A CollisionContact', () => {
 
     // slop is normally 1 pixel, we are testing at a pixel scale here
     const solver = new ex.RealisticSolver({
-      ...DefaultPhysicsConfig.realistic,
+      ...getDefaultPhysicsConfig().realistic,
       slop: 0
     });
     solver.solve([cc]);
@@ -325,7 +325,7 @@ describe('A CollisionContact', () => {
       null
     );
 
-    const solver = new ex.RealisticSolver(DefaultPhysicsConfig.realistic);
+    const solver = new ex.RealisticSolver({ ...getDefaultPhysicsConfig().realistic });
     solver.solve([cc]);
 
     expect(emittedA).toBe(true);

diff --git a/src/spec/CollisionSpec.ts b/src/spec/CollisionSpec.ts
@@ -1,6 +1,6 @@
 import * as ex from '@excalibur';
 import { TestUtils } from './util/TestUtils';
-import { DefaultPhysicsConfig } from '../engine/Collision/PhysicsConfig';
+import { getDefaultPhysicsConfig } from '../engine/Collision/PhysicsConfig';
 
 describe('A Collision', () => {
   let actor1: ex.Actor = null;
@@ -56,7 +56,7 @@ describe('A Collision', () => {
 
   it('order of actors collision should not matter when an Active and Active Collision', () => {
     const collisionTree = new ex.DynamicTreeCollisionProcessor({
-      ...DefaultPhysicsConfig
+      ...getDefaultPhysicsConfig()
     });
 
     actor1.body.collisionType = ex.CollisionType.Active;
@@ -75,7 +75,7 @@ describe('A Collision', () => {
 
   it('order of actors collision should not matter when an Active and Passive Collision', () => {
     const collisionTree = new ex.DynamicTreeCollisionProcessor({
-      ...DefaultPhysicsConfig
+      ...getDefaultPhysicsConfig()
     });
 
     actor1.body.collisionType = ex.CollisionType.Active;

diff --git a/src/spec/CompositeColliderSpec.ts b/src/spec/CompositeColliderSpec.ts
@@ -1,7 +1,7 @@
 import * as ex from '@excalibur';
 import { BoundingBox, GameEvent, LineSegment, Projection, Ray, vec, Vector } from '@excalibur';
 import { ExcaliburAsyncMatchers, ExcaliburMatchers } from 'excalibur-jasmine';
-import { DefaultPhysicsConfig } from '../engine/Collision/PhysicsConfig';
+import { getDefaultPhysicsConfig } from '../engine/Collision/PhysicsConfig';
 describe('A CompositeCollider', () => {
   beforeAll(() => {
     jasmine.addAsyncMatchers(ExcaliburAsyncMatchers);
@@ -281,7 +281,7 @@ describe('A CompositeCollider', () => {
     const compCollider = new ex.CompositeCollider([ex.Shape.Circle(50), ex.Shape.Box(200, 10, Vector.Half)]);
 
     const dynamicTreeProcessor = new ex.DynamicTreeCollisionProcessor({
-      ...DefaultPhysicsConfig
+      ...getDefaultPhysicsConfig()
     });
     dynamicTreeProcessor.track(compCollider);
 
@@ -294,7 +294,7 @@ describe('A CompositeCollider', () => {
     const compCollider = new ex.CompositeCollider([ex.Shape.Circle(50), ex.Shape.Box(200, 10, Vector.Half)]);
 
     const dynamicTreeProcessor = new ex.DynamicTreeCollisionProcessor({
-      ...DefaultPhysicsConfig
+      ...getDefaultPhysicsConfig()
     });
     dynamicTreeProcessor.track(compCollider);