From 6cd5f17e9bd61ba6ca27e769b7bd811f8d5c8993 Mon Sep 17 00:00:00 2001
From: Noah Petherbridge <root@kirsle.net>
Date: Thu, 19 Nov 2020 20:51:02 -0800
Subject: [PATCH] Prepare v0.4.0 for release

---
 Building.md                 | 37 ++++++++++++++++++++++++++++++++-----
 go.mod                      |  4 ----
 pkg/branding/branding.go    |  2 +-
 pkg/uix/canvas_wallpaper.go |  5 -----
 4 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/Building.md b/Building.md
index 0369737..6180462 100644
--- a/Building.md
+++ b/Building.md
@@ -11,19 +11,46 @@ You'll need the following git repositories:
 * git.kirsle.net/apps/doodle - the game engine.
 * git.kirsle.net/apps/doodle-masters - where built-in level files are kept.
 * git.kirsle.net/apps/doodle-vendor - vendored libraries for Windows (SDL2.dll etc.)
+* git.kirsle.net/apps/doodle-rtp - runtime package (sounds and music mostly)
+
+The [doodle-docker](https://git.kirsle.net/apps/doodle-docker) repo will
+be more up-to-date than the instructions below.
 
 ```bash
+# Clone all the repos down to your project folder
+git clone git@git.kirsle.net:apps/doodle-rtp rtp
+git clone git@git.kirsle.net:apps/doodle-vendor vendor
+git clone git@git.kirsle.net:apps/doodle-masters masters
+git clone git@git.kirsle.net:apps/doodle doodle
+
+# Enter doodle/ project
+cd doodle/
+
 # Copy fonts and levels in
-$ cp /git/doodle-masters/levels assets/levels
-$ cp /git/doodle-vendor/fonts assets/fonts
+cp ../masters/levels assets/levels
+cp ../vendor/fonts assets/fonts
+mkdir rtp && cp -r ../rtp/* rtp/
 
 # Ensure you have bindata CLI command. NOTE: below repo is
 # my fork of go-bindata, can find it elsewhere instead.
-$ go get -u git.kirsle.net/go/bindata/...
+go get -u git.kirsle.net/go/bindata/...
 
 # From the doodle repo
-$ make bindata-dev  # TODO: populates the bindata .go modules.
-$ go get ./...      # install dependencies etc.
+make bindata-dev  # TODO: populates the bindata .go modules.
+go get ./...      # install dependencies etc.
+
+# The app should build now. Build and install the doodad tool.
+go install git.kirsle.net/apps/doodle/cmd/doodad
+doodad --version
+# "doodad version 0.3.0-alpha build ..."
+
+# Build and release the game into the dist/ folder.
+# This will: generate builtin doodads, bundle them with bindata,
+# and create a tarball in the dist/ folder.
+make dist
+
+# Build a cross-compiled Windows target from Linux.
+make mingw
 ```
 
 The `make setup` command tries to do the above.
diff --git a/go.mod b/go.mod
index 814796f..96cf3ab 100644
--- a/go.mod
+++ b/go.mod
@@ -2,10 +2,6 @@ module git.kirsle.net/apps/doodle
 
 go 1.15
 
-replace git.kirsle.net/go/render => /home/kirsle/SketchyMaze/render
-
-replace git.kirsle.net/go/ui => /home/kirsle/SketchyMaze/ui
-
 require (
 	4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a // indirect
 	4d63.com/gochecknoinits v0.0.0-20200108094044-eb73b47b9fc4 // indirect
diff --git a/pkg/branding/branding.go b/pkg/branding/branding.go
index c8eff63..a1c736e 100644
--- a/pkg/branding/branding.go
+++ b/pkg/branding/branding.go
@@ -4,7 +4,7 @@ package branding
 const (
 	AppName   = "Project: Doodle"
 	Summary   = "A drawing-based maze game"
-	Version   = "0.3.0-alpha"
+	Version   = "0.4.0-alpha"
 	Website   = "https://www.kirsle.net/tagged/Doodle"
 	Copyright = "2020 Noah Petherbridge"
 
diff --git a/pkg/uix/canvas_wallpaper.go b/pkg/uix/canvas_wallpaper.go
index 0e2f092..561797d 100644
--- a/pkg/uix/canvas_wallpaper.go
+++ b/pkg/uix/canvas_wallpaper.go
@@ -2,7 +2,6 @@ package uix
 
 import (
 	"git.kirsle.net/apps/doodle/pkg/level"
-	"git.kirsle.net/apps/doodle/pkg/log"
 	"git.kirsle.net/apps/doodle/pkg/wallpaper"
 	"git.kirsle.net/go/render"
 )
@@ -197,11 +196,7 @@ func (w *Canvas) PresentWallpaper(e render.Engine, p render.Point) error {
 			}
 
 			// Trim the edges of the destination box, like in canvas.go#Present
-			odst := dst
 			render.TrimBox(&src, &dst, p, S, w.BoxThickness(1))
-			if dst.W == 0 {
-				log.Error("TrimBoxed! %s => %s", odst, dst)
-			}
 
 			e.Copy(wp.repeat, src, dst)
 		}