josh/ichigo
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

more physics tweaks

Browse source
This commit is contained in:
Josh Deprez 2021-08-12 16:14:51 +10:00
parent 1002dc847c
commit 453850b5b2
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
game/aw.go
View file

@ -29,11 +29,12 @@ type Awakeman struct {
func (aw *Awakeman) Update() error { func (aw *Awakeman) Update() error {
const ( const (
notFallingε = 0.2 ε = 0.2
restitution = -0.3 restitution = -0.3
gravity = 0.3 gravity = 0.3
jumpVelocity = -3.6 jumpVelocity = -3.6
runVelocity = 1.4 runVelocity = 1.4
coyoteTime = 5
) )
// High-school physics time! Under constant acceleration: // High-school physics time! Under constant acceleration:
@ -49,10 +50,10 @@ func (aw *Awakeman) Update() error {
ux, uy := aw.vx, aw.vy ux, uy := aw.vx, aw.vy
// Has traction? // Has traction?
if math.Abs(aw.vy) < notFallingε && aw.CollidesAt(aw.Pos.Add(image.Pt(0, 1))) { if aw.CollidesAt(aw.Pos.Add(image.Pt(0, 1))) {
// Not falling. // Not falling
aw.vy = 0 aw.vy = 0
aw.coyoteTimer = 5 aw.coyoteTimer = coyoteTime
} else { } else {
// Falling. v = v_0 + a, and a is gravity. // Falling. v = v_0 + a, and a is gravity.
aw.vy += gravity aw.vy += gravity
@ -95,9 +96,15 @@ func (aw *Awakeman) Update() error {
*/ */
// s = (v_0 + v) / 2. // s = (v_0 + v) / 2.
// On collision, bounce a little bit. aw.MoveX((ux+aw.vx)/2, nil)
aw.MoveX((ux+aw.vx)/2, func() { aw.vx *= restitution }) // For Y, on collision, bounce a little bit.
aw.MoveY((uy+aw.vy)/2, func() { aw.vy *= restitution }) // Does not apply to X because controls override it anyway.
aw.MoveY((uy+aw.vy)/2, func() {
aw.vy *= restitution
if math.Abs(aw.vy) < ε {
aw.vy = 0
}
})
// aw.Pos is top-left corner, so add half size to get centre // aw.Pos is top-left corner, so add half size to get centre
aw.camera.Centre = aw.Pos.Add(aw.Size.Div(2)) aw.camera.Centre = aw.Pos.Add(aw.Size.Div(2))
return aw.Sprite.Update() return aw.Sprite.Update()