From a91351d3dcc670299f92103f2ab31a6e31415aa4 Mon Sep 17 00:00:00 2001
From: thefish <thefish@zaar.be>
Date: Thu, 31 Oct 2019 22:47:36 +0300
Subject: [PATCH] makefile

---
 .gitignore                |  1 +
 Makefile                  | 21 +++++++-------
 cmd/game/main.go          |  8 ++++++
 dist/.gitkeep             |  0
 link.sh                   |  2 +-
 ui/mainwindow/viewport.go | 60 +++++++--------------------------------
 6 files changed, 31 insertions(+), 61 deletions(-)
 create mode 100644 dist/.gitkeep

diff --git a/.gitignore b/.gitignore
index b7c4c01..d70e461 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .idea/*
 tmp/*
 logs/*
+dist/*
 *.swp
diff --git a/Makefile b/Makefile
index 406bbfd..663a14b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,26 +2,27 @@ PROJECT_NAME := "alchemyst-go"
 PKG := "lab.zaar.be/thefish/$(PROJECT_NAME)"
 GO=$(shell which go)
 CWD=$(shell pwd)
+DISTFOLDER=$(CWD)/dist
+CP=$(shell cp)
 GLIDE=$(shell which glide)
 
 LDFLAGS="-X \"main.versionInfo=${PKG_VER}-${CI_PIPELINE_ID} built at $(shell date) on $(shell hostname) with $(shell go version)\""
 
-.PHONY: all build test get-dep
+.PHONY: all build test
 
 all: build test
 
 #build: build.spec build.server
-build: build.server
+build: build.game
 
-#build.spec:
-#	$(CWD)/bin/oapi-codegen --generate types,spec -o $(CWD)/api/inner/inner.gen.go $(CWD)/public/schema/api.yaml
+build.deps:
+	GIT_SSL_NO_VERIFY=true $(GO) mod vendor
 
-build.server:
-	$(GO) build -ldflags $(LDFLAGS) -o $(CWD)/bin/game $(CWD)/cmd/game/main.go
+build.game:
+	cp $(CWD)/vendor/lab.zaar.be/thefish/bearlibterminal/libBearLibTerminal.so $(DISTFOLDER)
+	cp $(CWD)/config.json $(DISTFOLDER)
+	cp -r $(CWD)/resources $(DISTFOLDER)
+	$(GO) build -ldflags $(LDFLAGS) -o $(DISTFOLDER)/game $(CWD)/cmd/game/main.go
 
 test:
 	$(GO) test -v $(go list ./... | grep -v /vendor/)
-
-get-dep:
-	GIT_SSL_NO_VERIFY=true go mod vendor
-
diff --git a/cmd/game/main.go b/cmd/game/main.go
index ee09d44..a908b48 100644
--- a/cmd/game/main.go
+++ b/cmd/game/main.go
@@ -116,12 +116,19 @@ func setupLayers(mainwindow *mainwindow.MainWindow) {
 
 func decodeInput(ctx util.ClientCtx, baseLayer *mainwindow.Layer) {
 	var exit = false
+	var waitForWCspam = true
 	for !exit{
 		select {
 		case keycode := <-State.rawInput:
 			if keycode == blt.TK_NONE {
 				continue
 			}
+			if keycode == blt.TK_CLOSE && !waitForWCspam {
+				ctx.Logger().Warn().Msg("exiting on window close...")
+				State.exit <- struct{}{}
+				ctx.Logger().Warn().Msg("...done")
+				return
+			}
 			var pressed= ""
 			var isModifier, _= util.InArray(keycode, modifiers)
 			if !isModifier {
@@ -153,6 +160,7 @@ func decodeInput(ctx util.ClientCtx, baseLayer *mainwindow.Layer) {
 					exit = true
 					return
 				default:
+					waitForWCspam = false;
 					State.input <- pressed
 				}
 			}
diff --git a/dist/.gitkeep b/dist/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/link.sh b/link.sh
index f988a49..81240a5 100755
--- a/link.sh
+++ b/link.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-ln -s src/bearlibterminal/libBearLibTerminal.so .
+ln -s vendor/lab.zaar.be/thefish/bearlibterminal/libBearLibTerminal.so .
diff --git a/ui/mainwindow/viewport.go b/ui/mainwindow/viewport.go
index 447c3ea..749d24d 100644
--- a/ui/mainwindow/viewport.go
+++ b/ui/mainwindow/viewport.go
@@ -125,61 +125,21 @@ func (vp *ViewPort) Render() {
 		vp.layer.Clear(vp.Rect)
 		fovRecompute = false
 		redraw = true
-		//fixme
-
 		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
-	//			}
-	//		}
-	//	}
-	//}
+	if redraw {
+		for y := 0; y < vp.H; y++ {
+			for x := 0; x < vp.W; x++ {
+				mapCoords := types.Coords{vp.X + x, vp.Y + y}
 
-	for y := 0; y < vp.H; y++ {
-		for x := 0; x < vp.W; x++ {
-			mapCoords := types.Coords{vp.X + x, vp.Y + y}
-			//vp.level.GetTile(mapCoords).Render()
-
-			tile := vp.level.GetTile(mapCoords)
-
-			//vp.layer.
-			//	WithRawColor(tile.GetRawColor()).
-			//	PutWithBackground(mapCoords.X, mapCoords.Y, tile.GetChar(), "grey")
-
-			vp.layer.PutToBase(mapCoords.X,mapCoords.Y,tile.GetChar(), tile.GetRawColor(), tile.GetRawBgColor())
-
-			//if tile.Visible {
-			//	if tile.MustDraw {
-			//		//darkened version of landscape
-			//		vp.layer.WithColor("green").
-			//			Put(mapCoords.X, mapCoords.Y, tile.Char)
-			//	}
-			//} else {
-			//	if redraw == true || tile.Colordance {
-			//		vp.layer.WithColor("grey").
-			//			Put(mapCoords.X, mapCoords.Y, tile.Char)
-			//		tile.Explored = true
-			//		tile.MustDraw = true
-			//	}
-			//}
+				tile := vp.level.GetTile(mapCoords)
+				if tile.Explored || tile.MustDraw || tile.Visible {
+					vp.layer.PutToBase(mapCoords.X, mapCoords.Y, tile.GetChar(), tile.GetRawColor(), tile.GetRawBgColor())
+				}
+			}
 		}
+		//redraw = false
 	}
 
 }