completed refactoring to use systems
This commit is contained in:
@@ -1,54 +0,0 @@
|
||||
package game
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"image"
|
||||
. "openquell/components"
|
||||
|
||||
"github.com/mlange-42/arche/ecs"
|
||||
"github.com/mlange-42/arche/generic"
|
||||
)
|
||||
|
||||
type CollectibleSystem struct {
|
||||
World *ecs.World
|
||||
Selector *generic.Filter2[Position, Collectible]
|
||||
}
|
||||
|
||||
func NewCollectibleSystem(world *ecs.World) *CollectibleSystem {
|
||||
system := &CollectibleSystem{
|
||||
Selector: generic.NewFilter2[Position, Collectible](),
|
||||
}
|
||||
|
||||
return system
|
||||
}
|
||||
|
||||
func (system *CollectibleSystem) CheckPlayerCollision(
|
||||
playerposition *Position,
|
||||
playervelocity *Velocity) (bool, image.Point) {
|
||||
|
||||
toRemove := []ecs.Entity{}
|
||||
particle_pos := image.Point{}
|
||||
var bumped bool
|
||||
|
||||
query := system.Selector.Query(system.World)
|
||||
|
||||
for query.Next() {
|
||||
colposition, collectible := query.Get()
|
||||
|
||||
ok, _ := playerposition.Intersects(colposition, playervelocity)
|
||||
if ok {
|
||||
fmt.Printf("bumped into collectible %v\n", collectible)
|
||||
toRemove = append(toRemove, query.Entity())
|
||||
particle_pos.X = colposition.X
|
||||
particle_pos.Y = colposition.Y
|
||||
bumped = true
|
||||
}
|
||||
}
|
||||
|
||||
// remove collectible if collected
|
||||
for _, entity := range toRemove {
|
||||
system.World.RemoveEntity(entity)
|
||||
}
|
||||
|
||||
return bumped, particle_pos
|
||||
}
|
||||
185
game/grid.go
185
game/grid.go
@@ -1,185 +0,0 @@
|
||||
package game
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"image"
|
||||
"log"
|
||||
"openquell/assets"
|
||||
"openquell/components"
|
||||
. "openquell/config"
|
||||
|
||||
"github.com/alecthomas/repr"
|
||||
"github.com/mlange-42/arche/generic"
|
||||
)
|
||||
|
||||
type Grid struct {
|
||||
Width int
|
||||
Height int
|
||||
Size int
|
||||
Tilesize int
|
||||
TilesX int
|
||||
TilesY int
|
||||
Map map[image.Point]*assets.Tile
|
||||
}
|
||||
|
||||
// FIXME: put component addition into extra callable function, to be called
|
||||
// by game.go in a level-loop. Also remove components of previous level
|
||||
func NewGrid(game *Game, tilesize int, mapslice map[image.Point]*assets.Tile) *Grid {
|
||||
// we use this to turn our tiles into iterable entities, used for
|
||||
// collision detection, transformation and other things
|
||||
playermapper := generic.NewMap4[
|
||||
components.Position,
|
||||
components.Velocity,
|
||||
components.Renderable,
|
||||
components.Player](game.World)
|
||||
|
||||
solidmapper := generic.NewMap4[
|
||||
components.Position,
|
||||
components.Renderable,
|
||||
components.Tilish,
|
||||
components.Solid](game.World)
|
||||
|
||||
emptymapper := generic.NewMap2[components.Position, components.Tilish](game.World)
|
||||
|
||||
colmapper := generic.NewMap3[
|
||||
components.Position,
|
||||
components.Renderable,
|
||||
components.Collectible](game.World)
|
||||
|
||||
ptmapper := generic.NewMap2[
|
||||
components.Position,
|
||||
components.Particle,
|
||||
](game.World)
|
||||
|
||||
var pos *components.Position
|
||||
var render *components.Renderable
|
||||
|
||||
for point, tile := range mapslice {
|
||||
switch tile.Renderable {
|
||||
case true:
|
||||
switch {
|
||||
case tile.Solid:
|
||||
entity := solidmapper.New()
|
||||
pos, render, _, _ = solidmapper.Get(entity)
|
||||
case tile.Player:
|
||||
entity := playermapper.New()
|
||||
pos, _, render, _ = playermapper.Get(entity)
|
||||
fmt.Printf("player start pos: %d,%d\n", point.X*tilesize, point.Y*tilesize)
|
||||
case tile.Collectible:
|
||||
entity := colmapper.New()
|
||||
pos, render, _ = colmapper.Get(entity)
|
||||
default:
|
||||
log.Fatalln("unsupported tile type encountered")
|
||||
}
|
||||
|
||||
render.Image = tile.Sprite
|
||||
|
||||
default:
|
||||
// empty cell, this is where the player[s] move. No
|
||||
// sprite required since every level has a background
|
||||
// image.
|
||||
entity := emptymapper.New()
|
||||
pos, _ = emptymapper.Get(entity)
|
||||
}
|
||||
|
||||
// however, every tile has a position
|
||||
pos.Update(point.X*tilesize, point.Y*tilesize, tilesize)
|
||||
}
|
||||
|
||||
// not part of the grid, but add them as well
|
||||
entity := ptmapper.New()
|
||||
_, particle := ptmapper.Get(entity)
|
||||
particle.Index = assets.Tiles['*'].Particle
|
||||
particle.Particles = assets.Tiles['*'].Particles
|
||||
|
||||
return &Grid{
|
||||
Size: len(mapslice),
|
||||
Tilesize: tilesize,
|
||||
Width: game.ScreenWidth,
|
||||
Height: game.ScreenHeight,
|
||||
TilesX: game.ScreenWidth / tilesize,
|
||||
TilesY: game.ScreenHeight / tilesize,
|
||||
Map: mapslice,
|
||||
}
|
||||
}
|
||||
|
||||
func (grid *Grid) GetSolidNeighborPosition(
|
||||
position *components.Position,
|
||||
velocity *components.Velocity,
|
||||
solid bool) (bool, *components.Position) {
|
||||
|
||||
if !solid {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
// set to true, ifwe are already on the last tile in the current
|
||||
// direction, i.e. on the edge of the grid
|
||||
edge := true
|
||||
neighborpos := position.Point()
|
||||
|
||||
switch velocity.Direction {
|
||||
case East:
|
||||
if neighborpos.X < grid.TilesX {
|
||||
neighborpos.X++
|
||||
edge = false
|
||||
}
|
||||
case West:
|
||||
if neighborpos.X > 0 {
|
||||
neighborpos.X--
|
||||
edge = false
|
||||
}
|
||||
case South:
|
||||
if neighborpos.Y < grid.TilesY {
|
||||
neighborpos.Y++
|
||||
edge = false
|
||||
}
|
||||
case North:
|
||||
if neighborpos.Y > 0 {
|
||||
neighborpos.Y--
|
||||
edge = false
|
||||
}
|
||||
}
|
||||
|
||||
newpos := components.NewPosition(neighborpos, grid.Tilesize)
|
||||
repr.Println(newpos)
|
||||
|
||||
if !edge && grid.Map[neighborpos].Solid {
|
||||
return true, newpos
|
||||
}
|
||||
|
||||
return false, nil
|
||||
}
|
||||
|
||||
func (grid *Grid) BumpEdge(
|
||||
pos *components.Position,
|
||||
velocity *components.Velocity) (bool, *components.Position) {
|
||||
|
||||
x := pos.X + velocity.Data.X
|
||||
y := pos.Y + velocity.Data.Y
|
||||
|
||||
if x < 0 || x > grid.Width-grid.Tilesize || y < 0 || y > grid.Height-grid.Tilesize {
|
||||
newpos := &components.Position{}
|
||||
X := pos.X
|
||||
Y := pos.Y
|
||||
|
||||
switch velocity.Direction {
|
||||
case East:
|
||||
X = 0
|
||||
fmt.Println("east X=0")
|
||||
case West:
|
||||
X = grid.Width - grid.Tilesize
|
||||
fmt.Println("west X=max")
|
||||
case South:
|
||||
Y = 0
|
||||
fmt.Println("south y=0")
|
||||
case North:
|
||||
Y = grid.Height - grid.Tilesize
|
||||
fmt.Println("north y=max")
|
||||
}
|
||||
|
||||
newpos.Update(X, Y, grid.Tilesize)
|
||||
return true, newpos
|
||||
}
|
||||
|
||||
return false, nil
|
||||
}
|
||||
237
game/levels.go
237
game/levels.go
@@ -1,60 +1,35 @@
|
||||
package game
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"image"
|
||||
"image/draw"
|
||||
"log"
|
||||
"openquell/assets"
|
||||
"openquell/components"
|
||||
. "openquell/config"
|
||||
"openquell/grid"
|
||||
"openquell/systems"
|
||||
"strings"
|
||||
|
||||
"github.com/hajimehoshi/ebiten/v2"
|
||||
"github.com/mlange-42/arche/ecs"
|
||||
"github.com/mlange-42/arche/filter"
|
||||
)
|
||||
|
||||
type Level struct {
|
||||
Grid *Grid
|
||||
Cellsize, Width, Height int
|
||||
World *ecs.World
|
||||
Name string
|
||||
Description string
|
||||
Background *ebiten.Image
|
||||
Mapslice map[image.Point]*assets.Tile
|
||||
UseCache bool
|
||||
Cache *ebiten.Image
|
||||
Selector map[string]ecs.Mask
|
||||
Component map[string]ecs.ID
|
||||
|
||||
Player *systems.PlayerSystem
|
||||
GridSystem *systems.GridSystem
|
||||
|
||||
Grid *grid.Grid
|
||||
}
|
||||
|
||||
func NewLevel(game *Game, cellsize int, plan *assets.RawLevel) *Level {
|
||||
cache := ebiten.NewImage(game.ScreenWidth, game.ScreenHeight)
|
||||
|
||||
positionid := ecs.ComponentID[components.Position](game.World)
|
||||
velocityid := ecs.ComponentID[components.Velocity](game.World)
|
||||
playerid := ecs.ComponentID[components.Player](game.World)
|
||||
colid := ecs.ComponentID[components.Collectible](game.World)
|
||||
ptid := ecs.ComponentID[components.Particle](game.World)
|
||||
sid := ecs.ComponentID[components.Solid](game.World)
|
||||
renderid := ecs.ComponentID[components.Renderable](game.World)
|
||||
|
||||
selectors := map[string]ecs.Mask{}
|
||||
selectors["player"] = filter.All(positionid, velocityid, playerid)
|
||||
selectors["tile"] = filter.All(renderid, positionid, sid)
|
||||
selectors["movable"] = filter.All(renderid, positionid)
|
||||
selectors["collectible"] = filter.All(positionid, colid)
|
||||
selectors["particle"] = filter.All(positionid, ptid)
|
||||
|
||||
components := map[string]ecs.ID{}
|
||||
components["position"] = positionid
|
||||
components["velocity"] = velocityid
|
||||
components["player"] = playerid
|
||||
components["collectible"] = colid
|
||||
components["particle"] = ptid
|
||||
components["solid"] = sid
|
||||
components["renderable"] = renderid
|
||||
gridsystem := systems.NewGridSystem(game.World, game.ScreenWidth,
|
||||
game.ScreenHeight, cellsize, plan.Background)
|
||||
playersystem := systems.NewPlayerSystem(game.World, gridsystem)
|
||||
|
||||
return &Level{
|
||||
Mapslice: LevelToSlice(game, plan, cellsize),
|
||||
@@ -63,109 +38,19 @@ func NewLevel(game *Game, cellsize int, plan *assets.RawLevel) *Level {
|
||||
Width: game.ScreenWidth,
|
||||
Height: game.ScreenHeight,
|
||||
Description: plan.Description,
|
||||
Background: plan.Background,
|
||||
UseCache: false,
|
||||
Cache: cache,
|
||||
Selector: selectors,
|
||||
Component: components,
|
||||
GridSystem: gridsystem,
|
||||
Player: playersystem,
|
||||
}
|
||||
}
|
||||
|
||||
func (level *Level) Update() {
|
||||
query := level.World.Query(level.Selector["player"])
|
||||
|
||||
toRemove := []ecs.Entity{}
|
||||
particle_pos := image.Point{}
|
||||
|
||||
for query.Next() {
|
||||
playerposition := (*components.Position)(query.Get(level.Component["position"]))
|
||||
velocity := (*components.Velocity)(query.Get(level.Component["velocity"]))
|
||||
|
||||
if !velocity.Moving() {
|
||||
switch {
|
||||
case ebiten.IsKeyPressed(ebiten.KeyRight):
|
||||
velocity.Change(East)
|
||||
case ebiten.IsKeyPressed(ebiten.KeyLeft):
|
||||
velocity.Change(West)
|
||||
case ebiten.IsKeyPressed(ebiten.KeyDown):
|
||||
velocity.Change(South)
|
||||
case ebiten.IsKeyPressed(ebiten.KeyUp):
|
||||
velocity.Change(North)
|
||||
// other keys: <tab>: switch player, etc
|
||||
}
|
||||
}
|
||||
|
||||
if velocity.Moving() {
|
||||
ok, newpos := level.Grid.BumpEdge(playerposition, velocity)
|
||||
if ok {
|
||||
fmt.Printf("falling off the edge, new pos: %v\n", newpos)
|
||||
playerposition.Set(newpos)
|
||||
} else {
|
||||
ok, tilepos := level.Grid.GetSolidNeighborPosition(playerposition, velocity, true)
|
||||
if ok {
|
||||
intersects, newpos := tilepos.Intersects(playerposition, velocity)
|
||||
if intersects {
|
||||
fmt.Printf("collision detected. tile: %s\n", tilepos)
|
||||
fmt.Printf(" player: %s\n", playerposition)
|
||||
fmt.Printf(" new: %s\n", newpos)
|
||||
|
||||
playerposition.Set(newpos)
|
||||
fmt.Printf(" player new: %s\n", playerposition)
|
||||
velocity.Change(Stop)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
colquery := level.World.Query(level.Selector["collectible"])
|
||||
for colquery.Next() {
|
||||
collectible := (*components.Collectible)(colquery.Get(level.Component["collectible"]))
|
||||
colposition := (*components.Position)(colquery.Get(level.Component["position"]))
|
||||
ok, _ := playerposition.Intersects(colposition, velocity)
|
||||
if ok {
|
||||
fmt.Printf("bumped into collectible %v\n", collectible)
|
||||
toRemove = append(toRemove, colquery.Entity())
|
||||
particle_pos.X = colposition.X
|
||||
particle_pos.Y = colposition.Y
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
playerposition.Move(velocity)
|
||||
}
|
||||
|
||||
// remove collectible if collected
|
||||
for _, entity := range toRemove {
|
||||
// FIXME: or keep them and prepare an animated death
|
||||
level.World.RemoveEntity(entity)
|
||||
}
|
||||
|
||||
// display debris after collecting
|
||||
ptquery := level.World.Query(level.Selector["particle"])
|
||||
for ptquery.Next() {
|
||||
// we loop, but it's only one anyway
|
||||
particle := (*components.Particle)(ptquery.Get(level.Component["particle"]))
|
||||
colposition := (*components.Position)(ptquery.Get(level.Component["position"]))
|
||||
|
||||
if len(toRemove) > 0 {
|
||||
// particle appears
|
||||
colposition.Update(
|
||||
particle_pos.X-(level.Cellsize/2),
|
||||
particle_pos.Y-(level.Cellsize/2),
|
||||
64,
|
||||
)
|
||||
|
||||
particle.Index = 0 // start displaying the particle
|
||||
} else {
|
||||
switch {
|
||||
case particle.Index > -1 && particle.Index < len(particle.Particles)-1:
|
||||
particle.Index++
|
||||
default:
|
||||
// last sprite reached, remove it
|
||||
particle.Index = -1
|
||||
}
|
||||
}
|
||||
}
|
||||
level.GridSystem.Update()
|
||||
level.Player.Update()
|
||||
}
|
||||
|
||||
func (level *Level) Draw(screen *ebiten.Image) {
|
||||
level.GridSystem.Draw(screen)
|
||||
level.Player.Draw(screen)
|
||||
}
|
||||
|
||||
func (level *Level) Position2Point(position *components.Position) image.Point {
|
||||
@@ -175,90 +60,6 @@ func (level *Level) Position2Point(position *components.Position) image.Point {
|
||||
}
|
||||
}
|
||||
|
||||
// return the tile the moving object would end up on if indeed moving
|
||||
func (level *Level) GetTile(
|
||||
position *components.Position,
|
||||
velocity *components.Velocity) *assets.Tile {
|
||||
|
||||
newpoint := image.Point{
|
||||
int(position.X+velocity.Data.X) / level.Cellsize,
|
||||
int(position.Y+velocity.Data.Y) / level.Cellsize,
|
||||
}
|
||||
|
||||
tile := level.Mapslice[newpoint]
|
||||
return tile
|
||||
}
|
||||
|
||||
func (level *Level) Draw(screen *ebiten.Image) {
|
||||
level.DrawTiles(screen)
|
||||
level.DrawMovables(screen)
|
||||
level.DrawParticles(screen)
|
||||
}
|
||||
|
||||
func (level *Level) DrawTiles(screen *ebiten.Image) {
|
||||
op := &ebiten.DrawImageOptions{}
|
||||
|
||||
if !level.UseCache {
|
||||
// map not cached or cacheable, write it to the cache
|
||||
draw.Draw(level.Cache, level.Background.Bounds(), level.Background, image.ZP, draw.Src)
|
||||
|
||||
query := level.World.Query(level.Selector["tile"])
|
||||
for query.Next() {
|
||||
pos := (*components.Position)(query.Get(level.Component["position"]))
|
||||
sprite := (*components.Renderable)(query.Get(level.Component["renderable"]))
|
||||
|
||||
draw.Draw(
|
||||
level.Cache,
|
||||
image.Rect(pos.X, pos.Y, pos.X+pos.Cellsize, pos.Y+pos.Cellsize),
|
||||
sprite.Image, image.ZP, draw.Over)
|
||||
}
|
||||
|
||||
op.GeoM.Reset()
|
||||
screen.DrawImage(level.Cache, op)
|
||||
|
||||
level.UseCache = true
|
||||
} else {
|
||||
// use the cached map
|
||||
op.GeoM.Reset()
|
||||
screen.DrawImage(level.Cache, op)
|
||||
}
|
||||
}
|
||||
|
||||
func (level *Level) DrawMovables(screen *ebiten.Image) {
|
||||
// write the movable tiles
|
||||
op := &ebiten.DrawImageOptions{}
|
||||
selector := level.Selector["movable"].Without(level.Component["solid"])
|
||||
query := level.World.Query(&selector)
|
||||
|
||||
for query.Next() {
|
||||
pos := (*components.Position)(query.Get(level.Component["position"]))
|
||||
sprite := (*components.Renderable)(query.Get(level.Component["renderable"]))
|
||||
|
||||
op.GeoM.Reset()
|
||||
op.GeoM.Translate(float64(pos.X), float64(pos.Y))
|
||||
|
||||
screen.DrawImage(sprite.Image, op)
|
||||
}
|
||||
}
|
||||
|
||||
func (level *Level) DrawParticles(screen *ebiten.Image) {
|
||||
// write particles (these are no tiles!)
|
||||
op := &ebiten.DrawImageOptions{}
|
||||
query := level.World.Query(level.Selector["particle"])
|
||||
|
||||
for query.Next() {
|
||||
pos := (*components.Position)(query.Get(level.Component["position"]))
|
||||
particle := (*components.Particle)(query.Get(level.Component["particle"]))
|
||||
|
||||
if particle.Index > -1 {
|
||||
op.GeoM.Reset()
|
||||
op.GeoM.Translate(float64(pos.X), float64(pos.Y))
|
||||
screen.DrawImage(particle.Particles[particle.Index], op)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func (level *Level) SetupGrid(game *Game) {
|
||||
// generic variant does not work here:
|
||||
// selector := generic.NewFilter1[components.Position]()
|
||||
@@ -271,7 +72,7 @@ func (level *Level) SetupGrid(game *Game) {
|
||||
level.World.Batch().RemoveEntities(selector)
|
||||
|
||||
// setup world
|
||||
level.Grid = NewGrid(game, level.Cellsize, level.Mapslice)
|
||||
level.GridSystem.SetGrid(grid.NewGrid(game.World, level.Cellsize, level.Width, level.Height, level.Mapslice))
|
||||
}
|
||||
|
||||
func LevelToSlice(game *Game, level *assets.RawLevel, tilesize int) map[image.Point]*assets.Tile {
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
package game
|
||||
|
||||
import (
|
||||
"image"
|
||||
. "openquell/components"
|
||||
|
||||
"github.com/mlange-42/arche/ecs"
|
||||
"github.com/mlange-42/arche/generic"
|
||||
)
|
||||
|
||||
type ParticleSystem struct {
|
||||
World *ecs.World
|
||||
Selector *generic.Filter2[Position, Particle]
|
||||
Cellsize int
|
||||
}
|
||||
|
||||
func NewParticleSystem(world *ecs.World) *ParticleSystem {
|
||||
system := &ParticleSystem{
|
||||
Selector: generic.NewFilter2[Position, Particle](),
|
||||
}
|
||||
|
||||
return system
|
||||
}
|
||||
|
||||
func (system *ParticleSystem) Update(detonate bool, position *image.Point) {
|
||||
// display debris after collecting
|
||||
query := system.Selector.Query(system.World)
|
||||
|
||||
for query.Next() {
|
||||
// we loop, but it's only one anyway
|
||||
ptposition, particle := query.Get()
|
||||
|
||||
if detonate {
|
||||
// particle appears
|
||||
ptposition.Update(
|
||||
position.X-(system.Cellsize/2),
|
||||
position.Y-(system.Cellsize/2),
|
||||
64,
|
||||
)
|
||||
|
||||
particle.Index = 0 // start displaying the particle
|
||||
} else {
|
||||
switch {
|
||||
// particle shows from earlier tick, animate
|
||||
case particle.Index > -1 && particle.Index < len(particle.Particles)-1:
|
||||
particle.Index++
|
||||
default:
|
||||
// last sprite reached, remove it
|
||||
particle.Index = -1
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,83 +0,0 @@
|
||||
package game
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"image"
|
||||
. "openquell/components"
|
||||
. "openquell/config"
|
||||
|
||||
"github.com/hajimehoshi/ebiten/v2"
|
||||
"github.com/mlange-42/arche/ecs"
|
||||
"github.com/mlange-42/arche/generic"
|
||||
)
|
||||
|
||||
type PlayerSystem struct {
|
||||
World *ecs.World
|
||||
Grid *Grid
|
||||
Selector *generic.Filter3[Position, Velocity, Player]
|
||||
Particle *ParticleSystem
|
||||
Collectible *CollectibleSystem
|
||||
}
|
||||
|
||||
func NewPlayerSystem(world *ecs.World) *PlayerSystem {
|
||||
|
||||
system := &PlayerSystem{
|
||||
Selector: generic.NewFilter3[Position, Velocity, Player](),
|
||||
}
|
||||
|
||||
return system
|
||||
}
|
||||
|
||||
func (system PlayerSystem) Update() error {
|
||||
query := system.Selector.Query(system.World)
|
||||
|
||||
var bumped bool
|
||||
var particle_pos image.Point
|
||||
|
||||
for query.Next() {
|
||||
playerposition, velocity, _ := query.Get()
|
||||
|
||||
if !velocity.Moving() {
|
||||
switch {
|
||||
case ebiten.IsKeyPressed(ebiten.KeyRight):
|
||||
velocity.Change(East)
|
||||
case ebiten.IsKeyPressed(ebiten.KeyLeft):
|
||||
velocity.Change(West)
|
||||
case ebiten.IsKeyPressed(ebiten.KeyDown):
|
||||
velocity.Change(South)
|
||||
case ebiten.IsKeyPressed(ebiten.KeyUp):
|
||||
velocity.Change(North)
|
||||
// other keys: <tab>: switch player, etc
|
||||
}
|
||||
}
|
||||
|
||||
if velocity.Moving() {
|
||||
ok, newpos := system.Grid.BumpEdge(playerposition, velocity)
|
||||
if ok {
|
||||
fmt.Printf("falling off the edge, new pos: %v\n", newpos)
|
||||
playerposition.Set(newpos)
|
||||
} else {
|
||||
ok, tilepos := system.Grid.GetSolidNeighborPosition(playerposition, velocity, true)
|
||||
if ok {
|
||||
intersects, newpos := tilepos.Intersects(playerposition, velocity)
|
||||
if intersects {
|
||||
fmt.Printf("collision detected. tile: %s\n", tilepos)
|
||||
fmt.Printf(" player: %s\n", playerposition)
|
||||
fmt.Printf(" new: %s\n", newpos)
|
||||
|
||||
playerposition.Set(newpos)
|
||||
fmt.Printf(" player new: %s\n", playerposition)
|
||||
velocity.Change(Stop)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bumped, particle_pos = system.Collectible.CheckPlayerCollision(playerposition, velocity)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
system.Particle.Update(bumped, &particle_pos)
|
||||
|
||||
return nil
|
||||
}
|
||||
Reference in New Issue
Block a user