fix supid viewport bug

engine/fov/precomputed_shade/precomputed_shade.go

@@ -195,7 +195,9 @@ func (ps *precomputedShade) PrecomputeFovMap() {
 }
 
 func (ps *precomputedShade) recalc(level *gamemap.Level, initCoords types.Coords, radius int) {
-
+	for i, _ := range ps.CellList {
+		ps.CellList[i].lit = 0
+	}
 	ps.originCoords = initCoords
 
 	if radius > ps.MaxTorchRadius {
@@ -250,6 +252,7 @@ func (ps *precomputedShade) recalc(level *gamemap.Level, initCoords types.Coords
 
 func (ps *precomputedShade) ComputeFov(level *gamemap.Level, initCoords types.Coords, radius int) {
 
+	level.SetAllInvisible()
 	ps.recalc(level, initCoords, radius)
 
 	for _, cell := range ps.CellList {
@@ -260,6 +263,7 @@ func (ps *precomputedShade) ComputeFov(level *gamemap.Level, initCoords types.Co
 				continue
 			}
 			level.GetTile(cs).Visible = true
+			level.GetTile(cs).Explored = true
 		}
 
 		//light walls, crutch
@@ -273,6 +277,7 @@ func (ps *precomputedShade) ComputeFov(level *gamemap.Level, initCoords types.Co
 						(maybeNb.X == cell.X || maybeNb.Y == cell.Y) &&
 						maybeNb.lit > 0 { //magic constant!
 						level.GetTile(cs).Visible = true
+						level.GetTile(cs).Explored = true
 					}
 				}
 			}

engine/gamemap/level.go

@@ -58,6 +58,12 @@ func NewLevel(ctx util.ClientCtx, branch string, depth int) *Level {
 	return l
 }
 
+func (l *Level) SetAllInvisible() {
+	for idx, _ := range l.Tiles {
+		l.Tiles[idx].Visible = false
+	}
+}
+
 type Room struct {
 	*types.Rect
 	Center types.Coords

engine/mob/mob.go

@@ -1,6 +1,9 @@
 package mob
 
-import "lab.zaar.be/thefish/alchemyst-go/engine/types"
+import (
+	"fmt"
+	"lab.zaar.be/thefish/alchemyst-go/engine/types"
+)
 
 type Mob struct {
 	*types.Appearance
@@ -9,7 +12,8 @@ type Mob struct {
 }
 
 func (m *Mob) Walk(dx, dy int) {
-
+	m.Coords = types.Coords{m.X + dx, m.Y + dy}
+	fmt.Printf("new coords: %d, %d\n", m.Coords.X, m.Coords.Y)
 }
 
 func (m *Mob) Render() {

engine/screens/game.go

@@ -42,7 +42,7 @@ func (ts *GameScreen) HandleInput(input string) {
 		ts.state.Player.Walk(-1, 1)
 		break
 	case "n", "3":
-		ts.state.Player.Walk(-1, 3)
+		ts.state.Player.Walk(1, 1)
 		break
 	default:
 		ts.mw.GetLayer("base").ClearArea(0, 3, 40, 1)

ui/mainwindow/viewport.go

@@ -32,7 +32,7 @@ func NewViewPort(x, y, w, h int, layer *Layer) *ViewPort {
 		Fov:   computedFov,
 	}
 
-	vp.PlayerTorchRadius = 9
+	vp.PlayerTorchRadius = 11
 	vp.animateTiles = time.NewTicker(time.Second / 12)
 
 	return &vp
@@ -56,11 +56,11 @@ func (vp *ViewPort) Move(state *gamestate.GameState) {
 	if y < 0 {
 		y = 0
 	}
-	if x > state.Level.W-vp.W {
+	if x > state.Level.W-vp.W - 1 {
 		x = state.Level.W - vp.W - 1
 	}
-	if y > state.Level.H-vp.H {
+	if y > state.Level.H-vp.H - 1 {
-		x = state.Level.H - vp.H - 1
+		y = state.Level.H - vp.H - 1
 	}
 	if x != vp.cameraCoords.X || y != vp.cameraCoords.Y {
 		state.FovRecompute <- struct{}{}
@@ -101,12 +101,12 @@ func (vp *ViewPort) Render(state *gamestate.GameState) {
 
 	if fovRecompute {
 		vp.layer.ClearRect(vp.Rect)
-		fovRecompute = false
+		fovRecompute = true
 		redraw = true
 		vp.Fov.ComputeFov(state.Level, state.Player.Coords, vp.PlayerTorchRadius)
 	}
 
-	if redraw {
+	//if redraw {
 		//terrain
 		for y := 0; y < vp.H; y++ {
 			for x := 0; x < vp.W; x++ {
@@ -114,14 +114,14 @@ func (vp *ViewPort) Render(state *gamestate.GameState) {
 
 				if state.Level.InBounds(mapCoords) {
 					tile := state.Level.GetTile(mapCoords)
-					if tile.Explored || tile.MustDraw || tile.Visible {
+					if tile.Explored || tile.Visible {
 						vp.layer.PutToBase(x+vp.X, y+vp.Y, tile.GetChar(), tile.GetRawColor(), tile.GetRawBgColor())
 					}
 				}
 			}
 		}
 		//mobs
-		pc, err := vp.ToVPCoords(vp.PlayerCoords)
+		pc, err := vp.ToVPCoords(state.Player.Coords)
 		_ = pc
 		if err != nil {
 			fmt.Println("error on getting player position")
@@ -132,8 +132,8 @@ func (vp *ViewPort) Render(state *gamestate.GameState) {
 		}
 
 		//redraw = true
-		redraw = false
+		//redraw = false
 
-	}
+	//}
 
 }