Skip to content

Commit

Permalink
Merge branch 'colbura/1777/friction-parsing' of https://github.com/Au…
Browse files Browse the repository at this point in the history
…todesk/synthesis into colbura/1777/friction-parsing
  • Loading branch information
azaleacolburn committed Aug 21, 2024
2 parents 29000a2 + c485d5b commit 86a8e51
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
5 changes: 0 additions & 5 deletions fission/src/mirabuf/MirabufInstance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?? {}
Expand Down
2 changes: 1 addition & 1 deletion fission/src/systems/physics/PhysicsSystem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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--
}

/**
Expand Down

0 comments on commit 86a8e51

Please sign in to comment.