Skip to content

Commit

Permalink
constants
Browse files Browse the repository at this point in the history
  • Loading branch information
tailuge committed Dec 29, 2024
1 parent e73a6ca commit efda848
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dist/diagram.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/mathaven.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions dist/score.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
keys *
del hiscorenineball
6 changes: 3 additions & 3 deletions src/model/physics/collisionthrow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class CollisionThrow {
const ab = contact.b.sub(contact.a).normalize()
const abTangent = new Vector3(-ab.y, ab.x, 0)

const e = 0.98
const e = 0.99
const vPoint = a.vel
.clone()
.sub(b.vel)
Expand All @@ -49,8 +49,8 @@ export class CollisionThrow {
// Normal impulse (inelastic collision)
this.normalImpulse = (-(1 + e) * vRelNormalMag) / (2 / m)

// Tangential impulse (frictional constraint)
this.tangentialImpulse =
// Tangential impulse (frictional constraint) reduced by 1/3 until understood
this.tangentialImpulse = 0.3 *
Math.min((μ * Math.abs(this.normalImpulse)) / vRelMag, 1 / 7) *
-vRelTangential

Expand Down
2 changes: 1 addition & 1 deletion src/model/physics/constants.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export const g = 9.8
export let mu = 0.00985
export let muS = 0.16
export let muC = 0.8
export let muC = 0.85
export let rho = 0.034
export let m = 0.23
export let R = 0.03275
Expand Down

0 comments on commit efda848

Please sign in to comment.