refactor level, getting to tiles
This commit is contained in:
anton.gurov
parent
e0bab00a23
commit
c372670953
189
cmd/game/main.go
189
cmd/game/main.go
@ -14,6 +14,8 @@ import (
|
||||
"time"
|
||||
)
|
||||
|
||||
var modifiers = []int{blt.TK_SHIFT, blt.TK_ALT, blt.TK_CONTROL}
|
||||
|
||||
// Рецепт чтобы убежать от [fatal] 'refresh' was not called from the main thread
|
||||
// https://github.com/golang/go/wiki/LockOSThread
|
||||
func init() {
|
||||
@ -23,14 +25,37 @@ func init() {
|
||||
type GameState struct {
|
||||
mainfunc chan func()
|
||||
exit chan struct{}
|
||||
//input chan string
|
||||
input chan string
|
||||
rawInput chan int
|
||||
}
|
||||
|
||||
// do runs f on the main thread.
|
||||
func (*GameState) Do(f func()) {
|
||||
done := make(chan struct{}, 1)
|
||||
State.mainfunc <- func() {
|
||||
f()
|
||||
done <- struct{}{}
|
||||
}
|
||||
<-done
|
||||
}
|
||||
|
||||
//we can run logic in separate goroutines
|
||||
//
|
||||
// go doSometing(State,...)
|
||||
//
|
||||
//and there we go like this:
|
||||
// func doSomething(State main.GameState, args...) {
|
||||
// ...
|
||||
// State.Do(func() {
|
||||
// ...do stuff in main thread
|
||||
// })
|
||||
// ...
|
||||
// }
|
||||
|
||||
var State = GameState{
|
||||
mainfunc: make(chan func()),
|
||||
exit: make(chan struct{}, 1),
|
||||
//input: make(chan string, 5),
|
||||
input: make(chan string, 1),
|
||||
rawInput: make(chan int, 1),
|
||||
}
|
||||
|
||||
@ -45,110 +70,60 @@ func main() {
|
||||
mw := mainwindow.Init(mainCtx)
|
||||
defer mw.Close()
|
||||
|
||||
//we can run logic in separate goroutines
|
||||
go mainLoop(mainCtx)
|
||||
setupLayers(mw)
|
||||
|
||||
level := gamemap.NewLevel(mainCtx, "test", 1)
|
||||
level = mapgens.DefaultGen(level)
|
||||
vp := mainwindow.NewViewPort(40, 0, 60, 47, level, mw.GetLayer("base"))
|
||||
vp.Render()
|
||||
|
||||
go handleInput(mainCtx, mw.GetLayer("base"))
|
||||
|
||||
//but every call to bearlibterminal must be wrapped to closure and passed to mainfunc
|
||||
var exit = false
|
||||
for !exit {
|
||||
|
||||
select {
|
||||
case f := <-State.mainfunc:
|
||||
f()
|
||||
case State.rawInput <- ui.ReadKeyCode():
|
||||
break
|
||||
case pressed := <-State.input:
|
||||
mw.GetLayer("base").ClearArea(0, 3, 40, 1)
|
||||
mw.GetLayer("base").Print(1, 3, "Key: "+pressed)
|
||||
mw.GetLayer("base").Print(1, 6, "█")
|
||||
break
|
||||
//case f := <-State.mainfunc:
|
||||
// f()
|
||||
// break
|
||||
case <-State.exit:
|
||||
mainCtx.Logger().Warn().Msg("quitting NOW")
|
||||
exit = true
|
||||
break
|
||||
// не оставляйте default в бесконесчном select {} - сожрет всё CPU
|
||||
default:
|
||||
vp.Render()
|
||||
blt.Refresh()
|
||||
}
|
||||
|
||||
}
|
||||
mainCtx.Logger().Info().Msg("pre-shutdown sequence")
|
||||
}
|
||||
|
||||
// do runs f on the main thread.
|
||||
func (*GameState) Do(f func()) {
|
||||
done := make(chan struct{}, 1)
|
||||
State.mainfunc <- func() {
|
||||
f()
|
||||
done <- struct{}{}
|
||||
}
|
||||
<-done
|
||||
func setupLayers(mainwindow *mainwindow.MainWindow) {
|
||||
mainwindow.AddLayer("base", 0, "white")
|
||||
mainwindow.AddLayer("overlay", 1, "white")
|
||||
mainwindow.AddLayer("menu", 2, "white")
|
||||
}
|
||||
|
||||
func mainLoop(ctx util.ClientCtx) {
|
||||
|
||||
baseLayer := mainwindow.AddLayer(0, "white")
|
||||
//bgLayer := mainwindow.AddLayer(1, "white")
|
||||
//menuLayer := mainwindow.AddLayer(2, "white")
|
||||
|
||||
// initRender := func() {
|
||||
// //fixme!!
|
||||
// baseLayer.WithColor("white").NewWindow(3, 0, 17, 6).NoBorder()
|
||||
// baseLayer.WithColor("grey").NewWindow(22, 0, 38, 6).Splash()
|
||||
// baseLayer.WithColor("blue").NewWindow(3, 8, 57, 6).NoBorder()
|
||||
// menuLayer.WithColor("#99de7c26").NewWindow(50, 1, 10, 10).Splash()
|
||||
// menuLayer.WithColor("#aa26edca").NewWindow(0, 5, 40, 20).DoubleBordered("Testing with long title")
|
||||
// blt.PrintExt(1, 6, 40, 19, 1, `Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Odio morbi quis commodo odio aenean sed. Egestas sed sed risus pretium quam vulputate dignissim suspendisse in. Viverra nam libero justo laoreet sit amet cursus sit. Sed egestas egestas fringilla phasellus faucibus. Ultrices neque ornare aenean euismod elementum nisi quis eleifend. Eget lorem dolor sed viverra ipsum nunc aliquet bibendum. Egestas maecenas pharetra convallis posuere morbi. In hac habitasse platea dictumst quisque. Aenean vel elit scelerisque mauris pellentesque pulvinar.
|
||||
//
|
||||
//Enim diam vulputate ut pharetra sit amet. Vestibulum mattis ullamcorper velit sed. Ultrices dui sapien eget mi. Phasellus vestibulum lorem sed risus ultricies tristique. Dignissim sodales ut eu sem integer vitae. Donec massa sapien faucibus et molestie ac. Turpis nunc eget lorem dolor sed viverra ipsum. Lectus urna duis convallis convallis tellus id interdum velit. Neque vitae tempus quam pellentesque nec nam aliquam. Ornare suspendisse sed nisi lacus sed viverra tellus in hac. Orci a scelerisque purus semper eget duis at tellus. Est ullamcorper eget nulla facilisi etiam dignissim diam. Ipsum dolor sit amet consectetur adipiscing elit. Sed egestas egestas fringilla phasellus. Eget velit aliquet sagittis id consectetur purus ut faucibus pulvinar. Malesuada fames ac turpis egestas maecenas pharetra convallis posuere morbi. Pretium quam vulputate dignissim suspendisse in est. Sit amet tellus cras adipiscing. Viverra accumsan in nisl nisi scelerisque.
|
||||
//
|
||||
//Lorem mollis aliquam ut porttitor leo a diam sollicitudin tempor. Convallis tellus id interdum velit. Enim nunc faucibus a pellentesque. Tincidunt augue interdum velit euismod in pellentesque massa placerat duis. Leo duis ut diam quam nulla porttitor massa id. Eu feugiat pretium nibh ipsum consequat nisl. Eget est lorem ipsum dolor sit amet. Et sollicitudin ac orci phasellus egestas. Donec adipiscing tristique risus nec. Et molestie ac feugiat sed. Ante in nibh mauris cursus mattis molestie a iaculis at. Neque laoreet suspendisse interdum consectetur. Vitae et leo duis ut diam quam nulla. Sed ullamcorper morbi tincidunt ornare massa eget egestas purus viverra. Ornare lectus sit amet est placerat in egestas erat.
|
||||
//
|
||||
//Cursus in hac habitasse platea. Aliquet risus feugiat in ante metus dictum. Maecenas sed enim ut sem viverra aliquet eget sit. Vitae aliquet nec ullamcorper sit amet risus nullam. Scelerisque fermentum dui faucibus in ornare quam viverra orci sagittis. Sed tempus urna et pharetra pharetra massa massa ultricies. Est ultricies integer quis auctor. Volutpat est velit egestas dui id ornare arcu. Eget nunc lobortis mattis aliquam faucibus purus. Erat nam at lectus urna duis.
|
||||
//
|
||||
//Sed euismod nisi porta lorem mollis aliquam ut porttitor leo. Ut tellus elementum sagittis vitae et leo duis ut diam. Elementum curabitur vitae nunc sed velit dignissim. Auctor elit sed vulputate mi sit. Consectetur adipiscing elit ut aliquam purus. Feugiat vivamus at augue eget arcu. Duis ut diam quam nulla porttitor massa id neque. Pharetra magna ac placerat vestibulum lectus mauris ultrices. Non sodales neque sodales ut etiam. Massa ultricies mi quis hendrerit dolor. Est sit amet facilisis magna etiam. Ornare suspendisse sed nisi lacus sed viverra tellus in.
|
||||
//`)
|
||||
//
|
||||
// menuLayer.WithColor("red").PutWithBackground(20, 40, "Ы", "#aa1257d4")
|
||||
// menuLayer.WithColor("white").PutWithBackground(21, 40, "Щ", "#cd31ed12")
|
||||
// menuLayer.WithColor("yellow").PutWithBackground(22, 40, "Ц", "#efcccccc")
|
||||
//
|
||||
// menuLayer.WithColor("red").PutWithBackground(39, 1, "Ы", "#aa1257d4")
|
||||
// menuLayer.WithColor("white").PutWithBackground(40, 1, "Щ", "#cd31ed12")
|
||||
// menuLayer.WithColor("yellow").PutWithBackground(41, 1, "Ц", "#efcccccc")
|
||||
//
|
||||
// //bgLayer.WithColor("#cc242424").NewWindow(45, 5, 40, 40).Splash()
|
||||
// //menuLayer.WithColor("#ffdede89").NewWindow(45, 5, 40, 40).DoubleBordered("Transparent BG window test")
|
||||
// //blt.PrintExt(46, 6, 40, 39, 1, `Lorem mollis aliquam ut porttitor leo a diam sollicitudin tempor. Convallis tellus id interdum velit. Enim nunc faucibus a pellentesque. Tincidunt augue interdum velit euismod in pellentesque massa placerat duis. Leo duis ut diam quam nulla porttitor massa id. Eu feugiat pretium nibh ipsum consequat nisl. Eget est lorem ipsum dolor sit amet. Et sollicitudin ac orci phasellus egestas. Donec adipiscing tristique risus nec. Et molestie ac feugiat sed. Ante in nibh mauris cursus mattis molestie a iaculis at. Neque laoreet suspendisse interdum consectetur. Vitae et leo duis ut diam quam nulla. Sed ullamcorper morbi tincidunt ornare massa eget egestas purus viverra. Ornare lectus sit amet est placerat in egestas erat.
|
||||
////
|
||||
////Cursus in hac habitasse platea. Aliquet risus feugiat in ante metus dictum. Maecenas sed enim ut sem viverra aliquet eget sit. [color=orange]Vitae[/color] aliquet nec ullamcorper sit amet risus nullam. Scelerisque fermentum dui faucibus in ornare quam viverra orci sagittis. Sed tempus urna et pharetra pharetra massa massa ultricies. Est ultricies integer quis auctor. Volutpat est velit egestas dui id ornare arcu. Eget nunc lobortis mattis aliquam faucibus purus. Erat nam at lectus urna duis.
|
||||
////
|
||||
////Sed euismod nisi porta lorem mollis aliquam ut porttitor leo. Ut tellus elementum sagittis vitae et leo duis ut diam. Elementum curabitur vitae nunc sed velit dignissim. Auctor elit sed vulputate mi sit. Consectetur adipiscing elit ut aliquam purus. Feugiat vivamus at augue eget arcu. Duis ut diam quam nulla porttitor massa id neque. Pharetra magna ac placerat vestibulum lectus mauris ultrices. Non sodales neque sodales ut etiam. Massa ultricies mi quis hendrerit dolor. Est sit amet facilisis magna etiam. Ornare suspendisse sed nisi lacus sed viverra tellus in.
|
||||
////`)
|
||||
//
|
||||
// baseLayer.Print(1, 1, "Hello, [font=bold]world[/font]!")
|
||||
// baseLayer.Print(1, 4, "Testing line-[color=orange]spacing[/color]")
|
||||
//
|
||||
// blt.Refresh()
|
||||
// }
|
||||
|
||||
//State.Do(initRender)
|
||||
|
||||
level := gamemap.NewLevel(ctx, "test", 1)
|
||||
level = mapgens.DefaultGen(level)
|
||||
vp := mainwindow.NewViewPort(40, 0, 60, 47, level, &baseLayer)
|
||||
State.Do(func() {
|
||||
vp.Render()
|
||||
})
|
||||
|
||||
d2, _ := time.ParseDuration("25ms")
|
||||
//
|
||||
//fpsTicker := time.NewTicker(d2)
|
||||
fpsCount := 0
|
||||
var modifiers = []int{blt.TK_SHIFT, blt.TK_ALT, blt.TK_CONTROL}
|
||||
|
||||
//main loop!
|
||||
for {
|
||||
// не оставляйте default в бесконесчном select {} - сожрет всё CPU
|
||||
startTick := time.Now()
|
||||
func handleInput(ctx util.ClientCtx, baseLayer *mainwindow.Layer) {
|
||||
var exit = false
|
||||
for !exit{
|
||||
select {
|
||||
case keycode := <-State.rawInput:
|
||||
if keycode == blt.TK_CLOSE {
|
||||
ctx.Logger().Warn().Msg("exiting on window close...")
|
||||
//State.exit <- struct{}{}
|
||||
ctx.Logger().Warn().Msg("...done")
|
||||
if keycode == blt.TK_NONE {
|
||||
continue
|
||||
}
|
||||
var pressed = ""
|
||||
var isModifier, _ = util.InArray(keycode, modifiers)
|
||||
var pressed= ""
|
||||
var isModifier, _= util.InArray(keycode, modifiers)
|
||||
if !isModifier {
|
||||
|
||||
pressed = ui.Scancodemap[keycode]
|
||||
@ -162,12 +137,11 @@ func mainLoop(ctx util.ClientCtx) {
|
||||
if blt.Check(blt.TK_CONTROL) != 0 {
|
||||
pressed = "Ctrl+" + pressed
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
switch pressed {
|
||||
//global hotkeys
|
||||
switch pressed {
|
||||
case "F10":
|
||||
State.Do(func(){
|
||||
State.Do(func() {
|
||||
blt.Set("window: size=100x47; font: ./resources/fonts-ttf/UbuntuMono-R.ttf, size=11;")
|
||||
})
|
||||
case "Ctrl+q":
|
||||
@ -176,43 +150,12 @@ func mainLoop(ctx util.ClientCtx) {
|
||||
ctx.Logger().Info().Msg("exiting on quit command...")
|
||||
State.exit <- struct{}{}
|
||||
ctx.Logger().Info().Msg("...done")
|
||||
exit = true
|
||||
return
|
||||
default:
|
||||
State.Do(func(){
|
||||
baseLayer.ClearArea(0, 3, 40, 1)
|
||||
baseLayer.Print(1, 3, "Key: "+ pressed)
|
||||
baseLayer.Print(1, 4, "█")
|
||||
})
|
||||
State.input <- pressed
|
||||
}
|
||||
default:
|
||||
|
||||
fpsCount++
|
||||
State.Do(func() {
|
||||
var _, keycode = ui.ReadKey()
|
||||
if keycode == blt.TK_NONE {
|
||||
return
|
||||
}
|
||||
State.rawInput <- keycode
|
||||
//time.Sleep(d2)
|
||||
})
|
||||
//animate terrain 5 times slower than fps
|
||||
if (fpsCount % 10) == 0 {
|
||||
State.Do(func() {
|
||||
vp.Render()
|
||||
})
|
||||
fpsCount = 0
|
||||
}
|
||||
|
||||
//update screen
|
||||
State.Do(func() {
|
||||
blt.Refresh()
|
||||
diff := d2.Nanoseconds() - time.Since(startTick).Nanoseconds()
|
||||
if diff > 0 {
|
||||
time.Sleep(time.Duration(diff / 2)) //Костыль для убирания 100% CPU
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
}
|
||||
ctx.Logger().Warn().Msg("and it continues")
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@ func (f *FieldOfVision) SetTorchRadius(radius int) {
|
||||
func (f *FieldOfVision) SetAllInvisible(level *gamemap.Level) {
|
||||
for x := 0; x < level.W; x++ {
|
||||
for y := 0; y < level.H; y++ {
|
||||
level.Tiles[x][y].Visible = false
|
||||
level.GetTileByXY(x,y).Visible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -57,7 +57,7 @@ func (f *FieldOfVision) RayCast(playerCoords types.Coords, level *gamemap.Level)
|
||||
y := float64(playerCoords.Y)
|
||||
|
||||
// Mark the players current position as explored
|
||||
tile := level.Tiles[playerCoords.X][playerCoords.Y]
|
||||
tile := level.GetTile(playerCoords) //[playerCoords.X][playerCoords.Y]
|
||||
tile.Explored = true
|
||||
tile.Visible = true
|
||||
|
||||
@ -73,12 +73,12 @@ func (f *FieldOfVision) RayCast(playerCoords types.Coords, level *gamemap.Level)
|
||||
break
|
||||
}
|
||||
|
||||
tile := level.Tiles[roundedX][roundedY]
|
||||
tile := level.GetTileByXY(roundedX, roundedY)
|
||||
|
||||
tile.Explored = true
|
||||
tile.Visible = true
|
||||
|
||||
if level.Tiles[roundedX][roundedY].BlocksSight == true {
|
||||
if level.GetTileByXY(roundedX, roundedY).BlocksSight == true {
|
||||
// The ray hit a wall, go no further
|
||||
break
|
||||
}
|
||||
|
||||
@ -192,7 +192,7 @@ func (ps *precomputedShade) recalc(level *gamemap.Level, initCoords types.Coords
|
||||
radius = ps.MaxTorchRadius //fixme
|
||||
}
|
||||
|
||||
level.Tiles[initCoords.X][initCoords.Y].Visible = true
|
||||
level.GetTile(initCoords).Visible = true
|
||||
|
||||
var fullShade = make([]byte, 360)
|
||||
for i := range fullShade {
|
||||
@ -226,7 +226,7 @@ func (ps *precomputedShade) recalc(level *gamemap.Level, initCoords types.Coords
|
||||
//fmt.Printf("\n level coords: %v", lc)
|
||||
for _, angle := range cell.occludedAngles {
|
||||
|
||||
if level.Tiles[lc.X][lc.Y].BlocksSight {
|
||||
if level.GetTile(lc).BlocksSight {
|
||||
nextShade[angle] = 1
|
||||
}
|
||||
|
||||
@ -236,8 +236,8 @@ func (ps *precomputedShade) recalc(level *gamemap.Level, initCoords types.Coords
|
||||
|
||||
}
|
||||
|
||||
if level.Tiles[lc.X][lc.Y].BlocksSight {
|
||||
level.Tiles[lc.X][lc.Y].Visible = true
|
||||
if level.GetTile(lc).BlocksSight {
|
||||
level.GetTile(lc).Visible = true
|
||||
}
|
||||
|
||||
}
|
||||
@ -254,7 +254,7 @@ func (ps *precomputedShade) ComputeFov(level *gamemap.Level, initCoords types.Co
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
level.Tiles[cs.X][cs.Y].Visible = true
|
||||
level.GetTile(cs).Visible = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -29,10 +29,7 @@ func TestPrecompShade(t *testing.T) {
|
||||
Rect: types.NewRect(0, 0, 20, 20),
|
||||
}
|
||||
|
||||
level.Tiles = make([][]*gamemap.Tile, level.W)
|
||||
for i := range level.Tiles {
|
||||
level.Tiles[i] = make([]*gamemap.Tile, level.H)
|
||||
}
|
||||
level.Tiles = make([]*gamemap.Tile, level.W * level.H)
|
||||
|
||||
var tile func() (*gamemap.Tile)
|
||||
|
||||
@ -43,21 +40,21 @@ func TestPrecompShade(t *testing.T) {
|
||||
} else {
|
||||
tile = gamemap.NewFloor
|
||||
}
|
||||
level.Tiles[x][y] = tile()
|
||||
level.SetTileByXY(x, y, tile())
|
||||
}
|
||||
}
|
||||
|
||||
playerCoords := types.Coords{10, 10}
|
||||
|
||||
level.Tiles[8][12] = gamemap.NewWall()
|
||||
level.Tiles[10][8] = gamemap.NewWall()
|
||||
level.SetTileByXY(8, 12, gamemap.NewWall())
|
||||
level.SetTileByXY(10, 8, gamemap.NewWall())
|
||||
|
||||
level.Tiles[7][9] = gamemap.NewWall()
|
||||
level.Tiles[7][11] = gamemap.NewWall()
|
||||
level.Tiles[5][10] = gamemap.NewWall()
|
||||
level.SetTileByXY(7, 9, gamemap.NewWall())
|
||||
level.SetTileByXY(7, 11, gamemap.NewWall())
|
||||
level.SetTileByXY(5, 10, gamemap.NewWall())
|
||||
|
||||
level.Tiles[10][11] = gamemap.NewWall()
|
||||
level.Tiles[11][10] = gamemap.NewWall()
|
||||
level.SetTileByXY(10, 11, gamemap.NewWall())
|
||||
level.SetTileByXY(11, 10, gamemap.NewWall())
|
||||
|
||||
ppFov.ComputeFov(level, playerCoords, 12)
|
||||
|
||||
@ -67,8 +64,8 @@ func TestPrecompShade(t *testing.T) {
|
||||
if playerCoords.X == x && playerCoords.Y == y {
|
||||
return "@"
|
||||
}
|
||||
result := level.Tiles[x][y].Char
|
||||
if !level.Tiles[x][y].Visible {
|
||||
result := level.GetTileByXY(x, y).Char
|
||||
if !level.GetTileByXY(x, y).Visible {
|
||||
result = "?"
|
||||
}
|
||||
return result
|
||||
|
||||
@ -18,7 +18,23 @@ type Level struct {
|
||||
Branch string
|
||||
Depth int
|
||||
Objects []ecs.Entity
|
||||
Tiles [][]*Tile
|
||||
Tiles []*Tile
|
||||
}
|
||||
|
||||
func (l *Level) GetTile (coords types.Coords) *Tile {
|
||||
return l.Tiles[coords.Y*l.W+coords.X]
|
||||
}
|
||||
|
||||
func (l *Level) GetTileByXY (x,y int) *Tile {
|
||||
return l.Tiles[y*l.W+x]
|
||||
}
|
||||
|
||||
func (l *Level) SetTile (coords types.Coords, tile *Tile) {
|
||||
l.Tiles[coords.Y*l.W+coords.X] = tile
|
||||
}
|
||||
|
||||
func (l *Level) SetTileByXY (x,y int, tile *Tile) {
|
||||
l.Tiles[y*l.W+x] = tile
|
||||
}
|
||||
|
||||
func (l *Level) Put (x, y int, tileFunc interface{}) {
|
||||
@ -27,7 +43,7 @@ func (l *Level) Put (x, y int, tileFunc interface{}) {
|
||||
l.ctx.Logger().Fatal().Msgf("Got non-tile type to put into level: %v", tf)
|
||||
}
|
||||
if l.InBounds(types.Coords{x, y}) {
|
||||
l.Tiles[x][y] = tf
|
||||
l.Tiles[y*l.W+x] = tf
|
||||
}
|
||||
}
|
||||
|
||||
@ -38,11 +54,7 @@ func NewLevel(ctx util.ClientCtx, branch string, depth int) *Level {
|
||||
Rect: types.NewRect(0,0, mapWidth, mapHeight),
|
||||
}
|
||||
|
||||
l.Tiles = make([][]*Tile, l.W)
|
||||
for i := range l.Tiles {
|
||||
l.Tiles[i] = make([]*Tile, l.H)
|
||||
}
|
||||
|
||||
l.Tiles = make([]*Tile, l.W*l.H)
|
||||
return l
|
||||
}
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ func DefaultGen(l *gamemap.Level) *gamemap.Level {
|
||||
//fill with walls
|
||||
for i := 0; i < l.W; i ++ {
|
||||
for j := 0; j < l.H; j++ {
|
||||
l.Tiles[i][j] = gamemap.NewWall()
|
||||
l.SetTileByXY(i, j, gamemap.NewWall())
|
||||
}
|
||||
}
|
||||
|
||||
@ -113,7 +113,7 @@ func digHTunnel(l *gamemap.Level, x1,x2,y int, fillage types.RectFill) {
|
||||
}
|
||||
for i := start; i <= finish; i++ {
|
||||
if l.InBounds(types.Coords{i, y}) {
|
||||
l.Tiles[i][y] = fillage.Body.(func() *gamemap.Tile)()
|
||||
l.SetTileByXY(i, y, fillage.Body.(func() *gamemap.Tile)())
|
||||
//l.Tiles[i][y] = gamemap.NewFloor()
|
||||
}
|
||||
}
|
||||
@ -130,7 +130,7 @@ func digVTunnel(l *gamemap.Level, y1,y2,x int, fillage types.RectFill) {
|
||||
}
|
||||
for i := start; i <= finish; i++ {
|
||||
if l.InBounds(types.Coords{x, i}) {
|
||||
l.Tiles[x][i] = fillage.Body.(func() *gamemap.Tile)()
|
||||
l.SetTileByXY(x, i, fillage.Body.(func() *gamemap.Tile)())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
package gamemap
|
||||
|
||||
import "lab.zaar.be/thefish/alchemyst-go/util"
|
||||
import (
|
||||
"container/ring"
|
||||
"lab.zaar.be/thefish/alchemyst-go/util"
|
||||
)
|
||||
import blt "lab.zaar.be/thefish/bearlibterminal"
|
||||
|
||||
type ColorHolder struct {
|
||||
@ -24,6 +27,28 @@ type Appearance struct {
|
||||
|
||||
var crng = util.NewRNG()
|
||||
|
||||
func NewColorComponentRing(colorValue uint8, minGlow, maxGlow, step int) *ring.Ring {
|
||||
q := make([]uint8, 0)
|
||||
color := int(colorValue)
|
||||
for color < maxGlow {
|
||||
q = append(q, uint8(color))
|
||||
color = crng.Range(0, step) + color
|
||||
}
|
||||
color = crng.Range(0, step + minGlow)
|
||||
for uint8(color) < colorValue {
|
||||
q = append(q, uint8(color))
|
||||
color = crng.Range(0, step + minGlow)
|
||||
}
|
||||
|
||||
r := ring.New(len(q))
|
||||
for _, v := range q {
|
||||
r.Next().Value = v
|
||||
}
|
||||
|
||||
return r
|
||||
}
|
||||
|
||||
|
||||
func colordance(colorValue uint8, minGlow, maxGlow, step int) uint8 {
|
||||
color := crng.Range(0, step) + int(colorValue)
|
||||
if color > maxGlow {
|
||||
|
||||
@ -32,3 +32,11 @@ func ReadKey() (string, int) {
|
||||
|
||||
return pressed, key
|
||||
}
|
||||
|
||||
func ReadKeyCode() int {
|
||||
if !blt.HasInput() {
|
||||
return blt.TK_NONE
|
||||
}
|
||||
return blt.Read()
|
||||
|
||||
}
|
||||
|
||||
@ -10,11 +10,6 @@ type Layer struct {
|
||||
defaultColor uint32
|
||||
}
|
||||
|
||||
func AddLayer(idx int, colorName string) Layer {
|
||||
c := blt.ColorFromName(colorName)
|
||||
return Layer{idx: idx, defaultColor: c}
|
||||
}
|
||||
|
||||
func (layer *Layer) before() *Layer {
|
||||
blt.Layer(layer.idx)
|
||||
return layer
|
||||
|
||||
@ -9,16 +9,32 @@ import (
|
||||
|
||||
type MainWindow struct {
|
||||
ctx util.ClientCtx
|
||||
layers []types.Renderable
|
||||
layers map[string]types.Renderable
|
||||
}
|
||||
|
||||
func Init(ctx util.ClientCtx) *MainWindow {
|
||||
ctx.Logger().Info().Msgf("Opening main window...")
|
||||
mw := MainWindow{ctx: ctx}
|
||||
mw := MainWindow{ctx: ctx, layers: make(map[string]types.Renderable, 0)}
|
||||
mw.Open()
|
||||
return &mw
|
||||
}
|
||||
|
||||
|
||||
|
||||
func (mw *MainWindow) AddLayer(name string, idx int, colorName string) *MainWindow {
|
||||
c := blt.ColorFromName(colorName)
|
||||
mw.layers[name] = &Layer{idx: idx, defaultColor: c}
|
||||
return mw
|
||||
}
|
||||
|
||||
func (mw *MainWindow) GetLayer(name string) *Layer {
|
||||
if layer, ok := mw.layers[name]; ok {
|
||||
return layer.(*Layer)
|
||||
}
|
||||
mw.ctx.Logger().Fatal().Msgf("No layer with such name %s", name)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (mw *MainWindow) Open() {
|
||||
config := mw.ctx.Config()
|
||||
blt.Open()
|
||||
@ -46,8 +62,4 @@ func (mw *MainWindow) Render() {
|
||||
for _, l := range mw.layers {
|
||||
l.Render()
|
||||
}
|
||||
}
|
||||
|
||||
func (mw *MainWindow) AddLayer(li types.Renderable) {
|
||||
mw.layers = append(mw.layers, li)
|
||||
}
|
||||
}
|
||||
@ -129,30 +129,47 @@ func (vp *ViewPort) Render() {
|
||||
|
||||
vp.Fov.ComputeFov(vp.level, vp.playerCoords, vp.playerTorchRadius)
|
||||
}
|
||||
|
||||
//for y := 0; y < vp.H; y++ {
|
||||
// for x := 0; x < vp.W; x++ {
|
||||
// mapCoords := types.Coords{vp.X + x, vp.Y + y}
|
||||
// tile := vp.level.Tiles[mapCoords.X][mapCoords.Y]
|
||||
//
|
||||
// if tile.Visible {
|
||||
// if tile.MustDraw {
|
||||
// //darkened version of landscape
|
||||
// vp.layer.WithRawColor(tile.ColorSet.DarkFg()).
|
||||
// PutWithRawBackground(mapCoords.X, mapCoords.Y, tile.Char, tile.ColorSet.DarkBg())
|
||||
// }
|
||||
// } else {
|
||||
// if redraw == true || tile.Colordance {
|
||||
// vp.layer.WithRawColor(tile.ColorSet.Fg()).
|
||||
// PutWithRawBackground(mapCoords.X, mapCoords.Y, tile.Char, tile.ColorSet.Bg())
|
||||
// tile.Explored = true
|
||||
// tile.MustDraw = true
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
||||
for y := 0; y < vp.H; y++ {
|
||||
for x := 0; x < vp.W; x++ {
|
||||
mapCoords := types.Coords{vp.X + x, vp.Y + y}
|
||||
tile := vp.level.Tiles[mapCoords.X][mapCoords.Y]
|
||||
|
||||
tile := vp.level.GetTile(mapCoords)
|
||||
if tile.Visible {
|
||||
if tile.MustDraw {
|
||||
//darkened version of landscape
|
||||
vp.layer.WithRawColor(tile.ColorSet.DarkFg()).
|
||||
PutWithRawBackground(mapCoords.X, mapCoords.Y, tile.Char, tile.ColorSet.DarkBg())
|
||||
vp.layer.WithColor("green").
|
||||
Put(mapCoords.X, mapCoords.Y, tile.Char)
|
||||
}
|
||||
} else {
|
||||
if redraw == true || tile.Colordance {
|
||||
vp.layer.WithRawColor(tile.ColorSet.Fg()).
|
||||
PutWithRawBackground(mapCoords.X, mapCoords.Y, tile.Char, tile.ColorSet.Bg())
|
||||
vp.layer.WithColor("white").
|
||||
Put(mapCoords.X, mapCoords.Y, tile.Char)
|
||||
tile.Explored = true
|
||||
tile.MustDraw = true
|
||||
}
|
||||
}
|
||||
|
||||
//fg := tile.ColorSet.Fg()
|
||||
//bg := tile.ColorSet.Bg()
|
||||
//vp.layer.WithRawColor(fg).
|
||||
// PutWithRawBackground(mapCoords.X, mapCoords.Y, tile.Char, bg)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user