thefish/alchemyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

with backgroung + composition

Browse Source
This commit is contained in:
thefish
2019-10-27 03:00:48 +03:00
parent 184ac149ee
commit 4a77323aab
3 changed files with 59 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ui/mainwindow/layer.go
View File

@ -45,11 +45,14 @@ func (layer *Layer) PutWithRawBackground(x,y int, symbol interface{}, bgColor ui
func (layer *Layer) PutWithBackground(x,y int, symbol interface{}, bgColorName string) {
layer.before()
prevColor := uint32(blt.State(blt.TK_COLOR))
prevCompMode := blt.State(blt.TK_COMPOSITION)
c := blt.ColorFromName(bgColorName)
blt.Color(c)
blt.Composition(1)
layer.Put(x,y,"█")
blt.Color(prevColor)
layer.Put(x,y, symbol)
blt.Composition(prevCompMode)
}
func (layer *Layer) after() *Layer {

92
ui/mainwindow/viewport.go
View File

@ -53,49 +53,49 @@ func (vp *ViewPort) ToVPCoords(c *types.Coords) (newCoords *types.Coords, err er
}
//call only from main thread
func (vp *ViewPort) Render() {
//fixme get these from state chan(s)
var fpsTicker int
var fovRecompute bool
redraw := false
//fixme get player instance
vp.Move(player.Coords)
//fixme detect fovRecompute
if fovRecompute {
vp.layer.Clear(vp.Rect)
fovRecompute = false
redraw = true
//fixme
vp.level.ComputeFov(FovMap, player.Coords, player.TorchRadius, FovLightWalls, FovAlgo)
}
//increase ticker
fpsTicker++
if redraw || fpsTicker % (FPS_LIMIT / 10) == 0 {
fpsTicker := 0
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]
visible := vp.IsInFov(mapCoords)
if !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
}
}
}
}
}
}
//func (vp *ViewPort) Render() {
// //fixme get these from state chan(s)
// var fpsTicker int
// var fovRecompute bool
// redraw := false
// //fixme get player instance
//
// vp.Move(player.Coords)
// //fixme detect fovRecompute
// if fovRecompute {
// vp.layer.Clear(vp.Rect)
// fovRecompute = false
// redraw = true
// //fixme
// vp.level.ComputeFov(FovMap, player.Coords, player.TorchRadius, FovLightWalls, FovAlgo)
// }
// //increase ticker
// fpsTicker++
//
// if redraw || fpsTicker % (FPS_LIMIT / 10) == 0 {
// fpsTicker := 0
//
// 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]
// visible := vp.IsInFov(mapCoords)
// if !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
// }
// }
// }
// }
//
// }
//}