From 6af504d12adc264c88955ffae651f10f0651a026 Mon Sep 17 00:00:00 2001 From: Azalea Colburn <62953415+azaleacolburn@users.noreply.github.com> Date: Wed, 21 Aug 2024 14:23:26 -0700 Subject: [PATCH 1/2] Update fission/src/mirabuf/MirabufInstance.ts Co-authored-by: Brandon Pacewic <92102436+BrandonPacewic@users.noreply.github.com> --- fission/src/mirabuf/MirabufInstance.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fission/src/mirabuf/MirabufInstance.ts b/fission/src/mirabuf/MirabufInstance.ts index 49cd9df49..607343678 100644 --- a/fission/src/mirabuf/MirabufInstance.ts +++ b/fission/src/mirabuf/MirabufInstance.ts @@ -128,11 +128,6 @@ class MirabufInstance { * Parses all mirabuf appearances into ThreeJS and Jolt materials. */ private LoadMaterials(materialStyle: MaterialStyle) { - Object.entries(this._mirabufParser.assembly.data!.materials!.physicalMaterials!).forEach(([name, material]) => { - const [static_f, dynamic_f] = [material.staticFriction, material.dynamicFriction] - console.log(`${name} - static: ${static_f} dynamic: ${dynamic_f}`) - //this._materials.set() - }) Object.entries(this._mirabufParser.assembly.data!.materials!.appearances!).forEach( ([appearanceId, appearance]) => { const { A, B, G, R } = appearance.albedo ?? {} From c485d5b502174b8bddec12db355b96fe717fed9e Mon Sep 17 00:00:00 2001 From: Azalea Colburn <62953415+azaleacolburn@users.noreply.github.com> Date: Wed, 21 Aug 2024 14:24:20 -0700 Subject: [PATCH 2/2] Update fission/src/systems/physics/PhysicsSystem.ts Co-authored-by: Brandon Pacewic <92102436+BrandonPacewic@users.noreply.github.com> --- fission/src/systems/physics/PhysicsSystem.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fission/src/systems/physics/PhysicsSystem.ts b/fission/src/systems/physics/PhysicsSystem.ts index dc1f29944..f323503e4 100644 --- a/fission/src/systems/physics/PhysicsSystem.ts +++ b/fission/src/systems/physics/PhysicsSystem.ts @@ -165,7 +165,7 @@ class PhysicsSystem extends WorldSystem { * The pause works off of a request counter. */ public ReleasePause() { - if (this._pauseCounter > 0) this._pauseCounter-- + if (this._pauseCounter) this._pauseCounter-- } /**