2019-04-16 02:12:25 +00:00
|
|
|
package collision
|
2018-07-24 03:10:53 +00:00
|
|
|
|
|
|
|
import (
|
2019-05-07 00:06:40 +00:00
|
|
|
"sync"
|
|
|
|
|
2019-12-23 02:21:58 +00:00
|
|
|
"git.kirsle.net/go/render"
|
2019-04-16 02:12:25 +00:00
|
|
|
"git.kirsle.net/apps/doodle/pkg/doodads"
|
2019-04-10 00:35:44 +00:00
|
|
|
"git.kirsle.net/apps/doodle/pkg/level"
|
2018-07-24 03:10:53 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
// Collide describes how a collision occurred.
|
|
|
|
type Collide struct {
|
2018-07-25 03:57:22 +00:00
|
|
|
Top bool
|
|
|
|
TopPoint render.Point
|
2018-09-25 16:40:34 +00:00
|
|
|
TopPixel *level.Swatch
|
2018-07-25 03:57:22 +00:00
|
|
|
Left bool
|
|
|
|
LeftPoint render.Point
|
2018-09-25 16:40:34 +00:00
|
|
|
LeftPixel *level.Swatch
|
2018-07-25 03:57:22 +00:00
|
|
|
Right bool
|
|
|
|
RightPoint render.Point
|
2018-09-25 16:40:34 +00:00
|
|
|
RightPixel *level.Swatch
|
2018-07-25 03:57:22 +00:00
|
|
|
Bottom bool
|
|
|
|
BottomPoint render.Point
|
2018-09-25 16:40:34 +00:00
|
|
|
BottomPixel *level.Swatch
|
2018-07-25 03:57:22 +00:00
|
|
|
MoveTo render.Point
|
Add Switches, Fire/Water Collision and Play Menu
* New doodads: Switches.
* They come in four varieties: wall switch (background element, with
"ON/OFF" text) and three side-profile switches for the floor, left
or right walls.
* On collision with the player, they flip their state from "OFF" to
"ON" or vice versa. If the player walks away and then collides
again, the switch flips again.
* Can be used to open/close Electric Doors when turned on/off. Their
default state is "off"
* If a switch receives a power signal from another linked switch, it
sets its own state to match. So, two "on/off" switches that are
connected to a door AND to each other will both flip on/off when one
of them flips.
* Update the Level Collision logic to support Decoration, Fire and Water
pixel collisions.
* Previously, ALL pixels in the level were acting as though solid.
* Non-solid pixels don't count for collision detection, but their
attributes (fire and water) are collected and returned.
* Updated the MenuScene to support loading a map file in Play Mode
instead of Edit Mode. Updated the title screen menu to add a button
for playing levels instead of editing them.
* Wrote some documentation.
2019-07-07 01:30:03 +00:00
|
|
|
|
|
|
|
// Swatch attributes affecting the collision at this time.
|
|
|
|
InFire bool
|
|
|
|
InWater bool
|
2018-07-25 03:57:22 +00:00
|
|
|
}
|
|
|
|
|
2018-07-25 05:26:27 +00:00
|
|
|
// Reset a Collide struct flipping all the bools off, but keeping MoveTo.
|
|
|
|
func (c *Collide) Reset() {
|
|
|
|
c.Top = false
|
|
|
|
c.Left = false
|
|
|
|
c.Right = false
|
|
|
|
c.Bottom = false
|
|
|
|
}
|
|
|
|
|
2018-07-25 03:57:22 +00:00
|
|
|
// Side of the collision box (top, bottom, left, right)
|
|
|
|
type Side uint8
|
|
|
|
|
|
|
|
// Options for the Side type.
|
|
|
|
const (
|
|
|
|
Top Side = iota
|
|
|
|
Bottom
|
|
|
|
Left
|
|
|
|
Right
|
|
|
|
)
|
|
|
|
|
2019-04-14 22:25:03 +00:00
|
|
|
/*
|
|
|
|
CollidesWithGrid checks if a Doodad collides with level geometry.
|
|
|
|
|
|
|
|
The `target` is the point the actor wants to move to on this tick.
|
|
|
|
*/
|
2019-04-16 02:12:25 +00:00
|
|
|
func CollidesWithGrid(d doodads.Actor, grid *level.Chunker, target render.Point) (*Collide, bool) {
|
2018-07-24 03:10:53 +00:00
|
|
|
var (
|
2018-07-25 03:57:22 +00:00
|
|
|
P = d.Position()
|
|
|
|
S = d.Size()
|
|
|
|
|
|
|
|
result = &Collide{
|
|
|
|
MoveTo: P,
|
2018-07-24 03:10:53 +00:00
|
|
|
}
|
2018-07-25 05:26:27 +00:00
|
|
|
ceiling bool // Has hit a ceiling?
|
|
|
|
capHeight int32 // Stop vertical movement thru a ceiling
|
|
|
|
capLeft int32 // Stop movement thru a wall
|
|
|
|
capRight int32
|
2019-04-14 22:25:03 +00:00
|
|
|
capFloor int32 // Stop movement thru the floor
|
|
|
|
hitLeft bool // Has hit an obstacle on the left
|
|
|
|
hitRight bool // or right
|
2018-07-25 05:26:27 +00:00
|
|
|
hitFloor bool
|
2018-07-25 03:57:22 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
// Test all of the bounding boxes for a collision with level geometry.
|
2019-04-16 02:12:25 +00:00
|
|
|
if ok := result.ScanBoundingBox(doodads.GetBoundingRect(d), grid); ok {
|
2018-07-25 03:57:22 +00:00
|
|
|
// We've already collided! Try to wiggle free.
|
|
|
|
if result.Bottom {
|
|
|
|
if !d.Grounded() {
|
|
|
|
d.SetGrounded(true)
|
|
|
|
} else {
|
|
|
|
// result.Bottom = false
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
d.SetGrounded(false)
|
2018-07-24 03:10:53 +00:00
|
|
|
}
|
2018-07-25 03:57:22 +00:00
|
|
|
if result.Top {
|
2018-07-25 05:26:27 +00:00
|
|
|
// Never seen it touch the top.
|
2018-07-24 03:10:53 +00:00
|
|
|
}
|
2018-07-25 03:57:22 +00:00
|
|
|
if result.Left {
|
|
|
|
P.X++
|
|
|
|
}
|
|
|
|
if result.Right {
|
|
|
|
P.X--
|
|
|
|
}
|
|
|
|
}
|
2018-07-24 03:10:53 +00:00
|
|
|
|
2018-07-25 03:57:22 +00:00
|
|
|
// If grounded, cap our Y position.
|
|
|
|
if d.Grounded() {
|
|
|
|
if !result.Bottom {
|
|
|
|
// We've fallen off a ledge.
|
|
|
|
d.SetGrounded(false)
|
|
|
|
} else if target.Y < P.Y {
|
|
|
|
// We're moving upward.
|
|
|
|
d.SetGrounded(false)
|
|
|
|
} else {
|
|
|
|
// Cap our downward motion to our current position.
|
|
|
|
target.Y = P.Y
|
2018-07-24 03:10:53 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-25 03:57:22 +00:00
|
|
|
// Cap our horizontal movement if we're touching walls.
|
|
|
|
if (result.Left && target.X < P.X) || (result.Right && target.X > P.X) {
|
|
|
|
// If the step is short enough, try and jump up.
|
2018-07-25 05:26:27 +00:00
|
|
|
height := P.Y + S.H
|
2018-07-25 03:57:22 +00:00
|
|
|
if result.Left && target.X < P.X {
|
2018-07-25 05:26:27 +00:00
|
|
|
height -= result.LeftPoint.Y
|
2018-07-25 03:57:22 +00:00
|
|
|
} else {
|
2018-07-25 05:26:27 +00:00
|
|
|
height -= result.RightPoint.Y
|
2018-07-25 03:57:22 +00:00
|
|
|
}
|
2018-07-25 05:26:27 +00:00
|
|
|
if height <= 8 {
|
|
|
|
target.Y -= height
|
2018-07-25 03:57:22 +00:00
|
|
|
if target.X < P.X {
|
|
|
|
target.X-- // push along to the left
|
|
|
|
} else if target.X > P.X {
|
|
|
|
target.X++ // push along to the right
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
target.X = P.X
|
2018-07-24 03:10:53 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-25 05:26:27 +00:00
|
|
|
// Cap our vertical movement if we're touching ceilings.
|
|
|
|
if ceiling {
|
|
|
|
// The existing box intersects a ceiling, this will almost never
|
|
|
|
// happen because gravity will always pull you away at the last frame.
|
|
|
|
// But if we do somehow get here, may as well cap it where it's at.
|
|
|
|
capHeight = P.Y
|
|
|
|
}
|
|
|
|
|
2018-07-25 03:57:22 +00:00
|
|
|
// Trace a line from where we are to where we wanna go.
|
2018-07-25 05:26:27 +00:00
|
|
|
result.Reset()
|
2018-07-25 03:57:22 +00:00
|
|
|
result.MoveTo = P
|
2019-07-14 21:18:44 +00:00
|
|
|
for point := range render.IterLine(P, target) {
|
2018-07-25 05:26:27 +00:00
|
|
|
if has := result.ScanBoundingBox(render.Rect{
|
2018-07-24 03:10:53 +00:00
|
|
|
X: point.X,
|
|
|
|
Y: point.Y,
|
2018-07-25 03:57:22 +00:00
|
|
|
W: S.W,
|
|
|
|
H: S.H,
|
2018-07-25 05:26:27 +00:00
|
|
|
}, grid); has {
|
|
|
|
if result.Bottom {
|
|
|
|
if !hitFloor {
|
|
|
|
hitFloor = true
|
|
|
|
capFloor = result.BottomPoint.Y - S.H
|
2018-07-25 03:57:22 +00:00
|
|
|
}
|
|
|
|
d.SetGrounded(true)
|
|
|
|
}
|
2018-07-25 05:26:27 +00:00
|
|
|
|
|
|
|
if result.Top && !ceiling {
|
|
|
|
// This is a newly discovered ceiling.
|
|
|
|
ceiling = true
|
|
|
|
capHeight = result.TopPoint.Y
|
|
|
|
}
|
|
|
|
|
|
|
|
if result.Left && !hitLeft {
|
|
|
|
hitLeft = true
|
|
|
|
capLeft = result.LeftPoint.X
|
|
|
|
}
|
|
|
|
if result.Right && !hitRight {
|
|
|
|
hitRight = true
|
|
|
|
capRight = result.RightPoint.X - S.W
|
|
|
|
}
|
2018-07-24 03:10:53 +00:00
|
|
|
}
|
2018-07-25 05:26:27 +00:00
|
|
|
|
|
|
|
// So far so good, keep following the MoveTo to
|
|
|
|
// the last good point before a collision.
|
2018-07-25 03:57:22 +00:00
|
|
|
result.MoveTo = point
|
2018-07-25 05:26:27 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
// If they hit the roof, cap them to the roof.
|
|
|
|
if ceiling && result.MoveTo.Y < capHeight {
|
|
|
|
result.Top = true
|
|
|
|
result.MoveTo.Y = capHeight
|
|
|
|
}
|
|
|
|
if hitFloor && result.MoveTo.Y > capFloor {
|
|
|
|
result.Bottom = true
|
|
|
|
result.MoveTo.Y = capFloor
|
|
|
|
}
|
|
|
|
if hitLeft {
|
|
|
|
result.Left = true
|
|
|
|
result.MoveTo.X = capLeft
|
|
|
|
}
|
|
|
|
if hitRight {
|
|
|
|
result.Right = true
|
|
|
|
result.MoveTo.X = capRight
|
2018-07-25 03:57:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return result, result.IsColliding()
|
|
|
|
}
|
|
|
|
|
|
|
|
// IsColliding returns whether any sort of collision has occurred.
|
|
|
|
func (c *Collide) IsColliding() bool {
|
Add Switches, Fire/Water Collision and Play Menu
* New doodads: Switches.
* They come in four varieties: wall switch (background element, with
"ON/OFF" text) and three side-profile switches for the floor, left
or right walls.
* On collision with the player, they flip their state from "OFF" to
"ON" or vice versa. If the player walks away and then collides
again, the switch flips again.
* Can be used to open/close Electric Doors when turned on/off. Their
default state is "off"
* If a switch receives a power signal from another linked switch, it
sets its own state to match. So, two "on/off" switches that are
connected to a door AND to each other will both flip on/off when one
of them flips.
* Update the Level Collision logic to support Decoration, Fire and Water
pixel collisions.
* Previously, ALL pixels in the level were acting as though solid.
* Non-solid pixels don't count for collision detection, but their
attributes (fire and water) are collected and returned.
* Updated the MenuScene to support loading a map file in Play Mode
instead of Edit Mode. Updated the title screen menu to add a button
for playing levels instead of editing them.
* Wrote some documentation.
2019-07-07 01:30:03 +00:00
|
|
|
return c.Top || c.Bottom || c.Left || c.Right ||
|
|
|
|
c.InFire || c.InWater
|
2018-07-25 03:57:22 +00:00
|
|
|
}
|
2019-04-16 02:12:25 +00:00
|
|
|
|
|
|
|
// ScanBoundingBox scans all of the pixels in a bounding box on the grid and
|
|
|
|
// returns if any of them intersect with level geometry.
|
|
|
|
func (c *Collide) ScanBoundingBox(box render.Rect, grid *level.Chunker) bool {
|
|
|
|
col := GetCollisionBox(box)
|
|
|
|
|
2019-05-07 00:06:40 +00:00
|
|
|
// Check all four edges of the box in parallel on different CPU cores.
|
|
|
|
type jobSide struct {
|
2019-05-07 05:57:32 +00:00
|
|
|
p1 render.Point // p2 is perpendicular to p1 along a straight edge
|
|
|
|
p2 render.Point // of the collision box.
|
2019-05-07 00:06:40 +00:00
|
|
|
side Side
|
|
|
|
}
|
2019-05-07 05:57:32 +00:00
|
|
|
jobs := []jobSide{ // We'll scan each side of the bounding box in parallel
|
2019-05-07 00:06:40 +00:00
|
|
|
jobSide{col.Top[0], col.Top[1], Top},
|
|
|
|
jobSide{col.Bottom[0], col.Bottom[1], Bottom},
|
|
|
|
jobSide{col.Left[0], col.Left[1], Left},
|
|
|
|
jobSide{col.Right[0], col.Right[1], Right},
|
|
|
|
}
|
2019-05-07 05:57:32 +00:00
|
|
|
|
2019-05-07 00:06:40 +00:00
|
|
|
var wg sync.WaitGroup
|
|
|
|
for _, job := range jobs {
|
|
|
|
wg.Add(1)
|
|
|
|
go func(job jobSide) {
|
|
|
|
defer wg.Done()
|
|
|
|
c.ScanGridLine(job.p1, job.p2, grid, job.side)
|
|
|
|
}(job)
|
|
|
|
}
|
|
|
|
|
|
|
|
wg.Wait()
|
2019-04-16 02:12:25 +00:00
|
|
|
return c.IsColliding()
|
|
|
|
}
|
|
|
|
|
|
|
|
// ScanGridLine scans all of the pixels between p1 and p2 on the grid and tests
|
|
|
|
// for any pixels to be set, implying a collision between level geometry and the
|
|
|
|
// bounding boxes of the doodad.
|
|
|
|
func (c *Collide) ScanGridLine(p1, p2 render.Point, grid *level.Chunker, side Side) {
|
2019-07-14 21:18:44 +00:00
|
|
|
for point := range render.IterLine(p1, p2) {
|
Add Switches, Fire/Water Collision and Play Menu
* New doodads: Switches.
* They come in four varieties: wall switch (background element, with
"ON/OFF" text) and three side-profile switches for the floor, left
or right walls.
* On collision with the player, they flip their state from "OFF" to
"ON" or vice versa. If the player walks away and then collides
again, the switch flips again.
* Can be used to open/close Electric Doors when turned on/off. Their
default state is "off"
* If a switch receives a power signal from another linked switch, it
sets its own state to match. So, two "on/off" switches that are
connected to a door AND to each other will both flip on/off when one
of them flips.
* Update the Level Collision logic to support Decoration, Fire and Water
pixel collisions.
* Previously, ALL pixels in the level were acting as though solid.
* Non-solid pixels don't count for collision detection, but their
attributes (fire and water) are collected and returned.
* Updated the MenuScene to support loading a map file in Play Mode
instead of Edit Mode. Updated the title screen menu to add a button
for playing levels instead of editing them.
* Wrote some documentation.
2019-07-07 01:30:03 +00:00
|
|
|
if swatch, err := grid.Get(point); err == nil {
|
|
|
|
// We're intersecting a pixel! If it's a solid one we'll return it
|
|
|
|
// in our result. If non-solid, we'll collect attributes from it
|
|
|
|
// and return them in the final result for gameplay behavior.
|
|
|
|
if swatch.Fire {
|
|
|
|
c.InFire = true
|
|
|
|
}
|
|
|
|
if swatch.Water {
|
|
|
|
c.InWater = true
|
|
|
|
}
|
|
|
|
|
|
|
|
// Non-solid swatches don't collide so don't pay them attention.
|
|
|
|
if !swatch.Solid {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2019-04-16 02:12:25 +00:00
|
|
|
switch side {
|
|
|
|
case Top:
|
|
|
|
c.Top = true
|
|
|
|
c.TopPoint = point
|
Add Switches, Fire/Water Collision and Play Menu
* New doodads: Switches.
* They come in four varieties: wall switch (background element, with
"ON/OFF" text) and three side-profile switches for the floor, left
or right walls.
* On collision with the player, they flip their state from "OFF" to
"ON" or vice versa. If the player walks away and then collides
again, the switch flips again.
* Can be used to open/close Electric Doors when turned on/off. Their
default state is "off"
* If a switch receives a power signal from another linked switch, it
sets its own state to match. So, two "on/off" switches that are
connected to a door AND to each other will both flip on/off when one
of them flips.
* Update the Level Collision logic to support Decoration, Fire and Water
pixel collisions.
* Previously, ALL pixels in the level were acting as though solid.
* Non-solid pixels don't count for collision detection, but their
attributes (fire and water) are collected and returned.
* Updated the MenuScene to support loading a map file in Play Mode
instead of Edit Mode. Updated the title screen menu to add a button
for playing levels instead of editing them.
* Wrote some documentation.
2019-07-07 01:30:03 +00:00
|
|
|
c.TopPixel = swatch
|
2019-04-16 02:12:25 +00:00
|
|
|
case Bottom:
|
|
|
|
c.Bottom = true
|
|
|
|
c.BottomPoint = point
|
Add Switches, Fire/Water Collision and Play Menu
* New doodads: Switches.
* They come in four varieties: wall switch (background element, with
"ON/OFF" text) and three side-profile switches for the floor, left
or right walls.
* On collision with the player, they flip their state from "OFF" to
"ON" or vice versa. If the player walks away and then collides
again, the switch flips again.
* Can be used to open/close Electric Doors when turned on/off. Their
default state is "off"
* If a switch receives a power signal from another linked switch, it
sets its own state to match. So, two "on/off" switches that are
connected to a door AND to each other will both flip on/off when one
of them flips.
* Update the Level Collision logic to support Decoration, Fire and Water
pixel collisions.
* Previously, ALL pixels in the level were acting as though solid.
* Non-solid pixels don't count for collision detection, but their
attributes (fire and water) are collected and returned.
* Updated the MenuScene to support loading a map file in Play Mode
instead of Edit Mode. Updated the title screen menu to add a button
for playing levels instead of editing them.
* Wrote some documentation.
2019-07-07 01:30:03 +00:00
|
|
|
c.BottomPixel = swatch
|
2019-04-16 02:12:25 +00:00
|
|
|
case Left:
|
|
|
|
c.Left = true
|
|
|
|
c.LeftPoint = point
|
Add Switches, Fire/Water Collision and Play Menu
* New doodads: Switches.
* They come in four varieties: wall switch (background element, with
"ON/OFF" text) and three side-profile switches for the floor, left
or right walls.
* On collision with the player, they flip their state from "OFF" to
"ON" or vice versa. If the player walks away and then collides
again, the switch flips again.
* Can be used to open/close Electric Doors when turned on/off. Their
default state is "off"
* If a switch receives a power signal from another linked switch, it
sets its own state to match. So, two "on/off" switches that are
connected to a door AND to each other will both flip on/off when one
of them flips.
* Update the Level Collision logic to support Decoration, Fire and Water
pixel collisions.
* Previously, ALL pixels in the level were acting as though solid.
* Non-solid pixels don't count for collision detection, but their
attributes (fire and water) are collected and returned.
* Updated the MenuScene to support loading a map file in Play Mode
instead of Edit Mode. Updated the title screen menu to add a button
for playing levels instead of editing them.
* Wrote some documentation.
2019-07-07 01:30:03 +00:00
|
|
|
c.LeftPixel = swatch
|
2019-04-16 02:12:25 +00:00
|
|
|
case Right:
|
|
|
|
c.Right = true
|
|
|
|
c.RightPoint = point
|
Add Switches, Fire/Water Collision and Play Menu
* New doodads: Switches.
* They come in four varieties: wall switch (background element, with
"ON/OFF" text) and three side-profile switches for the floor, left
or right walls.
* On collision with the player, they flip their state from "OFF" to
"ON" or vice versa. If the player walks away and then collides
again, the switch flips again.
* Can be used to open/close Electric Doors when turned on/off. Their
default state is "off"
* If a switch receives a power signal from another linked switch, it
sets its own state to match. So, two "on/off" switches that are
connected to a door AND to each other will both flip on/off when one
of them flips.
* Update the Level Collision logic to support Decoration, Fire and Water
pixel collisions.
* Previously, ALL pixels in the level were acting as though solid.
* Non-solid pixels don't count for collision detection, but their
attributes (fire and water) are collected and returned.
* Updated the MenuScene to support loading a map file in Play Mode
instead of Edit Mode. Updated the title screen menu to add a button
for playing levels instead of editing them.
* Wrote some documentation.
2019-07-07 01:30:03 +00:00
|
|
|
c.RightPixel = swatch
|
2019-04-16 02:12:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|