Fixed the problem! Fov works now
This commit is contained in:
parent
8bbf6c4ff5
commit
eea1fa9388
5
fov.go
5
fov.go
|
@ -2,6 +2,7 @@ package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"steel/mapping"
|
"steel/mapping"
|
||||||
|
|
||||||
"github.com/kettek/goro/fov"
|
"github.com/kettek/goro/fov"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -18,6 +19,6 @@ func InitializeFoV(g *mapping.GameMap) fov.Map {
|
||||||
return fovMap
|
return fovMap
|
||||||
}
|
}
|
||||||
|
|
||||||
func RecomputeFov(fovMap fov.Map, centerX, centerY int, radius int, fov.Light) {
|
func RecomputeFov(fovMap fov.Map, centerX, centerY int, radius int, fovLight fov.Light) {
|
||||||
fovMap.Recompute(centerX, centerY, radius, light)
|
fovMap.Recompute(centerX, centerY, radius, fovLight)
|
||||||
}
|
}
|
||||||
|
|
12
main.go
12
main.go
|
@ -1,13 +1,12 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/kettek/goro"
|
|
||||||
"github.com/kettek/goro-game/entity"
|
|
||||||
"github.com/kettek/goro-game/mapping"
|
|
||||||
"github.com/kettek/goro/fov"
|
|
||||||
"log"
|
"log"
|
||||||
"steel/entity"
|
"steel/entity"
|
||||||
"steel/mapping"
|
"steel/mapping"
|
||||||
|
|
||||||
|
"github.com/kettek/goro"
|
||||||
|
"github.com/kettek/goro/fov"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
@ -39,7 +38,7 @@ func main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
player := entity.NewEntity(screen.Columns/2, screen.Rows/2+5, '@', goro.Style{Foreground: goro.ColorWhite})
|
player := entity.NewEntity(screen.Columns/2, screen.Rows/2+5, '@', goro.Style{Foreground: goro.ColorWhite})
|
||||||
npc := entity.NewEntity(screen.Columns/2-5, screen. Rows/2, '@', goro.Style{Foreground: goro.ColorYellow})
|
npc := entity.NewEntity(screen.Columns/2-5, screen.Rows/2, '@', goro.Style{Foreground: goro.ColorYellow})
|
||||||
|
|
||||||
entities := []*entity.Entity{
|
entities := []*entity.Entity{
|
||||||
player,
|
player,
|
||||||
|
@ -60,7 +59,7 @@ func main() {
|
||||||
for {
|
for {
|
||||||
|
|
||||||
if fovRecompute {
|
if fovRecompute {
|
||||||
RecomputeFoV(fovMap, player.X, player.Y, fovRadius, fov.Light{})
|
RecomputeFov(fovMap, player.X, player.Y, fovRadius, fov.Light{})
|
||||||
}
|
}
|
||||||
|
|
||||||
// Draw screen.
|
// Draw screen.
|
||||||
|
@ -77,6 +76,7 @@ func main() {
|
||||||
case ActionMove:
|
case ActionMove:
|
||||||
if !gameMap.IsBlocked(player.X+action.X, player.Y+action.Y) {
|
if !gameMap.IsBlocked(player.X+action.X, player.Y+action.Y) {
|
||||||
player.Move(action.X, action.Y)
|
player.Move(action.X, action.Y)
|
||||||
|
fovRecompute = true
|
||||||
}
|
}
|
||||||
case ActionQuit:
|
case ActionQuit:
|
||||||
goro.Quit()
|
goro.Quit()
|
||||||
|
|
12
render.go
12
render.go
|
@ -31,17 +31,17 @@ func DrawAll(screen *goro.Screen, entities []*entity.Entity, gameMap mapping.Gam
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Draw all the entities in the game map.
|
// Draw all the entities in the game map.
|
||||||
for_, entity := range entities {
|
for _, entity := range entities {
|
||||||
DrawEntity(screen, entity)
|
DrawEntity(screen, entity)
|
||||||
}
|
}
|
||||||
screen.Flush()
|
screen.Flush()
|
||||||
}
|
}
|
||||||
|
|
||||||
// ClearAll clears all entities from the screen.
|
// ClearAll clears all entities from the screen.
|
||||||
func ClearAll(screen *goro.Screen, entities[]*entity.Entity) {
|
func ClearAll(screen *goro.Screen, entities []*entity.Entity) {
|
||||||
for _, entity := range entities {
|
for _, entity := range entities {
|
||||||
ClearEntity(screen, entity)
|
ClearEntity(screen, entity)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user