From 4efa8d00fcae0fb5882ddbf5796008cc3374811b Mon Sep 17 00:00:00 2001
From: Noah Petherbridge <root@kirsle.net>
Date: Wed, 4 May 2022 22:38:26 -0700
Subject: [PATCH] Fancy Mouse Cursors

The gamepad mouse cursor has become THE mouse cursor. It is always visible and your
real cursor is hidden, and this way the game can swap out other cursors for certain
scenarios:

* The Pencil Tool in the editor will use a pencil cursor over the level canvas.
* The Flood Tool has a custom Flood cursor so you don't forget it's selected!

Other improvements:

* The Palette buttons in the editor now render using their swatch's pattern
  instead of only using its color.
* If you have an ultra HD monitor and open a Bounded level in the editor which
  is too small to fill your screen, the editor canvas limits its size to fit
  the level (preferable over showing parts of the level you can't actually play
  as it's out of bounds).
* The "brush size" box is only drawn around the cursor when a relevant tool is
  selected (Pencil, Line, Rect, Ellipse, Eraser)
---
 assets/sprites/flood-cursor.png | Bin 0 -> 7899 bytes
 assets/sprites/pencil.png       | Bin 0 -> 8065 bytes
 cmd/doodle/main.go              |   4 ++
 pkg/balance/theme.go            |   6 ++-
 pkg/cursor/cursor.go            |  86 ++++++++++++++++++++++++++++++++
 pkg/doodle.go                   |   5 +-
 pkg/editor_scene.go             |   4 ++
 pkg/editor_ui.go                |  18 ++++++-
 pkg/editor_ui_palette.go        |  18 ++++---
 pkg/uix/canvas.go               |   5 ++
 pkg/uix/canvas_cursor.go        |  53 +++++++++++++++-----
 11 files changed, 176 insertions(+), 23 deletions(-)
 create mode 100644 assets/sprites/flood-cursor.png
 create mode 100644 assets/sprites/pencil.png
 create mode 100644 pkg/cursor/cursor.go

diff --git a/assets/sprites/flood-cursor.png b/assets/sprites/flood-cursor.png
new file mode 100644
index 0000000000000000000000000000000000000000..74df9292f5d201e4d4b299756c30a4db29e59414
GIT binary patch
literal 7899
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
F{tv%sMl1jT

literal 0
HcmV?d00001

diff --git a/assets/sprites/pencil.png b/assets/sprites/pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..7811e10fd5df6ed66627681fcbf7a38f50c24043
GIT binary patch
literal 8065
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
CxtGTP

literal 0
HcmV?d00001

diff --git a/cmd/doodle/main.go b/cmd/doodle/main.go
index ef2efc5..eb2a0ff 100644
--- a/cmd/doodle/main.go
+++ b/cmd/doodle/main.go
@@ -199,6 +199,10 @@ func main() {
 		game := doodle.New(c.Bool("debug"), engine)
 		game.SetupEngine()
 
+		// Hide the mouse cursor over the window, we draw our own
+		// sprite image for it.
+		engine.ShowCursor(false)
+
 		// Set the app window icon.
 		if engine, ok := game.Engine.(*sdl.Renderer); ok {
 			if icon, err := sprites.LoadImage(game.Engine, balance.WindowIcon); err == nil {
diff --git a/pkg/balance/theme.go b/pkg/balance/theme.go
index cffefb2..c0e0070 100644
--- a/pkg/balance/theme.go
+++ b/pkg/balance/theme.go
@@ -14,7 +14,11 @@ var (
 	GoldCoin   = "assets/sprites/gold.png"
 	SilverCoin = "assets/sprites/silver.png"
 	LockIcon   = "assets/sprites/padlock.png"
-	CursorIcon = "assets/sprites/pointer.png"
+
+	// Cursors
+	CursorIcon  = "assets/sprites/pointer.png"
+	PencilIcon  = "assets/sprites/pencil.png"
+	FloodCursor = "assets/sprites/flood-cursor.png"
 
 	// Title Screen Font
 	TitleScreenFont = render.Text{
diff --git a/pkg/cursor/cursor.go b/pkg/cursor/cursor.go
new file mode 100644
index 0000000..a7d9e7c
--- /dev/null
+++ b/pkg/cursor/cursor.go
@@ -0,0 +1,86 @@
+// Package cursor handles custom mouse cursor sprite images.
+package cursor
+
+import (
+	"git.kirsle.net/apps/doodle/pkg/balance"
+	"git.kirsle.net/apps/doodle/pkg/log"
+	"git.kirsle.net/apps/doodle/pkg/shmem"
+	"git.kirsle.net/apps/doodle/pkg/sprites"
+	"git.kirsle.net/go/render"
+	"git.kirsle.net/go/ui"
+)
+
+type Cursor struct {
+	Filename string
+	Sprite   *ui.Image
+	Offset   render.Point
+}
+
+// Current selected cursor to draw on screen.
+var Current *Cursor
+
+// NoCursor hides the cursor entirely.
+var NoCursor = &Cursor{}
+
+// Draw the cursor on screen.
+func Draw(e render.Engine) {
+	if Current == nil {
+		Current = NewPointer(e)
+	}
+
+	if Current.Sprite != nil {
+		Current.Sprite.Present(e, shmem.Cursor)
+	}
+}
+
+// NewPointer initializes the default pointer cursor.
+func NewPointer(e render.Engine) *Cursor {
+	if pointer != nil {
+		return pointer
+	}
+	img, err := sprites.LoadImage(e, balance.CursorIcon)
+	if err != nil {
+		log.Error("NewPointer: %s", err)
+	}
+	return &Cursor{
+		Filename: balance.CursorIcon,
+		Sprite:   img,
+	}
+}
+
+// NewPencil initializes the pencil cursor.
+func NewPencil(e render.Engine) *Cursor {
+	if pencil != nil {
+		return pencil
+	}
+	img, err := sprites.LoadImage(e, balance.PencilIcon)
+	if err != nil {
+		log.Error("NewPencil: %s", err)
+	}
+	return &Cursor{
+		Filename: balance.PencilIcon,
+		Sprite:   img,
+	}
+}
+
+// NewFlood initializes the Flood cursor.
+func NewFlood(e render.Engine) *Cursor {
+	if pencil != nil {
+		return pencil
+	}
+	img, err := sprites.LoadImage(e, balance.FloodCursor)
+	if err != nil {
+		log.Error("NewFlood: %s", err)
+	}
+	return &Cursor{
+		Filename: balance.FloodCursor,
+		Sprite:   img,
+	}
+}
+
+// Cached singletons of the cursors.
+var (
+	pointer *Cursor
+	pencil  *Cursor
+	flood   *Cursor
+)
diff --git a/pkg/doodle.go b/pkg/doodle.go
index 3b7ec3a..09dfe55 100644
--- a/pkg/doodle.go
+++ b/pkg/doodle.go
@@ -9,6 +9,7 @@ import (
 
 	"git.kirsle.net/apps/doodle/pkg/balance"
 	"git.kirsle.net/apps/doodle/pkg/branding"
+	"git.kirsle.net/apps/doodle/pkg/cursor"
 	"git.kirsle.net/apps/doodle/pkg/enum"
 	"git.kirsle.net/apps/doodle/pkg/gamepad"
 	"git.kirsle.net/apps/doodle/pkg/keybind"
@@ -209,8 +210,8 @@ func (d *Doodle) Run() error {
 		// Draw the debug overlay over all scenes.
 		d.DrawDebugOverlay()
 
-		// Let the gamepad controller draw in case of MouseMode to show the cursor.
-		gamepad.Draw(d.Engine)
+		// Draw our custom mouse cursor to the screen.
+		cursor.Draw(d.Engine)
 
 		// Render the pixels to the screen.
 		err = d.Engine.Present()
diff --git a/pkg/editor_scene.go b/pkg/editor_scene.go
index 9849596..80daa11 100644
--- a/pkg/editor_scene.go
+++ b/pkg/editor_scene.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"git.kirsle.net/apps/doodle/pkg/balance"
+	"git.kirsle.net/apps/doodle/pkg/cursor"
 	"git.kirsle.net/apps/doodle/pkg/doodads"
 	"git.kirsle.net/apps/doodle/pkg/drawtool"
 	"git.kirsle.net/apps/doodle/pkg/enum"
@@ -609,5 +610,8 @@ func (s *EditorScene) Destroy() error {
 	// their bitmaps cached and will regen the textures as needed.
 	s.UI.Teardown()
 
+	// Reset the cursor to default.
+	cursor.Current = cursor.NewPointer(s.d.Engine)
+
 	return nil
 }
diff --git a/pkg/editor_ui.go b/pkg/editor_ui.go
index 140e330..a79f3d9 100644
--- a/pkg/editor_ui.go
+++ b/pkg/editor_ui.go
@@ -395,6 +395,7 @@ func (u *EditorUI) SetupWorkspace(d *Doodle) *ui.Frame {
 func (u *EditorUI) SetupCanvas(d *Doodle) *uix.Canvas {
 	drawing := uix.NewCanvas(balance.ChunkSize, true)
 	drawing.Name = "edit-canvas"
+	drawing.FancyCursors = true
 	drawing.Palette = level.DefaultPalette()
 	drawing.SetBackground(render.White)
 	if len(drawing.Palette.Swatches) > 0 {
@@ -517,7 +518,22 @@ func (u *EditorUI) SetupCanvas(d *Doodle) *uix.Canvas {
 // _wanted_ to be smaller, as in Doodad Editing Mode.
 func (u *EditorUI) ExpandCanvas(e render.Engine) {
 	if u.Scene.DrawingType == enum.LevelDrawing {
-		u.Canvas.Resize(u.Workspace.Size())
+		var (
+			workspaceSize = u.Workspace.Size()
+			maxSize       = workspaceSize
+		)
+
+		// If the level is bounded make that the max canvas size.
+		if u.Scene.Level != nil && u.Scene.Level.PageType >= level.Bounded {
+			if u.Scene.Level.MaxWidth < int64(maxSize.W) {
+				maxSize.W = int(u.Scene.Level.MaxWidth)
+			}
+			if u.Scene.Level.MaxHeight < int64(maxSize.H) {
+				maxSize.H = int(u.Scene.Level.MaxHeight)
+			}
+		}
+
+		u.Canvas.Resize(maxSize)
 	} else {
 		// Size is managed externally.
 	}
diff --git a/pkg/editor_ui_palette.go b/pkg/editor_ui_palette.go
index 4c1c76d..d0fc456 100644
--- a/pkg/editor_ui_palette.go
+++ b/pkg/editor_ui_palette.go
@@ -4,8 +4,11 @@ import (
 	"fmt"
 
 	"git.kirsle.net/apps/doodle/pkg/balance"
+	"git.kirsle.net/apps/doodle/pkg/level"
 	"git.kirsle.net/apps/doodle/pkg/log"
+	"git.kirsle.net/apps/doodle/pkg/uix"
 	"git.kirsle.net/apps/doodle/pkg/usercfg"
+	"git.kirsle.net/go/render"
 	"git.kirsle.net/go/ui"
 )
 
@@ -94,12 +97,15 @@ func (u *EditorUI) setupPaletteFrame(window *ui.Window) *ui.Frame {
 				frame.Pack(row, packConfig)
 			}
 
-			colorbox := ui.NewFrame(swatch.Name)
-			colorbox.Configure(ui.Config{
-				Width:      width,
-				Height:     width,
-				Background: swatch.Color,
-			})
+			// Fancy colorbox: show the color AND the texture of each swatch.
+			var (
+				colorbox = uix.NewCanvas(width, false)
+				chunker  = level.NewChunker(width)
+				size     = render.NewRect(width, width)
+			)
+			chunker.SetRect(size, swatch)
+			colorbox.Resize(size)
+			colorbox.Load(u.Canvas.Palette, chunker)
 
 			btn := ui.NewRadioButton("palette", &u.selectedSwatch, swatch.Name, colorbox)
 			btn.Configure(ui.Config{
diff --git a/pkg/uix/canvas.go b/pkg/uix/canvas.go
index ab3b4b4..0560711 100644
--- a/pkg/uix/canvas.go
+++ b/pkg/uix/canvas.go
@@ -7,6 +7,7 @@ import (
 
 	"git.kirsle.net/apps/doodle/pkg/balance"
 	"git.kirsle.net/apps/doodle/pkg/collision"
+	"git.kirsle.net/apps/doodle/pkg/cursor"
 	"git.kirsle.net/apps/doodle/pkg/doodads"
 	"git.kirsle.net/apps/doodle/pkg/drawtool"
 	"git.kirsle.net/apps/doodle/pkg/filesystem"
@@ -56,6 +57,10 @@ type Canvas struct {
 	// NoLimitScroll suppresses the scroll limit for bounded levels.
 	NoLimitScroll bool
 
+	// Show custom mouse cursors over this canvas (eg. editor tools)
+	FancyCursors bool
+	cursor       *cursor.Cursor
+
 	// Underlying chunk data for the drawing.
 	level    *level.Level
 	chunks   *level.Chunker
diff --git a/pkg/uix/canvas_cursor.go b/pkg/uix/canvas_cursor.go
index 547b015..1dfdd5a 100644
--- a/pkg/uix/canvas_cursor.go
+++ b/pkg/uix/canvas_cursor.go
@@ -1,6 +1,8 @@
 package uix
 
 import (
+	"git.kirsle.net/apps/doodle/pkg/cursor"
+	"git.kirsle.net/apps/doodle/pkg/drawtool"
 	"git.kirsle.net/apps/doodle/pkg/shmem"
 	"git.kirsle.net/go/render"
 	"git.kirsle.net/go/ui"
@@ -27,24 +29,49 @@ func (w *Canvas) IsCursorOver() bool {
 // brush size, and draws a "preview rect" under the cursor of how big a click
 // will be at that size.
 func (w *Canvas) presentCursor(e render.Engine) {
+	// Are we to show a custom mouse cursor?
+	if w.FancyCursors {
+		switch w.Tool {
+		case drawtool.PencilTool:
+			w.cursor = cursor.NewPencil(e)
+		case drawtool.FloodTool:
+			w.cursor = cursor.NewFlood(e)
+		default:
+			w.cursor = nil
+		}
+
+		if w.IsCursorOver() && w.cursor != nil {
+			cursor.Current = w.cursor
+		} else {
+			cursor.Current = cursor.NewPointer(e)
+		}
+	}
+
 	if !w.IsCursorOver() {
 		return
 	}
 
 	// Are we editing with a thick brush?
-	if w.BrushSize > 0 {
-		var r = w.BrushSize
-		rect := render.Rect{
-			X: shmem.Cursor.X - r,
-			Y: shmem.Cursor.Y - r,
-			W: r * 2,
-			H: r * 2,
+	if w.Tool == drawtool.LineTool || w.Tool == drawtool.RectTool ||
+		w.Tool == drawtool.PencilTool || w.Tool == drawtool.EllipseTool ||
+		w.Tool == drawtool.EraserTool {
+
+		// Draw a box where the brush size is.
+		if w.BrushSize > 0 {
+			var r = w.BrushSize
+			rect := render.Rect{
+				X: shmem.Cursor.X - r,
+				Y: shmem.Cursor.Y - r,
+				W: r * 2,
+				H: r * 2,
+			}
+			e.DrawRect(render.Black, rect)
+			rect.X++
+			rect.Y++
+			rect.W -= 2
+			rect.H -= 2
+			e.DrawRect(render.RGBA(153, 153, 153, 153), rect)
 		}
-		e.DrawRect(render.Black, rect)
-		rect.X++
-		rect.Y++
-		rect.W -= 2
-		rect.H -= 2
-		e.DrawRect(render.RGBA(153, 153, 153, 153), rect)
 	}
+
 }