wip I guess

common/elements/v1/base/base.go

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

common/elements/v1/base/config.go

@@ -0,0 +1,29 @@
+package base
+
+import (
+	"image/color"
+
+	"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
+	}
+}
+
+func (b elements.Builder) BackgroundColor(c color.Color) elements.Builder {
+	return func() elements.Element {
+		ce := b().(*Element)
+		ce.backgroundColor = c
+		return ce
+	}
+}

common/elements/v1/blocks/block.go

@@ -1,32 +1,33 @@
 package blocks
 
 import (
-	"image/color"
+	"git.vezzani.net/ben/games/common/elements/v1"
+	"git.vezzani.net/ben/games/common/elements/v1/base"
 
-	"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 ...OptFunc) *Block {
+type Builder elements.Builder
-	b := &Block{}
+
+func New(ops ...OptFunc) Builder {
+	return func() elements.Element {
+		b := Block{}
 		for i := range ops {
-		ops[i](b)
+			ops[i](&b)
+		}
+		return &b
 	}
-	return b
 }
 
 type Block struct {
-	core.Element
+	base.Element
-
-	backgroundColor *color.Color
 	width, height int
 	name          string
 }
 
-func (b *Block) Bounds() geo.Bounds {
+func (b *Block) Bounds() elements.Bounds {
-	return geo.Bounds{
+	return elements.Bounds{
 		Min:    b.Anchor(),
 		Width:  b.width,
 		Height: b.height,
@@ -39,7 +40,7 @@ func (b *Block) Size() (w, h int) {
 
 func (b *Block) Draw(image *ebiten.Image) {
 	bnd := b.Bounds()
-	if b.backgroundColor != nil {
+	if b.BackgroundColor() != nil {
 		vector.DrawFilledRect(
 			image,
 			float32(b.Anchor().X),

common/elements/v1/blocks/options.go

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

common/elements/v1/buttons/button.go

@@ -3,6 +3,7 @@ package buttons
 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/mouse"
 	"git.vezzani.net/ben/games/common/ux/v1"
@@ -12,7 +13,7 @@ import (
 	"golang.org/x/image/font"
 )
 
-func New(ops ...OptFunc) *Button {
+func New(ops ...OptFunc) elements.Element {
 	b := Button{
 		Block: blocks.Block{},
 		font:  ux.FontFace,

common/elements/v1/buttons/options.go

@@ -3,19 +3,17 @@ package buttons
 import (
 	"image/color"
 
+	"git.vezzani.net/ben/games/common/elements/v1/base"
 	"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 OptFunc func(button *Button)
 
-func Core(fs ...core.OptFunc) OptFunc {
+func Core(f base.OptFunc) OptFunc {
 	return func(b *Button) {
-		for _, f := range fs {
 		f(&b.Element)
 	}
-	}
 }
 
 func OnClick(f func(ms mouse.State)) OptFunc {

common/elements/v1/core/config.go

@@ -1,17 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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,14 +1,42 @@
 package elements
 
 import (
-	"git.vezzani.net/ben/games/common/geo"
 	"github.com/hajimehoshi/ebiten/v2"
 )
 
 type Element interface {
 	Draw(*ebiten.Image)
-	SetAnchor(geo.Point)
+	SetAnchor(Point)
-	Anchor() geo.Point
+	Anchor() Point
 	Size() (w, h int)
 	Children() []Element
 }
+
+type Builder func() Element
+
+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,
+	}
+}
+
+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/elements/v1/mouse/mouse.go

@@ -2,7 +2,6 @@ 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"
 )
@@ -25,8 +24,8 @@ type State struct {
 	Clicked                   bool
 }
 
-func (s *State) Point() geo.Point {
+func (s *State) Point() elements.Point {
-	return geo.Point{
+	return elements.Point{
 		X: s.X,
 		Y: s.Y,
 	}

common/elements/v1/stacks/options.go

@@ -1,16 +1,14 @@
 package stacks
 
 import (
-	"git.vezzani.net/ben/games/common/elements/v1/core"
+	"git.vezzani.net/ben/games/common/elements/v1/base"
 )
 
 type OptFunc func(*Stack)
 
-func Core(fs ...core.OptFunc) OptFunc {
+func Core(f base.OptFunc) OptFunc {
 	return func(s *Stack) {
-		for _, f := range fs {
+		f(&s.Base)
-			f(&s.Element)
-		}
 	}
 }
 

common/elements/v1/stacks/stack.go

@@ -1,13 +1,13 @@
 package stacks
 
 import (
-	"git.vezzani.net/ben/games/common/elements/v1/core"
+	"git.vezzani.net/ben/games/common/elements/v1"
 	"git.vezzani.net/ben/games/common/elements/v1/mouse"
 
 	"github.com/hajimehoshi/ebiten/v2"
 )
 
-func New(ops ...OptFunc) *Stack {
+func New(ops ...OptFunc) elements.Element {
 	s := Stack{}
 	for op := range ops {
 		ops[op](&s)
@@ -29,7 +29,7 @@ func New(ops ...OptFunc) *Stack {
 }
 
 type Stack struct {
-	core.Element
+	elements.Base
 	mouse.NopHandler
 	horizontal bool
 }

common/elements/v1/tables/config.go

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

common/elements/v1/tables/table.go

@@ -1,19 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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,
-	}
-}

games/minesweeper/v2/game/game.go

@@ -1,229 +0,0 @@
-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

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

tools/component_test/editor.go

@@ -1,64 +1,65 @@
 package main
 
 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/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(
+//var root = stacks.New(
-	stacks.Horizontal(),
+//	stacks.Horizontal(),
-	stacks.Core(core.Name("parent")),
+//	//stacks.Element(blocks.BackgroundColor(color.White)),
-	stacks.Core(core.Children(
+//	stacks.Element(elements.Name("parent")),
-		stacks.New(
+//	stacks.Element(elements.Children(
-			stacks.Core(
+//		stacks.New(
-				core.Name("left"),
+//			stacks.Element(elements.Name("left")),
-				core.Children(
+//			stacks.Element(elements.Children(
-					buttons.New(
+//				buttons.New(
-						buttons.BlockOpt(blocks.Size(100, 100)),
+//					buttons.BlockOpt(blocks.Size(100, 100)),
-						buttons.Label("hello"),
+//					buttons.Label("hello"),
-						buttons.BlockOpt(blocks.BackgroundColor(colornames.Green)),
+//					buttons.BlockOpt(blocks.BackgroundColor(colornames.Green)),
-						buttons.OnClick(func(ms mouse.State) {
+//					buttons.OnClick(func(ms mouse.State) {
-							println("green")
+//						println("green")
-						}),
+//					}),
-					),
+//				),
-					blocks.New(
+//				blocks.New(
-						blocks.Size(100, 100),
+//					blocks.Size(100, 100),
-						blocks.BackgroundColor(colornames.Yellow),
+//					blocks.BackgroundColor(colornames.Yellow),
-					),
+//				),
-				),
+//			)),
-			),
+//		),
-		),
+//		stacks.New(
-		stacks.New(
+//			stacks.Element(elements.Name("right")),
-			stacks.Core(core.Name("right")),
+//			stacks.Element(elements.Children(
-			stacks.Core(core.Children(
+//				blocks.New(
-				blocks.New(
+//					blocks.Size(100, 100),
-					blocks.Size(100, 100),
+//					blocks.BackgroundColor(colornames.Blue),
-					blocks.BackgroundColor(colornames.Blue),
+//				),
-				),
+//				blocks.New(
-				blocks.New(
+//					blocks.Size(100, 100),
-					blocks.Size(100, 100),
+//					blocks.BackgroundColor(colornames.Red),
-					blocks.BackgroundColor(colornames.Red),
+//				),
-				),
+//			)),
-			)),
+//		),
-		),
+//	)),
-	)),
+//)
-)
+
+var root = blocks.New().
+	Size(100, 100).
+	BackgroundColor(colornames.Red)
 
 func newEditor() *editor {
 	return &editor{}
 }
 
 type editor struct {
-	bounds      geo.Bounds
+	bounds      elements.Bounds
 	handleMouse func() bool
+	root        elements.Element
 }
 
 func (e *editor) Update() error {
@@ -68,17 +69,18 @@ func (e *editor) Update() error {
 }
 
 func (e *editor) Draw(screen *ebiten.Image) {
-	root.Draw(screen)
+	e.root.Draw(screen)
 }
 
 func (e *editor) Layout(outsideWidth, outsideHeight int) (screenWidth, screenHeight int) {
 	if e.bounds.Width != outsideWidth || e.bounds.Height != outsideHeight {
-		e.bounds = geo.Bounds{
+		e.bounds = elements.Bounds{
-			Min:    geo.Point{},
+			Min:    elements.Point{},
 			Width:  outsideWidth,
 			Height: outsideHeight,
 		}
-		e.handleMouse = mouse.Handler(root)
+		e.root = root()
+		e.handleMouse = mouse.Handler(e.root)
 	}
 
 	return outsideWidth, outsideHeight