From 2a063ebcd5301deecfa8c66056615f2c31936968 Mon Sep 17 00:00:00 2001
From: squishy <git@squishybloob.com>
Date: Sat, 23 Mar 2024 12:54:00 +0000
Subject: [PATCH] drawing hover stone

---
 assets/stones.png    | Bin 334 -> 324 bytes
 go.mod               |   2 +-
 go.sum               |   4 ++--
 src/boardstate.go    |  13 +++++++++++++
 src/game.go          |  22 ++++++++++++++--------
 src/gobanrenderer.go |   8 ++++----
 6 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/assets/stones.png b/assets/stones.png
index 9a7ba488f2af88a81705629c8615f20f368f55bc..2cc256548171bd8fd1fd486b1d8871b7ca3724d7 100644
GIT binary patch
delta 285
zcmV+&0pkA70>lE4Fn<94Nkl<ZScUDFO$viB5QWE53Ozu(E+RdFC+N}xyX*-(frz-a
z2Pkxtt^z|cu^BUlVDl{}WK7<?{0Wc=qSz{NRo2Rk4P)p1y?&al{`cE;v+=G)d_a_N
zCQCw6!kMHb<Uul-7O#D_RvV7FMAqV+PZz5V$9zPNg;*uAcz?~K@#=$}h{bz<US9oE
zaN<!i8Am({j(ER_wFiq-&}ZLsF^pXivLvZVRb{Oxv0QPJewr1Pmx_xzFg0*tIquWo
z!n(E#(L>}P$pQwl>m|Hq*<yT7dGTuu2kIKbVQGS~PT}1;Foyd8gr9O87g7`CxG;rF
jG(dg}2b2HC1QzlIr&ox(EOuz>00000NkvXXu0mjfr9OgP

delta 295
zcmV+?0oeY;0?q=EFn<9ENkl<ZScUDEK?;K~5Jg8Qg&v@;MZ^<$0+%^(mY%>96p^mm
z0~ETktDzx|ablA=1>bT=od17Di2w%&dy>U^a8)*wT^q)p-S2jP%=Xts&fcG@f0O_z
z@d(ERB_8n!F$KZJV0gOIpjt()afOKCUCvhk0C>Hhvo)>|Q-Ajl8sM6Evrd_?#RGf|
z*oLG`VlWY$leaNLbcJWu&6*kFUj2gy=!44u_3GG2n8MTE0&F<JQG_}`AL=5{#09t&
zpDPN*)@c?KplTK9PJ694`E>%TvYCAQ4`Uzh8;ByfYpIFhnn3ZM@}dy!9_Yelel5hc
t@KW~|`6seuLLk!QA!7f9|9$@flMj!W&8<CxGz0(u002ovPDHLkV1hsQi7@~G

diff --git a/go.mod b/go.mod
index a179dce..0efd420 100644
--- a/go.mod
+++ b/go.mod
@@ -8,6 +8,6 @@ require git.danitheskunk.com/squishy/blooblib v0.0.0-00010101000000-000000000000
 
 require (
 	github.com/askeladdk/aseprite v0.0.4 // indirect
-	github.com/veandco/go-sdl2 v0.4.38 // indirect
+	github.com/veandco/go-sdl2 v0.5.0-alpha.4.0.20240323054118-79669ab74d94 // indirect
 	golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 // indirect
 )
diff --git a/go.sum b/go.sum
index 663b411..f561b16 100644
--- a/go.sum
+++ b/go.sum
@@ -1,8 +1,8 @@
 github.com/askeladdk/aseprite v0.0.4 h1:/k1VTiDkPORnrzonUUV5oXWwdHBoYjIIYJ1K/PupNMU=
 github.com/askeladdk/aseprite v0.0.4/go.mod h1:lVW4EwZ7lgQjeHp7MhYj1NII5a/yLYyvAo7COPIn3WY=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/veandco/go-sdl2 v0.4.38 h1:lx8syOA2ccXlgViYkQe2Kn/4xt+p9mdd1Qc/yYMrmSo=
-github.com/veandco/go-sdl2 v0.4.38/go.mod h1:OROqMhHD43nT4/i9crJukyVecjPNYYuCofep6SNiAjY=
+github.com/veandco/go-sdl2 v0.5.0-alpha.4.0.20240323054118-79669ab74d94 h1:7Ay2TWWqg2J4mqPj6vgbg9ib7OzO37szAnQ48MmdD/Y=
+github.com/veandco/go-sdl2 v0.5.0-alpha.4.0.20240323054118-79669ab74d94/go.mod h1:OROqMhHD43nT4/i9crJukyVecjPNYYuCofep6SNiAjY=
 golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 h1:6R2FC06FonbXQ8pK11/PDFY6N6LWlf9KlzibaCapmqc=
 golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ=
 golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
diff --git a/src/boardstate.go b/src/boardstate.go
index 5ea01b9..af033ab 100644
--- a/src/boardstate.go
+++ b/src/boardstate.go
@@ -45,3 +45,16 @@ func (bs *BoardState) Clear() {
 func (bs *BoardState) Draw(target *Image) {
 	target.DrawTilemap(bs.tilemap, Vec2i{X: 10 * 16, Y: 1 * 16})
 }
+
+func (bs *BoardState) DrawHover(target *Image, pos Vec2i, player CellState) {
+	if bs.Get(pos) == Empty {
+		switch player {
+		case Black:
+			target.Draw(tilesStones[tileStoneBlackHalf], Vec2i{X: (10 + pos.X) * 16, Y: (1 + pos.Y) * 16})
+			break
+		case White:
+			target.Draw(tilesStones[tileStoneWhiteHalf], Vec2i{X: (10 + pos.X) * 16, Y: (1 + pos.Y) * 16})
+			break
+		}
+	}
+}
diff --git a/src/game.go b/src/game.go
index 6c4614d..4783dfc 100644
--- a/src/game.go
+++ b/src/game.go
@@ -1,7 +1,9 @@
 package src
 
 import (
+	"fmt"
 	. "git.danitheskunk.com/squishy/blooblib"
+	"git.danitheskunk.com/squishy/blooblib/color"
 )
 
 type Game struct {
@@ -9,20 +11,24 @@ type Game struct {
 	boardState    *BoardState
 }
 
-func (g *Game) Init(settings *Settings) {
+func (g *Game) Init(bloob *Bloob, settings *Settings) {
 	settings.Title = "Goo v0.0"
+	settings.TargetFps = 240
 	g.boardState = NewBoardState()
 	g.gobanRenderer = NewGobanRenderer(g.boardState)
-	
-	g.boardState.Set(Vec2i{X:3,Y:3}, Black)
+
+	g.boardState.Set(Vec2i{X: 3, Y: 3}, Black)
 }
 
-func (g *Game) Render(screen *Image) {
+func (g *Game) Render(bloob *Bloob, screen *Image) {
+	mouseTilePos := DivScalar(bloob.MousePos, 16)
 	g.gobanRenderer.Render(screen)
-	//screen.DrawTilemap(g.tilemap, Vec2i{})
-	//screen.Render(g.tilemap.Tileset[2], Vec2i{X: 16 * 25, Y: 16 * 4})
-	//screen.Render(g.tilemap.Tileset[1], Vec2i{X: 16 * 13, Y: 16 * 16})
+	if mouseTilePos.X >= 10 && mouseTilePos.Y >= 1 && mouseTilePos.X < 29 && mouseTilePos.Y < 20 {
+		tilePos := Sub(mouseTilePos, Vec2i{X: 10, Y: 1})
+		g.boardState.DrawHover(screen, tilePos, Black)
+	}
+	screen.DrawText(fmt.Sprintf("%3d x %3d", bloob.MousePos.X, bloob.MousePos.Y), DefaultFont, Vec2i{10, 10}, color.White)
 }
 
-func (g *Game) Update() {
+func (g *Game) Update(bloob *Bloob) {
 }
diff --git a/src/gobanrenderer.go b/src/gobanrenderer.go
index 0fb01b6..d963ada 100644
--- a/src/gobanrenderer.go
+++ b/src/gobanrenderer.go
@@ -24,10 +24,10 @@ const (
 	tileRightOfBoard      = 13
 	tileBottomLeftOfBoard = 14
 	tileTopRightOfBoard   = 15
-	tileStoneBlack        = 0
-	tileStoneWhite        = 1
-	tileStoneBlackHalf    = 2
-	tileStoneWhiteHalf    = 3
+	tileStoneBlack        = 1
+	tileStoneWhite        = 2
+	tileStoneBlackHalf    = 3
+	tileStoneWhiteHalf    = 4
 )
 
 var tilesGoban []*Image