Merge pull request 'some refinement and beginning of a table element' (#8) from element-refinement into main

Reviewed-on: #8

common/elements/v1/blocks/block.go

@@ -3,53 +3,49 @@ package blocks
 import (
 	"image/color"
 
-	"git.vezzani.net/ben/games/common/elements/v1"
-	"git.vezzani.net/ben/games/common/elements/v1/mouse"
+	"git.vezzani.net/ben/games/common/elements/v1/core"
+	"git.vezzani.net/ben/games/common/geo"
 	"github.com/hajimehoshi/ebiten/v2"
 	"github.com/hajimehoshi/ebiten/v2/vector"
 )
 
-func New(ops ...Option) elements.InitFunc {
-	return func(d elements.Bounds) elements.Element {
-		b := Block{
-			ContainerBounds: d,
-		}
-		for i := range ops {
-			ops[i](&b)
-		}
-		return &b
+func New(ops ...OptFunc) *Block {
+	b := &Block{}
+	for i := range ops {
+		ops[i](b)
 	}
+	return b
 }
 
 type Block struct {
-	ContainerBounds elements.Bounds
+	core.Element
+
 	backgroundColor *color.Color
-	mouse.NopHandler
-	width  float64
-	height float64
-	name   string
+	width, height   int
+	name            string
 }
 
-func (b *Block) Size() (w, h float64) {
-	w, h = b.ContainerBounds.Width, b.ContainerBounds.Height
-	if b.width != 0 {
-		w = b.width
+func (b *Block) Bounds() geo.Bounds {
+	return geo.Bounds{
+		Min:    b.Anchor(),
+		Width:  b.width,
+		Height: b.height,
 	}
-	if b.height != 0 {
-		h = b.height
-	}
-	return
+}
+
+func (b *Block) Size() (w, h int) {
+	return b.width, b.height
 }
 
 func (b *Block) Draw(image *ebiten.Image) {
-	w, h := b.Size()
+	bnd := b.Bounds()
 	if b.backgroundColor != nil {
 		vector.DrawFilledRect(
 			image,
-			float32(b.ContainerBounds.Min.X),
-			float32(b.ContainerBounds.Min.Y),
-			float32(w),
-			float32(h),
+			float32(b.Anchor().X),
+			float32(b.Anchor().Y),
+			float32(bnd.Width),
+			float32(bnd.Height),
 			*b.backgroundColor,
 			true,
 		)

common/elements/v1/blocks/options.go

@@ -1,22 +1,34 @@
 package blocks
 
-import "image/color"
+import (
+	"image/color"
 
-type Option func(*Block)
+	"git.vezzani.net/ben/games/common/elements/v1/core"
+)
 
-func Size(w, h float64) Option {
+type OptFunc func(*Block)
+
+func Core(fs ...core.OptFunc) OptFunc {
+	return func(b *Block) {
+		for _, f := range fs {
+			f(&b.Element)
+		}
+	}
+}
+
+func Size(w, h int) OptFunc {
 	return func(b *Block) {
 		b.width, b.height = w, h
 	}
 }
 
-func BackgroundColor(c color.Color) Option {
+func BackgroundColor(c color.Color) OptFunc {
 	return func(b *Block) {
 		b.backgroundColor = &c
 	}
 }
 
-func Name(n string) Option {
+func Name(n string) OptFunc {
 	return func(b *Block) {
 		b.name = n
 	}

common/elements/v1/buttons/button.go

@@ -1,39 +1,70 @@
 package buttons
 
 import (
-	"git.vezzani.net/ben/games/common/elements/v1"
+	"image/color"
+
 	"git.vezzani.net/ben/games/common/elements/v1/blocks"
 	"git.vezzani.net/ben/games/common/elements/v1/mouse"
+	"git.vezzani.net/ben/games/common/ux/v1"
+
+	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/text"
+	"golang.org/x/image/font"
 )
 
-func New(ops ...Option) elements.InitFunc {
-	return func(bounds elements.Bounds) elements.Element {
-		b := Button{
-			Block: blocks.Block{ContainerBounds: bounds},
-		}
-		for op := range ops {
-			ops[op](&b)
-		}
-
-		return &b
+func New(ops ...OptFunc) *Button {
+	b := Button{
+		Block: blocks.Block{},
+		font:  ux.FontFace,
+		color: ux.FontColor,
 	}
+	for op := range ops {
+		ops[op](&b)
+	}
+
+	return &b
 }
 
 type Button struct {
 	blocks.Block
 
+	label string
+	font  font.Face
+	color color.Color
+
 	onClick     func(ms mouse.State)
 	onMouseDown func(ms mouse.State)
 	onMouseUp   func(ms mouse.State)
 }
 
+func (b *Button) Draw(screen *ebiten.Image) {
+	b.Block.Draw(screen)
+	b.drawLabel(screen)
+}
+
+func (b *Button) drawLabel(screen *ebiten.Image) {
+	if b.label != "" {
+		strBounds, _ := font.BoundString(b.font, b.label)
+
+		textWidth := strBounds.Max.X - strBounds.Min.X
+		textHeight := strBounds.Max.Y - strBounds.Min.Y
+
+		bnd := b.Bounds()
+		tx := bnd.Min.X + (bnd.Width / 2) - (textWidth / 2).Round()
+		ty := bnd.Min.Y + (bnd.Height / 2) - (textHeight / 2).Round()
+
+		text.Draw(screen, b.label, b.font, tx, ty, b.color)
+
+	}
+}
+
 func (b *Button) HandleMouseEvent(ms mouse.State) bool {
-	if !b.Block.ContainerBounds.Contains(elements.Point{
-		X: float64(ms.X),
-		Y: float64(ms.Y),
-	}) {
+	bnd := b.Bounds()
+
+	if !bnd.Contains(ms.Point()) {
 		return false
 	}
+
 	switch {
 	case b.onClick != nil && (ms.RightClicked || ms.LeftClicked):
 		b.onClick(ms)

common/elements/v1/buttons/options.go

@@ -1,32 +1,55 @@
 package buttons
 
 import (
+	"image/color"
+
 	"git.vezzani.net/ben/games/common/elements/v1/blocks"
+	"git.vezzani.net/ben/games/common/elements/v1/core"
 	"git.vezzani.net/ben/games/common/elements/v1/mouse"
 )
 
-type Option func(button *Button)
+type OptFunc func(button *Button)
 
-func OnClick(f func(ms mouse.State)) Option {
+func Core(fs ...core.OptFunc) OptFunc {
+	return func(b *Button) {
+		for _, f := range fs {
+			f(&b.Element)
+		}
+	}
+}
+
+func OnClick(f func(ms mouse.State)) OptFunc {
 	return func(button *Button) {
 		button.onClick = f
 	}
 }
 
-func OnMouseDown(f func(ms mouse.State)) Option {
+func OnMouseDown(f func(ms mouse.State)) OptFunc {
 	return func(button *Button) {
 		button.onMouseDown = f
 	}
 }
 
-func OnMouseUp(f func(ms mouse.State)) Option {
+func OnMouseUp(f func(ms mouse.State)) OptFunc {
 	return func(button *Button) {
 		button.onMouseUp = f
 	}
 }
 
-func BlockOpt(o blocks.Option) Option {
+func BlockOpt(o blocks.OptFunc) OptFunc {
 	return func(s *Button) {
 		o(&s.Block)
 	}
 }
+
+func Label(s string) OptFunc {
+	return func(button *Button) {
+		button.label = s
+	}
+}
+
+func LabelColor(color color.Color) OptFunc {
+	return func(button *Button) {
+		button.color = color
+	}
+}

common/elements/v1/core/config.go

@@ -0,0 +1,17 @@
+package core
+
+import "git.vezzani.net/ben/games/common/elements/v1"
+
+type OptFunc func(*Element)
+
+func Children(children ...elements.Element) OptFunc {
+	return func(c *Element) {
+		c.children = children
+	}
+}
+
+func Name(name string) OptFunc {
+	return func(s *Element) {
+		s.name = name
+	}
+}

common/elements/v1/core/core.go

@@ -0,0 +1,32 @@
+package core
+
+import (
+	"git.vezzani.net/ben/games/common/elements/v1"
+	"git.vezzani.net/ben/games/common/elements/v1/mouse"
+	"git.vezzani.net/ben/games/common/geo"
+)
+
+type Element struct {
+	mouse.NopHandler
+
+	anchor   geo.Point
+	children []elements.Element
+
+	name string // For debugging
+}
+
+func (c *Element) Anchor() geo.Point {
+	return c.anchor
+}
+
+func (c *Element) SetAnchor(a geo.Point) {
+	d := c.Anchor().Delta(a)
+	for _, ch := range c.Children() {
+		ch.SetAnchor(ch.Anchor().Add(d))
+	}
+	c.anchor = a
+}
+
+func (c *Element) Children() []elements.Element {
+	return c.children
+}

common/elements/v1/element.go

@@ -1,26 +1,14 @@
 package elements
 
 import (
+	"git.vezzani.net/ben/games/common/geo"
 	"github.com/hajimehoshi/ebiten/v2"
 )
 
-type InitFunc func(Bounds) Element
-
 type Element interface {
-	Size() (w, h float64)
-
-	Draw(image *ebiten.Image)
-}
-
-type Point struct {
-	X, Y float64
-}
-
-type Bounds struct {
-	Min           Point
-	Width, Height float64
-}
-
-func (b *Bounds) Contains(p Point) bool {
-	return p.X >= b.Min.X && p.X <= b.Min.X+b.Width && p.Y >= b.Min.Y && p.Y <= b.Min.Y+b.Height
+	Draw(*ebiten.Image)
+	SetAnchor(geo.Point)
+	Anchor() geo.Point
+	Size() (w, h int)
+	Children() []Element
 }

common/elements/v1/menu.go

@@ -1 +0,0 @@
-package elements

common/elements/v1/mouse/mouse.go

@@ -2,6 +2,7 @@ package mouse
 
 import (
 	"git.vezzani.net/ben/games/common/elements/v1"
+	"git.vezzani.net/ben/games/common/geo"
 	"github.com/hajimehoshi/ebiten/v2"
 	"github.com/hajimehoshi/ebiten/v2/inpututil"
 )
@@ -12,10 +13,6 @@ func (n NopHandler) HandleMouseEvent(s State) bool {
 	return false
 }
 
-type ChildrenProvider interface {
-	GetChildren() []elements.Element
-}
-
 type EventHandler interface {
 	HandleMouseEvent(s State) bool
 }
@@ -28,6 +25,13 @@ type State struct {
 	Clicked                   bool
 }
 
+func (s *State) Point() geo.Point {
+	return geo.Point{
+		X: s.X,
+		Y: s.Y,
+	}
+}
+
 func Handler(e elements.Element) func() bool {
 	newState := StateBuilder()
 	ms := newState()
@@ -38,11 +42,9 @@ func Handler(e elements.Element) func() bool {
 }
 
 func propagateMouse(e elements.Element, ms State) bool {
-	if p, ok := e.(ChildrenProvider); ok {
-		for _, c := range p.GetChildren() {
-			if propagateMouse(c, ms) {
-				return true
-			}
+	for _, c := range e.Children() {
+		if propagateMouse(c, ms) {
+			return true
 		}
 	}
 

common/elements/v1/stacks/options.go

@@ -1,25 +1,20 @@
 package stacks
 
 import (
-	"git.vezzani.net/ben/games/common/elements/v1"
-	"git.vezzani.net/ben/games/common/elements/v1/blocks"
+	"git.vezzani.net/ben/games/common/elements/v1/core"
 )
 
-type Option func(*Stack)
+type OptFunc func(*Stack)
 
-func BlockOpt(o blocks.Option) Option {
+func Core(fs ...core.OptFunc) OptFunc {
 	return func(s *Stack) {
-		o(&s.Block)
+		for _, f := range fs {
+			f(&s.Element)
+		}
 	}
 }
 
-func Children(children ...elements.InitFunc) Option {
-	return func(s *Stack) {
-		s.childrenInit = children
-	}
-}
-
-func Horizontal() Option {
+func Horizontal() OptFunc {
 	return func(s *Stack) {
 		s.horizontal = true
 	}

common/elements/v1/stacks/stack.go

@@ -1,61 +1,61 @@
 package stacks
 
 import (
-	"git.vezzani.net/ben/games/common/elements/v1"
-	"git.vezzani.net/ben/games/common/elements/v1/blocks"
+	"git.vezzani.net/ben/games/common/elements/v1/core"
 	"git.vezzani.net/ben/games/common/elements/v1/mouse"
 
 	"github.com/hajimehoshi/ebiten/v2"
 )
 
-func New(ops ...Option) elements.InitFunc {
-	return func(d elements.Bounds) elements.Element {
-		s := Stack{
-			Block: blocks.Block{ContainerBounds: d},
-		}
-		for op := range ops {
-			ops[op](&s)
-		}
-
-		d.Width, d.Height = s.Block.Size()
-		if s.horizontal {
-			d.Width /= float64(len(s.childrenInit))
-		} else {
-			d.Height /= float64(len(s.childrenInit))
-		}
-
-		s.Children = make([]elements.Element, len(s.childrenInit))
-		var offsetX, offsetY float64
-		for i := range s.childrenInit {
-			s.Children[i] = s.childrenInit[i](d)
-			offsetX, offsetY = s.Children[i].Size()
-			if s.horizontal {
-				d.Min.X += offsetX
-			} else {
-				d.Min.Y += offsetY
-			}
-		}
-
-		return &s
+func New(ops ...OptFunc) *Stack {
+	s := Stack{}
+	for op := range ops {
+		ops[op](&s)
 	}
+
+	var cw, ch int
+	anchor := s.Anchor()
+	for _, c := range s.Children() {
+		c.SetAnchor(anchor)
+		cw, ch = c.Size()
+		if s.horizontal {
+			anchor.X += cw
+		} else {
+			anchor.Y += ch
+		}
+	}
+
+	return &s
 }
 
 type Stack struct {
-	blocks.Block
+	core.Element
 	mouse.NopHandler
-	horizontal   bool
-	childrenInit []elements.InitFunc
-	Children     []elements.Element
+	horizontal bool
+}
+
+func (s *Stack) Size() (w, h int) {
+	var cw, ch int
+	for _, c := range s.Children() {
+		cw, ch = c.Size()
+		if s.horizontal {
+			w += cw
+			if h < ch {
+				h = ch
+			}
+		} else {
+			h += ch
+			if w < cw {
+				w = cw
+			}
+		}
+	}
+
+	return
 }
 
 func (s *Stack) Draw(image *ebiten.Image) {
-	s.Block.Draw(image)
-
-	for i := range s.Children {
-		s.Children[i].Draw(image)
+	for _, c := range s.Children() {
+		c.Draw(image)
 	}
 }
-
-func (s *Stack) GetChildren() []elements.Element {
-	return s.Children
-}

common/elements/v1/table.go

@@ -1,93 +0,0 @@
-package elements
-
-//
-//import (
-//	"context"
-//	"fmt"
-//
-//	"github.com/hajimehoshi/ebiten/v2"
-//)
-//
-//type Table struct {
-//	mouseHandler
-//	block
-//
-//	ColumnCount int
-//	RowCount    int
-//
-//	Cells []Bounds
-//
-//	Style struct {
-//	}
-//
-//	mouseOverCell int
-//}
-//
-//func (t *Table) HandleClick(ctx context.Context, s MouseState) error {
-//	address := t.getAddressUnderMouse()
-//	if address < 0 || address >= len(t.Cells) {
-//		return fmt.Errorf("cell address under mouse is out of bounds")
-//	}
-//
-//	if clickable, ok := t.Cells[address].(Clickable); ok {
-//		return clickable.HandleClick(s)
-//	}
-//
-//	return nil
-//}
-//
-//func (t *Table) HandleMouseEnter(ctx context.Context, s MouseState) error {
-//	_ = t.mouseHandler.HandleMouseEnter(s)
-//	address := t.getAddressUnderMouse()
-//	if address < 0 || address >= len(t.Cells) {
-//		return fmt.Errorf("cell address under mouse is out of bounds")
-//	}
-//
-//	if mouseable, ok := t.Cells[address].(Mouseable); ok {
-//		s.X -=
-//		return mouseable.HandleMouseEnter(s)
-//	}
-//
-//	return nil
-//}
-//
-//func (t *Table) HandleMouseLeave(ctx context.Context, s MouseState) error {
-//	_ = t.mouseHandler.HandleMouseLeave(s)
-//	return nil
-//}
-//
-//func (t *Table) HandleMouseMove(ctx context.Context, s MouseState) error {
-//	_ = t.mouseHandler.HandleMouseMove(s)
-//	return nil
-//}
-//
-//func (t *Table) HandleMouseDown(ctx context.Context, s MouseState) error {
-//	_ = t.mouseHandler.HandleMouseDown(s)
-//	return nil
-//}
-//
-//func (t *Table) HandleMouseUp(ctx context.Context, s MouseState) error {
-//	_ = t.mouseHandler.HandleMouseUp(s)
-//	return nil
-//}
-//
-//func (t *Table) CellSize() (w, h float32) {
-//	w, h = t.
-//	return w / float32(t.ColumnCount), h / float32(t.RowCount)
-//}
-//
-//func (t *Table) CellZero(ctx context.Context, addr int) (x, y float32) {
-//	x, y = GetZero(ctx)
-//	w, h := t.CellSize(ctx)
-//
-//	col, row := addr%t.ColumnCount, addr/t.ColumnCount
-//	return x + float32(col)*w, y + float32(row) + h
-//}
-//
-//func (t *Table) Draw(screen *ebiten.Image, zx, zy float64) error {
-//	return nil
-//}
-//
-//func (t *Table) getAddressUnderMouse() int {
-//	return int(t.mouseState.Y)*t.RowCount + int(t.mouseState.X)
-//}

common/elements/v1/tables/config.go

@@ -0,0 +1,3 @@
+package tables
+
+type OptFunc func(*Table)

common/elements/v1/tables/table.go

@@ -0,0 +1,19 @@
+package tables
+
+import (
+	"git.vezzani.net/ben/games/common/elements/v1/core"
+)
+
+type Table struct {
+	core.Element
+}
+
+func New(ops ...OptFunc) *Table {
+	t := &Table{}
+
+	for i := range ops {
+		ops[i](t)
+	}
+
+	return t
+}

common/geo/bounds.go

@@ -0,0 +1,10 @@
+package geo
+
+type Bounds struct {
+	Min           Point
+	Width, Height int
+}
+
+func (b *Bounds) Contains(p Point) bool {
+	return p.X >= b.Min.X && p.X <= b.Min.X+b.Width && p.Y >= b.Min.Y && p.Y <= b.Min.Y+b.Height
+}

common/geo/point.go

@@ -0,0 +1,19 @@
+package geo
+
+type Point struct {
+	X, Y int
+}
+
+func (p Point) Delta(p2 Point) Point {
+	return Point{
+		X: p2.X - p.X,
+		Y: p2.Y - p.Y,
+	}
+}
+
+func (p Point) Add(p2 Point) Point {
+	return Point{
+		X: p.X + p2.X,
+		Y: p.Y + p2.Y,
+	}
+}

common/ux/v1/ux.go

@@ -9,6 +9,7 @@ import (
 
 var (
 	FontFace        font.Face   = basicfont.Face7x13
+	FontColor       color.Color = color.Black
 	BackgroundColor color.Color = color.White
 	Scale           float64     = 1.0
 )

games/minesweeper/v2/game/game.go

@@ -0,0 +1,229 @@
+package game
+
+import (
+	"image/color"
+	"math/rand"
+	"strconv"
+
+	"git.vezzani.net/ben/games/common/colors"
+	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/inpututil"
+	"github.com/hajimehoshi/ebiten/v2/text"
+	"github.com/hajimehoshi/ebiten/v2/vector"
+	"golang.org/x/image/font/basicfont"
+)
+
+type mouseButton int
+
+const (
+	cellSize        = 32
+	borderThickness = 1
+
+	sideMargin   = cellSize
+	topMargin    = cellSize * 2
+	bottomMargin = cellSize
+
+	left mouseButton = iota
+	right
+)
+
+var (
+	backgroundColor = colors.FromInt(0xffffff)
+	borderColor     = colors.FromInt(0x999999)
+	revealedColor   = colors.FromInt(0xdddddd)
+	downColor       = colors.FromInt(0xaaaaaa)
+
+	dangerColors = [8]color.Color{
+		colors.FromInt(0x000000),
+		colors.FromInt(0x440000),
+		colors.FromInt(0x880000),
+		colors.FromInt(0xaa0000),
+		colors.FromInt(0xcc0000),
+		colors.FromInt(0xdd0000),
+		colors.FromInt(0xee0000),
+		colors.FromInt(0xff0000),
+	}
+
+	cols, rows int32
+
+	board []square
+
+	leftDown, rightDown       bool
+	leftClicked, rightClicked bool
+
+	mouseX, mouseY int
+
+	over bool
+)
+
+type square struct {
+	mined    bool
+	revealed bool
+	danger   uint8
+}
+
+func New(colCount, rowCount, mineCount int32) *Core {
+	cols = colCount
+	rows = rowCount
+	board = make([]square, cols*rows)
+	for range mineCount {
+		addr := rand.Int31n(cols * rows)
+		for board[addr].mined {
+			addr = rand.Int31n(cols * rows)
+		}
+		board[addr].mined = true
+	}
+
+	initDanger()
+
+	return &Core{}
+}
+
+type Core struct{}
+
+func (c Core) Update() error {
+	mouseX, mouseY = ebiten.CursorPosition()
+	if inpututil.IsMouseButtonJustPressed(ebiten.MouseButtonLeft) {
+		leftDown = true
+	}
+	if inpututil.IsMouseButtonJustPressed(ebiten.MouseButtonRight) {
+		rightDown = true
+	}
+
+	if inpututil.IsMouseButtonJustReleased(ebiten.MouseButtonLeft) {
+		leftDown = false
+		if !rightDown {
+			handleClick(left)
+		}
+	}
+	if inpututil.IsMouseButtonJustReleased(ebiten.MouseButtonRight) {
+		rightDown = false
+		if !leftDown {
+			handleClick(right)
+		}
+	}
+
+	return nil
+}
+
+func (c Core) Draw(screen *ebiten.Image) {
+	maxX, maxY := c.Layout(0, 0)
+	vector.DrawFilledRect(screen, 0, 0, float32(maxX), float32(maxY), backgroundColor, false)
+
+	drawGrid(screen)
+}
+
+func (c Core) Layout(_, _ int) (screenWidth, screenHeight int) {
+	return int(cellSize*cols + sideMargin*2), int(cellSize*rows + topMargin + bottomMargin)
+}
+
+func drawGrid(screen *ebiten.Image) {
+	vector.StrokeRect(screen, sideMargin, topMargin, float32(cellSize*cols), float32(cellSize*rows), borderThickness, borderColor, false)
+
+	mouseSquare := int32(-1)
+
+	if leftDown || rightDown {
+		mouseSquare = mouseOverSquare()
+	}
+
+	for i := range rows * cols {
+		clr := backgroundColor
+		if board[i].revealed {
+			clr = revealedColor
+		} else {
+			if mouseSquare == i {
+				clr = downColor
+			}
+		}
+		x, y, w, h := getCellSquare(i)
+		vector.DrawFilledRect(screen, x, y, w, h, clr, false)
+		vector.StrokeRect(screen, x, y, w, h, borderThickness, borderColor, false)
+		if board[i].revealed && board[i].danger > 0 {
+			txt := strconv.Itoa(int(board[i].danger))
+
+			text.Draw(screen, txt, basicfont.Face7x13, int(x)+12, int(y)+20, dangerColors[board[i].danger])
+		}
+	}
+}
+
+func mouseOverSquare() int32 {
+	if int32(mouseX) < sideMargin ||
+		int32(mouseY) < topMargin ||
+		int32(mouseX) > sideMargin+cellSize*cols ||
+		int32(mouseX) > topMargin+cellSize*rows {
+		return -1
+	}
+
+	baseMouseX := (int32(mouseX) - sideMargin) / cellSize
+	baseMouseY := (int32(mouseY) - topMargin) / cellSize
+
+	return baseMouseY*rows + baseMouseX
+}
+
+func getCellSquare(addr int32) (float32, float32, float32, float32) {
+	c, r := float32(addr%cols), float32(addr/rows)
+	return sideMargin + c*cellSize, topMargin + r*cellSize, cellSize, cellSize
+}
+
+func handleClick(side mouseButton) {
+	sq := mouseOverSquare()
+	if sq == -1 {
+		return
+	}
+
+	if side == left {
+		if board[sq].mined {
+
+		} else {
+			reveal(sq)
+		}
+	}
+}
+
+func reveal(addr int32) {
+	if board[addr].revealed {
+		return
+	}
+	board[addr].revealed = true
+	for _, nAddr := range getNeighbors(addr) {
+		if board[nAddr].revealed || board[nAddr].mined {
+			continue
+		}
+		reveal(nAddr)
+	}
+}
+
+func getNeighbors(addr int32) []int32 {
+	ns := make([]int32, 0)
+	sides := make([]int32, 0)
+	c, r := addr%cols, addr/rows
+	if c > 0 {
+		sides = append(sides, addr-1)
+	}
+	if c < cols-1 {
+		sides = append(sides, addr+1)
+	}
+	if r > 0 {
+		ns = append(ns, addr-cols)
+		for _, s := range sides {
+			ns = append(ns, s-cols)
+		}
+	}
+	if r < rows-1 {
+		ns = append(ns, addr+cols)
+		for _, s := range sides {
+			ns = append(ns, s+cols)
+		}
+	}
+	return append(ns, sides...)
+}
+
+func initDanger() {
+	for i := range board {
+		for _, n := range getNeighbors(int32(i)) {
+			if board[n].mined {
+				board[i].danger++
+			}
+		}
+	}
+}

games/minesweeper/v2/main.go

@@ -0,0 +1 @@
+package v2

tools/component_test/editor.go

@@ -1,43 +1,55 @@
 package main
 
 import (
-	"image/color"
-
-	"git.vezzani.net/ben/games/common/elements/v1"
 	"git.vezzani.net/ben/games/common/elements/v1/blocks"
 	"git.vezzani.net/ben/games/common/elements/v1/buttons"
+	"git.vezzani.net/ben/games/common/elements/v1/core"
 	"git.vezzani.net/ben/games/common/elements/v1/mouse"
 	"git.vezzani.net/ben/games/common/elements/v1/stacks"
+	"git.vezzani.net/ben/games/common/geo"
 	"git.vezzani.net/ben/games/common/sprites/v1"
+
 	"github.com/hajimehoshi/ebiten/v2"
 	"golang.org/x/image/colornames"
 )
 
 var root = stacks.New(
 	stacks.Horizontal(),
-	stacks.BlockOpt(blocks.BackgroundColor(color.White)),
-	stacks.BlockOpt(blocks.Size(200, 200)),
-	stacks.BlockOpt(blocks.Name("parent")),
-	stacks.Children(
+	stacks.Core(core.Name("parent")),
+	stacks.Core(core.Children(
 		stacks.New(
-			stacks.BlockOpt(blocks.Name("left")),
-			stacks.Children(
-				buttons.New(
-					buttons.BlockOpt(blocks.BackgroundColor(colornames.Green)),
-					buttons.OnClick(func(ms mouse.State) {
-						println("green")
-					}),
+			stacks.Core(
+				core.Name("left"),
+				core.Children(
+					buttons.New(
+						buttons.BlockOpt(blocks.Size(100, 100)),
+						buttons.Label("hello"),
+						buttons.BlockOpt(blocks.BackgroundColor(colornames.Green)),
+						buttons.OnClick(func(ms mouse.State) {
+							println("green")
+						}),
+					),
+					blocks.New(
+						blocks.Size(100, 100),
+						blocks.BackgroundColor(colornames.Yellow),
+					),
 				),
-				blocks.New(blocks.BackgroundColor(colornames.Yellow)),
-			)),
-		stacks.New(
-			stacks.BlockOpt(blocks.Name("right")),
-			stacks.Children(
-				blocks.New(blocks.BackgroundColor(colornames.Blue)),
-				blocks.New(blocks.BackgroundColor(colornames.Red)),
 			),
 		),
-	),
+		stacks.New(
+			stacks.Core(core.Name("right")),
+			stacks.Core(core.Children(
+				blocks.New(
+					blocks.Size(100, 100),
+					blocks.BackgroundColor(colornames.Blue),
+				),
+				blocks.New(
+					blocks.Size(100, 100),
+					blocks.BackgroundColor(colornames.Red),
+				),
+			)),
+		),
+	)),
 )
 
 func newEditor() *editor {
@@ -45,8 +57,7 @@ func newEditor() *editor {
 }
 
 type editor struct {
-	root        elements.Element
-	bounds      elements.Bounds
+	bounds      geo.Bounds
 	handleMouse func() bool
 }
 
@@ -57,18 +68,17 @@ func (e *editor) Update() error {
 }
 
 func (e *editor) Draw(screen *ebiten.Image) {
-	e.root.Draw(screen)
+	root.Draw(screen)
 }
 
 func (e *editor) Layout(outsideWidth, outsideHeight int) (screenWidth, screenHeight int) {
-	if e.bounds.Width != float64(outsideWidth) || e.bounds.Height != float64(outsideHeight) {
-		e.bounds = elements.Bounds{
-			Min:    elements.Point{},
-			Width:  float64(outsideWidth),
-			Height: float64(outsideHeight),
+	if e.bounds.Width != outsideWidth || e.bounds.Height != outsideHeight {
+		e.bounds = geo.Bounds{
+			Min:    geo.Point{},
+			Width:  outsideWidth,
+			Height: outsideHeight,
 		}
-		e.root = root(e.bounds)
-		e.handleMouse = mouse.Handler(e.root)
+		e.handleMouse = mouse.Handler(root)
 	}
 
 	return outsideWidth, outsideHeight