From 72da0ef462049ea93fddfdd48c064acf3ed3bbde Mon Sep 17 00:00:00 2001
From: Sander Schobers <sander@schobers.eu>
Date: Sat, 9 May 2020 22:50:11 +0200
Subject: [PATCH] Added hover effect for terrain.

---
 cmd/tins2020/res/images/hover.png | Bin 0 -> 2941 bytes
 cmd/tins2020/res/textures.txt     |   1 +
 context.go                        |   2 ++
 terrainrenderer.go                |  18 +++++++++---------
 4 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 cmd/tins2020/res/images/hover.png

diff --git a/cmd/tins2020/res/images/hover.png b/cmd/tins2020/res/images/hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..efea337928c6f94fbb19584e78cb8111a6abf3f9
GIT binary patch
literal 2941
zcmeHJ`%@cb6urBw%!Y@FNF}@i7!YT8r9eA`0^ubOX(NhC6db~+)7ILODHa(X*@aRw
z9jVZ1)ln!_8PRF&%RZn~N`@4uRf`s-u}OywkwM-;0^~*3FZ2)acZZ+$>^JA0yL0b%
zcFxg4X|A_NfCm70=jUa=1b`!m1L=+)=IY;V0G`?T*%>cax6eI%_)gI7fSljHe>)<)
z_)B~L8S#kK%XoWCUYPLJy%~1Fc4qZ;UNeXD@re|B%+;?esCw!Y(4Sl=kN}vfk!~Xa
zKyUy^9{^rBKxiI7dMf}OiUDM75;o_sc^@`?@n8Rk`Vt#P58I8_=}F@vyS&yy#jGW&
zeQr8d)(=hZ2Ekitj>=3(CV&VEbc(}37YTCB-QW!v0rJD=A3-6=vks)XsMoSU?XIu2
zOf|uGr-9y5Yc`E=Fj*W1QCA+p5Cr2NY@Bit6xm#mkGKuz_PffO3qVbeZS);Nx}hZ-
zjg34I(dW2qJCB~^fUIzX8l4Mjd`2UQB$y=vQd$j?out}GLN#b8K^Uw>0`rj<d#DNY
zEkN%OIl3bVW|aVatD!$G47!EDxO=g0a<HBbpragChxwmt=By_4-VU@U-#J<TS=aRZ
z`hCh1OKJl;!Et@+6;`L(I&mp2M;%Tu(Ktvit{5m?LRY8l;J~s6mLvr=X8(X~-F8d;
z`H<6B<qT|sI&>(QdYnzvT1Il656W^CzbtbwOC$y%rSXoCW4>7Bz5sjCDVshmnq<R)
zxnl@fx(xQA_0rCq0rAN4cKcLS6Ob^WtX0-nlXs2Yk8%bJ-PP}@;@p}=&K<)YQ<n{_
zWsTZ7YJP*{Jp)WC(Gkn<d2xt+%8%9W>6COYTBZKZGIrRmGaUxHrDHsc`8BYiws}4#
zs8>I-ZDz7RffD#h+FwAQ+Mmhjju-#j9iS`e9j<H+z$#;vNoas>t9?(%YW`{wPwul;
zc9uC*Jr+Z}YXr4Ik$2V7qTYDy*0);~a~eug>QMM#u)F%ENz+)6yi&9-q-Ln(atqaK
zF`%i%ifYJr4K22Lq>x5HX}OsvOVDuFBG5vb)bl~X&hEW7`yVFFRoAk3J?$Tc2+*wv
zCL2btTgv@$SjZ#m?hbN)@&OZMGHlg&8#7wL7$;OJ9+=W6d5R^CjDYAbeDPQ%{{+yF
z?H3cJ4$*cD+_cY=LH0{ONXFxw#eR}#w43y?AUwBh<%XsFSsdK2csA@c@sU6c2l(3C
z6{zmw0UTbHpLD5Kksv!Bk)<Bw>YfJq5y2LGI993Q&LS@iF8HHvTGS&@aTam2R6u)M
z=aI8!kAx}aCRp*V(f2jnwlHKHsdqz>t4<e=?4+d7Ru9Vcks9u6IN(Z(5-RQtva=W1
z0HrnsgRmPs?bJ60l`jSvREngp&ar;>^p9LI4g($iseOFq9#;e~|M{sKMteWGnFcmf
h(f>9b{!O89%d+=sP7-)mS|W<okpG-C`+TOn@n29Xny~-?

literal 0
HcmV?d00001

diff --git a/cmd/tins2020/res/textures.txt b/cmd/tins2020/res/textures.txt
index af6d0d0..70fff51 100644
--- a/cmd/tins2020/res/textures.txt
+++ b/cmd/tins2020/res/textures.txt
@@ -2,6 +2,7 @@
 tile-dirt: images/tile_dirt.png
 tile-grass: images/tile_grass.png
 tile-snow: images/tile_snow.png
+hover: images/hover.png
 
 cactus-small-1: images/cactus_short_NE.png
 cactus-small-2: images/cactus_short_NW.png
diff --git a/context.go b/context.go
index b61b152..8644241 100644
--- a/context.go
+++ b/context.go
@@ -38,6 +38,8 @@ func (c *Context) Init(renderer *sdl.Renderer) {
 	c.Renderer = renderer
 	c.Fonts.Init(c.Resources.Copy())
 	c.Textures.Init(renderer, c.Resources.Copy())
+
+	c.Renderer.SetDrawBlendMode(sdl.BLENDMODE_BLEND)
 }
 
 func (c *Context) Quit() { c.ShouldQuit = true }
diff --git a/terrainrenderer.go b/terrainrenderer.go
index 69d9ca2..84c0b90 100644
--- a/terrainrenderer.go
+++ b/terrainrenderer.go
@@ -64,7 +64,9 @@ func (r *terrainRenderer) Handle(ctx *Context, event sdl.Event) {
 }
 
 func (r *terrainRenderer) Render(ctx *Context) {
-	toTileTexture := func(temp, humid float64) *Texture {
+	hover := Pt(int32(geom.Round32(r.hover.X)), int32(geom.Round32(r.hover.Y)))
+	toTileTexture := func(x, y int32) *Texture {
+		temp := r.terrain.Temp.Value(x, y)
 		if temp < .35 {
 			return ctx.Textures.Texture("tile-snow")
 		}
@@ -141,16 +143,14 @@ func (r *terrainRenderer) Render(ctx *Context) {
 	// horizontal: [191, 321) = 130
 	// vertical: [267,332) = 65
 
-	hover := Pt(int32(geom.Round32(r.hover.X)), int32(geom.Round32(r.hover.Y)))
 	r.project.visibleTiles(func(x, y int32, pos Point) {
-		if x == hover.X && y == hover.Y {
-			return
-		}
-		temp := r.terrain.Temp.Value(x, y)
-		humid := r.terrain.Humid.Value(x, y)
-		text := toTileTexture(temp, humid)
+		text := toTileTexture(x, y)
 		rect := r.project.screenToTileRect(pos)
 		text.Copy(ctx.Renderer, rect)
+
+		if x == hover.X && y == hover.Y {
+			ctx.Textures.Texture("hover").Copy(ctx.Renderer, rect)
+		}
 	})
 
 	r.project.visibleTiles(func(x, y int32, pos Point) {
@@ -160,7 +160,7 @@ func (r *terrainRenderer) Render(ctx *Context) {
 		}
 
 		placeX, placeY := r.terrain.PlaceX.Value(x, y), r.terrain.PlaceY.Value(x, y)
-		pos = r.project.mapToScreenF(float32(x)-.2+float32(.8*placeX-.4), float32(y)-.2+float32(.8*placeY-.4))
+		pos = r.project.mapToScreenF(float32(x)-.2+float32(.9*placeX-.45), float32(y)-.2+float32(.9*placeY-.45))
 		text.Copy(ctx.Renderer, r.project.screenToTileRect(pos))
 	})