Code Layout Refactor

* All private Doodle source code into the pkg/ folder.
* Potentially public code into the lib/ folder.
* Centralize the logger into a subpackage.

Makefile

@@ -1,6 +1,6 @@
 SHELL := /bin/bash
 
-VERSION=$(shell grep -e 'Version =' doodle.go | head -n 1 | cut -d '"' -f 2)
+VERSION=$(shell grep -e 'Version =' pkg/doodle.go | head -n 1 | cut -d '"' -f 2)
 BUILD=$(shell git describe --always)
 CURDIR=$(shell curdir)
 

cmd/doodad/commands/convert.go

@@ -11,10 +11,11 @@ import (
 
 	"image/png"
 
-	"git.kirsle.net/apps/doodle"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/doodads"
+	doodle "git.kirsle.net/apps/doodle/pkg"
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/pkg/doodads"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/pkg/level"
+	"git.kirsle.net/apps/doodle/pkg/log"
 	"github.com/urfave/cli"
 	"golang.org/x/image/bmp"
 )

cmd/doodad/commands/log.go

@@ -1,14 +0,0 @@
-package commands
-
-import "github.com/kirsle/golog"
-
-var log *golog.Logger
-
-func init() {
-	log = golog.GetLogger("doodad")
-	log.Configure(&golog.Config{
-		Level:  golog.InfoLevel,
-		Theme:  golog.DarkTheme,
-		Colors: golog.ExtendedColor,
-	})
-}

cmd/doodad/main.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"sort"
 
-	"git.kirsle.net/apps/doodle"
 	"git.kirsle.net/apps/doodle/cmd/doodad/commands"
+	doodle "git.kirsle.net/apps/doodle/pkg"
 	"github.com/urfave/cli"
 )
 

cmd/doodle/main.go

@@ -4,11 +4,11 @@ import (
 	"flag"
 	"runtime"
 
-	"git.kirsle.net/apps/doodle"
-	"git.kirsle.net/apps/doodle/balance"
-	"git.kirsle.net/apps/doodle/render/sdl"
-
 	_ "image/png"
+
+	"git.kirsle.net/apps/doodle/lib/render/sdl"
+	doodle "git.kirsle.net/apps/doodle/pkg"
+	"git.kirsle.net/apps/doodle/pkg/balance"
 )
 
 // Build number is the git commit hash.

level/log.go

@@ -1,9 +0,0 @@
-package level
-
-import "github.com/kirsle/golog"
-
-var log *golog.Logger
-
-func init() {
-	log = golog.GetLogger("doodle")
-}

lib/draw/line.go

@@ -3,7 +3,7 @@ package draw
 import (
 	"math"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // Line is a generator that returns the X,Y coordinates to draw a line.

lib/draw/line_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"git.kirsle.net/apps/doodle/draw"
+	"git.kirsle.net/apps/doodle/lib/draw"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 func TestLine(t *testing.T) {

lib/render/interface.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"math"
 
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/lib/events"
 )
 
 // Engine is the interface for the rendering engine, keeping SDL-specific stuff

lib/render/point_test.go

@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"testing"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 func TestPointInside(t *testing.T) {

lib/render/rect_test.go

@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"testing"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 func TestIntersection(t *testing.T) {

lib/render/sdl/canvas.go

@@ -2,7 +2,7 @@
 package sdl
 
 import (
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 	"github.com/veandco/go-sdl2/sdl"
 )
 

lib/render/sdl/events.go

@@ -3,7 +3,7 @@ package sdl
 import (
 	"errors"
 
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/lib/events"
 	"github.com/veandco/go-sdl2/sdl"
 )
 

lib/render/sdl/fps.go

@@ -1,8 +1,6 @@
 package sdl
 
-import (
+import "git.kirsle.net/apps/doodle/pkg/level"
-	"git.kirsle.net/apps/doodle/level"
-)
 
 // Frames to cache for FPS calculation.
 const (

lib/render/sdl/sdl.go

@@ -4,8 +4,8 @@ package sdl
 import (
 	"time"
 
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/lib/events"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 	"github.com/veandco/go-sdl2/sdl"
 	"github.com/veandco/go-sdl2/ttf"
 )

lib/render/sdl/text.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/lib/events"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 	"github.com/veandco/go-sdl2/sdl"
 	"github.com/veandco/go-sdl2/ttf"
 )

lib/render/sdl/texture.go

@@ -3,7 +3,7 @@ package sdl
 import (
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 	"github.com/veandco/go-sdl2/sdl"
 )
 

lib/render/sdl/utils.go

@@ -1,7 +1,7 @@
 package sdl
 
 import (
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 	"github.com/veandco/go-sdl2/sdl"
 )
 

lib/ui/button.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/ui/theme"
+	"git.kirsle.net/apps/doodle/lib/ui/theme"
 )
 
 // Button is a clickable button.

lib/ui/check_button.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/ui/theme"
+	"git.kirsle.net/apps/doodle/lib/ui/theme"
 )
 
 // CheckButton implements a checkbox and radiobox widget. It's based on a

lib/ui/checkbox.go

@@ -1,6 +1,6 @@
 package ui
 
-import "git.kirsle.net/apps/doodle/render"
+import "git.kirsle.net/apps/doodle/lib/render"
 
 // Checkbox combines a CheckButton with a widget like a Label.
 type Checkbox struct {

lib/ui/frame.go

@@ -3,7 +3,7 @@ package ui
 import (
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // Frame is a widget that contains other widgets.

lib/ui/frame_pack.go

@@ -1,6 +1,8 @@
 package ui
 
-import "git.kirsle.net/apps/doodle/render"
+import (
+	"git.kirsle.net/apps/doodle/lib/render"
+)
 
 // Pack provides configuration fields for Frame.Pack().
 type Pack struct {
@@ -223,7 +225,7 @@ func (w *Frame) computePacked(e render.Engine) {
 				moved = true
 			}
 		} else {
-			log.Error("unsupported pack.Anchor")
+			panic("unsupported pack.Anchor")
 		}
 
 		if resized && size != resize {

lib/ui/functions.go

@@ -1,6 +1,6 @@
 package ui
 
-import "git.kirsle.net/apps/doodle/render"
+import "git.kirsle.net/apps/doodle/lib/render"
 
 // AbsolutePosition computes a widget's absolute X,Y position on the
 // window on screen by crawling its parent widget tree.

lib/ui/image.go

@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // ImageType for supported image formats.

lib/ui/label.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // DefaultFont is the default font settings used for a Label.
@@ -71,7 +71,7 @@ func (w *Label) Compute(e render.Engine) {
 		text.Text = line // only this line at this time.
 		rect, err := e.ComputeTextRect(text)
 		if err != nil {
-			log.Error("%s: failed to compute text rect: %s", w, err)
+			panic(fmt.Sprintf("%s: failed to compute text rect: %s", w, err)) // TODO return an error
 			return
 		}
 

lib/ui/supervisor.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"sync"
 
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/lib/events"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // Event is a named event that the supervisor will send.
@@ -95,7 +95,6 @@ func (s *Supervisor) Loop(ev *events.State) error {
 	if s.dd.IsDragging() {
 		if !ev.Button1.Now && !ev.Button2.Now {
 			// The mouse has been released. TODO: make mouse button important?
-			log.Info("Supervisor: STOP DRAGGING")
 			for _, child := range hovering {
 				child.widget.Event(Drop, XY)
 			}

lib/ui/theme/theme.go

@@ -1,6 +1,6 @@
 package theme
 
-import "git.kirsle.net/apps/doodle/render"
+import "git.kirsle.net/apps/doodle/lib/render"
 
 // Color schemes.
 var (

lib/ui/widget.go

@@ -1,8 +1,8 @@
 package ui
 
 import (
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/ui/theme"
+	"git.kirsle.net/apps/doodle/lib/ui/theme"
 )
 
 // BorderStyle options for widget.SetBorderStyle()

lib/ui/window.go

@@ -3,7 +3,7 @@ package ui
 import (
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // Window is a frame with a title bar.

log.go

@@ -1,15 +0,0 @@
-package doodle
-
-import "github.com/kirsle/golog"
-
-var log *golog.Logger
-
-func init() {
-	log = golog.GetLogger("doodle")
-	log.Configure(&golog.Config{
-		Level:      golog.DebugLevel,
-		Theme:      golog.DarkTheme,
-		Colors:     golog.ExtendedColor,
-		TimeFormat: "2006-01-02 15:04:05.000000",
-	})
-}

pkg/balance/debug.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // Debug related variables that can toggle on or off certain features and

pkg/balance/shell.go

@@ -1,8 +1,6 @@
 package balance
 
-import (
+import "git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
-)
 
 // Shell related variables.
 var (

pkg/balance/theme.go

@@ -1,8 +1,8 @@
 package balance
 
 import (
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/lib/ui"
 )
 
 // Theme and appearance variables.

pkg/commands.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"git.kirsle.net/apps/doodle/enum"
+	"git.kirsle.net/apps/doodle/pkg/enum"
 )
 
 // Command is a parsed shell command.

pkg/config.go

@@ -7,6 +7,7 @@ import (
 	"regexp"
 	"strings"
 
+	"git.kirsle.net/apps/doodle/pkg/log"
 	"git.kirsle.net/apps/doodle/pkg/userdir"
 )
 

pkg/doodads/actor.go

@@ -1,8 +1,8 @@
 package doodads
 
 import (
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/pkg/level"
 )
 
 // Actor is a reusable run-time drawing component used in Doodle. Actors are an

pkg/doodads/collision.go

@@ -1,8 +1,8 @@
 package doodads
 
 import (
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/pkg/level"
 )
 
 // Collide describes how a collision occurred.

pkg/doodads/doodad.go

@@ -1,9 +1,9 @@
 package doodads
 
 import (
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/pkg/balance"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/pkg/level"
 )
 
 // Doodad is a reusable component for Levels that have scripts and graphics.

pkg/doodads/player.go

@@ -1,8 +1,6 @@
 package doodads
 
-import (
+import "git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
-)
 
 // PlayerID is the Doodad ID for the player character.
 const PlayerID = "PLAYER"

pkg/doodle.go

@@ -5,10 +5,11 @@ import (
 	"strings"
 	"time"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/events"
-	"git.kirsle.net/apps/doodle/enum"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/pkg/balance"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/pkg/enum"
+	"git.kirsle.net/apps/doodle/pkg/log"
 	"github.com/kirsle/golog"
 )
 
@@ -58,7 +59,7 @@ func New(debug bool, engine render.Engine) *Doodle {
 	d.shell = NewShell(d)
 
 	if !debug {
-		log.Config.Level = golog.InfoLevel
+		log.Logger.Config.Level = golog.InfoLevel
 	}
 
 	return d
@@ -200,7 +201,7 @@ func (d *Doodle) EditDrawing(filename string) error {
 	switch ext {
 	case "level":
 	case "map":
-		log.Info("is a LEvel type")
+		log.Info("is a Level type")
 		scene.DrawingType = enum.LevelDrawing
 	case "doodad":
 		scene.DrawingType = enum.DoodadDrawing

pkg/editor_scene.go

@@ -7,12 +7,13 @@ import (
 	"os"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/doodads"
+	"git.kirsle.net/apps/doodle/lib/events"
-	"git.kirsle.net/apps/doodle/enum"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/pkg/doodads"
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/pkg/enum"
+	"git.kirsle.net/apps/doodle/pkg/level"
+	"git.kirsle.net/apps/doodle/pkg/log"
 	"git.kirsle.net/apps/doodle/pkg/userdir"
-	"git.kirsle.net/apps/doodle/render"
 )
 
 // EditorScene manages the "Edit Level" game mode.

pkg/editor_scene_debug.go

@@ -1,6 +1,6 @@
 package doodle
 
-import "git.kirsle.net/apps/doodle/uix"
+import "git.kirsle.net/apps/doodle/pkg/uix"
 
 // TODO: build flags to not include this in production builds.
 // This adds accessors for private variables from the dev console.

pkg/editor_ui.go

@@ -5,15 +5,16 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/events"
-	"git.kirsle.net/apps/doodle/doodads"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/enum"
+	"git.kirsle.net/apps/doodle/lib/ui"
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/pkg/balance"
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/pkg/doodads"
+	"git.kirsle.net/apps/doodle/pkg/enum"
+	"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/userdir"
-	"git.kirsle.net/apps/doodle/render"
-	"git.kirsle.net/apps/doodle/ui"
-	"git.kirsle.net/apps/doodle/uix"
 )
 
 // Width of the panel frame.

pkg/editor_ui_doodad.go

@@ -7,12 +7,13 @@ package doodle
 import (
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/doodads"
+	"git.kirsle.net/apps/doodle/lib/ui"
+	"git.kirsle.net/apps/doodle/pkg/balance"
+	"git.kirsle.net/apps/doodle/pkg/doodads"
+	"git.kirsle.net/apps/doodle/pkg/log"
+	"git.kirsle.net/apps/doodle/pkg/uix"
 	"git.kirsle.net/apps/doodle/pkg/userdir"
-	"git.kirsle.net/apps/doodle/render"
-	"git.kirsle.net/apps/doodle/ui"
-	"git.kirsle.net/apps/doodle/uix"
 )
 
 // DraggableActor is a Doodad being dragged from the Doodad palette.

pkg/editor_ui_palette.go

@@ -1,9 +1,10 @@
 package doodle
 
 import (
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/ui"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/pkg/balance"
+	"git.kirsle.net/apps/doodle/pkg/log"
 )
 
 // setupPaletteFrame configures the Color Palette tab for Edit Mode.

pkg/fps.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/doodads"
+	"git.kirsle.net/apps/doodle/lib/ui"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/pkg/balance"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/pkg/doodads"
 )
 
 // Frames to cache for FPS calculation.

pkg/guitest_scene.go

@@ -3,10 +3,11 @@ package doodle
 import (
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/events"
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/ui"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/pkg/balance"
+	"git.kirsle.net/apps/doodle/pkg/log"
 )
 
 // GUITestScene implements the main menu of Doodle.

pkg/level/actors.go

@@ -1,7 +1,7 @@
 package level
 
 import (
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 	uuid "github.com/satori/go.uuid"
 )
 

pkg/level/chunk.go

@@ -7,9 +7,10 @@ import (
 	"math"
 	"os"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
+	"git.kirsle.net/apps/doodle/pkg/balance"
+	"git.kirsle.net/apps/doodle/pkg/log"
 	"git.kirsle.net/apps/doodle/pkg/userdir"
-	"git.kirsle.net/apps/doodle/render"
 	"github.com/satori/go.uuid"
 	"golang.org/x/image/bmp"
 )

pkg/level/chunk_map.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // MapAccessor implements a chunk accessor by using a map of points to their

pkg/level/chunk_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/pkg/level"
 )
 
 // Test the high level Chunker.

pkg/level/chunker.go

@@ -5,7 +5,8 @@ import (
 	"fmt"
 	"math"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
+	"git.kirsle.net/apps/doodle/pkg/log"
 )
 
 // Chunker is the data structure that manages the chunks of a level, and

pkg/level/chunker_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/pkg/level"
 )
 
 func TestWorldSize(t *testing.T) {

pkg/level/palette.go

@@ -1,8 +1,6 @@
 package level
 
-import (
+import "git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
-)
 
 // DefaultPalette returns a sensible default palette.
 func DefaultPalette() *Palette {

pkg/level/swatch.go

@@ -3,7 +3,7 @@ package level
 import (
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // Swatch holds details about a single value in the palette.

pkg/level/types.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/pkg/balance"
 )
 
 // Useful variables.

pkg/log/log.go

@@ -0,0 +1,36 @@
+package log
+
+import "github.com/kirsle/golog"
+
+// Logger is the public golog.Logger object.
+var Logger *golog.Logger
+
+func init() {
+	Logger = golog.GetLogger("doodle")
+	Logger.Configure(&golog.Config{
+		Level:      golog.DebugLevel,
+		Theme:      golog.DarkTheme,
+		Colors:     golog.ExtendedColor,
+		TimeFormat: "2006-01-02 15:04:05.000000",
+	})
+}
+
+// Debug logger function.
+func Debug(msg string, v ...interface{}) {
+	Logger.Debug(msg, v...)
+}
+
+// Info logger function.
+func Info(msg string, v ...interface{}) {
+	Logger.Info(msg, v...)
+}
+
+// Warn logger function.
+func Warn(msg string, v ...interface{}) {
+	Logger.Warn(msg, v...)
+}
+
+// Error logger function.
+func Error(msg string, v ...interface{}) {
+	Logger.Error(msg, v...)
+}

pkg/main_scene.go

@@ -1,10 +1,10 @@
 package doodle
 
 import (
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/events"
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/ui"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/pkg/balance"
 )
 
 // MainScene implements the main menu of Doodle.

pkg/play_scene.go

@@ -3,12 +3,13 @@ package doodle
 import (
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/events"
-	"git.kirsle.net/apps/doodle/doodads"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/pkg/balance"
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/pkg/doodads"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/pkg/level"
-	"git.kirsle.net/apps/doodle/uix"
+	"git.kirsle.net/apps/doodle/pkg/log"
+	"git.kirsle.net/apps/doodle/pkg/uix"
 )
 
 // PlayScene manages the "Edit Level" game mode.

pkg/scene.go

@@ -1,6 +1,9 @@
 package doodle
 
-import "git.kirsle.net/apps/doodle/events"
+import (
+	"git.kirsle.net/apps/doodle/lib/events"
+	"git.kirsle.net/apps/doodle/pkg/log"
+)
 
 // Scene is an abstraction for a game mode in Doodle. The app points to one
 // scene at a time and that scene has control over the main loop, and its own

pkg/shell.go

@@ -5,10 +5,11 @@ import (
 	"fmt"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/events"
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/ui"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/pkg/balance"
+	"git.kirsle.net/apps/doodle/pkg/log"
 	"github.com/robertkrimen/otto"
 )
 
@@ -73,7 +74,7 @@ func NewShell(d *Doodle) Shell {
 	// Make the Doodle instance available to the shell.
 	bindings := map[string]interface{}{
 		"d":     d,
-		"log":   log,
+		"log":   log.Logger,
 		"RGBA":  render.RGBA,
 		"Point": render.NewPoint,
 		"Rect":  render.NewRect,

pkg/uix/canvas.go

@@ -5,14 +5,15 @@ import (
 	"os"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/events"
-	"git.kirsle.net/apps/doodle/doodads"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/lib/ui"
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/pkg/balance"
+	"git.kirsle.net/apps/doodle/pkg/doodads"
+	"git.kirsle.net/apps/doodle/pkg/level"
+	"git.kirsle.net/apps/doodle/pkg/log"
 	"git.kirsle.net/apps/doodle/pkg/userdir"
 	"git.kirsle.net/apps/doodle/pkg/wallpaper"
-	"git.kirsle.net/apps/doodle/render"
-	"git.kirsle.net/apps/doodle/ui"
 )
 
 // Canvas is a custom ui.Widget that manages a single drawing.

pkg/uix/canvas_editable.go

@@ -1,10 +1,10 @@
 package uix
 
 import (
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/lib/events"
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/ui"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/pkg/level"
 )
 
 // loopEditable handles the Loop() part for editable canvases.

pkg/uix/canvas_wallpaper.go

@@ -1,9 +1,9 @@
 package uix
 
 import (
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/lib/render"
+	"git.kirsle.net/apps/doodle/pkg/level"
 	"git.kirsle.net/apps/doodle/pkg/wallpaper"
-	"git.kirsle.net/apps/doodle/render"
 )
 
 // Wallpaper configures the wallpaper in a Canvas.

pkg/wallpaper/texture.go

@@ -7,8 +7,8 @@ import (
 	"image"
 	"os"
 
+	"git.kirsle.net/apps/doodle/lib/render"
 	"git.kirsle.net/apps/doodle/pkg/userdir"
-	"git.kirsle.net/apps/doodle/render"
 	"golang.org/x/image/bmp"
 )
 

pkg/wallpaper/wallpaper.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // Wallpaper is a repeatable background image to go behind levels.

uix/log.go

@@ -1,14 +0,0 @@
-package uix
-
-import "github.com/kirsle/golog"
-
-var log *golog.Logger
-
-func init() {
-	log = golog.GetLogger("uix")
-	log.Configure(&golog.Config{
-		Level:  golog.DebugLevel,
-		Theme:  golog.DarkTheme,
-		Colors: golog.ExtendedColor,
-	})
-}