From a316bafb124604e9b4616bf008c4b1c0cc885adc Mon Sep 17 00:00:00 2001 From: Noah Petherbridge Date: Sun, 30 Dec 2018 14:22:50 -0800 Subject: [PATCH] Reorganize the package layout Move all Doodle source code into the src/ subpackage and move the publicly shareable stuff into lib/, for example lib/ui and lib/render. This cleans up the git root and helps make the Doodle UI library more easily publishable as a separate open source project. Currently both lib/ui and lib/render import one or two things from doodle/src that need to be broken apart. --- cmd/doodad/commands/convert.go | 2 +- cmd/doodle/main.go | 6 +++--- {render => lib/render}/color.go | 0 {render => lib/render}/functions.go | 0 {render => lib/render}/interface.go | 2 +- {render => lib/render}/log.go | 0 {render => lib/render}/point.go | 0 {render => lib/render}/point_test.go | 2 +- {render => lib/render}/rect_test.go | 2 +- {render => lib/render}/sdl/canvas.go | 2 +- {render => lib/render}/sdl/events.go | 2 +- {render => lib/render}/sdl/log.go | 0 {render => lib/render}/sdl/sdl.go | 4 ++-- {render => lib/render}/sdl/text.go | 4 ++-- {render => lib/render}/sdl/texture.go | 2 +- {render => lib/render}/sdl/utils.go | 2 +- lib/ui/README.md | 8 ++++++++ {ui => lib/ui}/button.go | 4 ++-- {ui => lib/ui}/check_button.go | 4 ++-- {ui => lib/ui}/checkbox.go | 2 +- {ui => lib/ui}/debug.go | 0 {ui => lib/ui}/dragdrop.go | 0 {ui => lib/ui}/frame.go | 2 +- {ui => lib/ui}/frame_pack.go | 4 +++- {ui => lib/ui}/functions.go | 2 +- {ui => lib/ui}/image.go | 2 +- {ui => lib/ui}/label.go | 2 +- {ui => lib/ui}/log.go | 0 {ui => lib/ui}/supervisor.go | 4 ++-- {ui => lib/ui}/theme/theme.go | 2 +- {ui => lib/ui}/widget.go | 4 ++-- {ui => lib/ui}/window.go | 2 +- pkg/wallpaper/texture.go | 2 +- pkg/wallpaper/wallpaper.go | 2 +- {balance => src/balance}/README.md | 0 {balance => src/balance}/debug.go | 2 +- {balance => src/balance}/numbers.go | 0 {balance => src/balance}/shell.go | 2 +- {balance => src/balance}/theme.go | 4 ++-- commands.go => src/commands.go | 2 +- config.go => src/config.go | 0 {doodads => src/doodads}/actor.go | 4 ++-- {doodads => src/doodads}/collision.go | 4 ++-- {doodads => src/doodads}/doodad.go | 6 +++--- {doodads => src/doodads}/drawing.go | 2 +- {doodads => src/doodads}/dummy/dummy.go | 2 +- {doodads => src/doodads}/dummy/player.go | 2 +- {doodads => src/doodads}/json.go | 0 doodle.go => src/doodle.go | 8 ++++---- {draw => src/draw}/line.go | 2 +- {draw => src/draw}/line_test.go | 2 +- editor_scene.go => src/editor_scene.go | 10 +++++----- .../editor_scene_debug.go | 2 +- editor_ui.go => src/editor_ui.go | 16 ++++++++-------- editor_ui_doodad.go => src/editor_ui_doodad.go | 10 +++++----- editor_ui_palette.go => src/editor_ui_palette.go | 6 +++--- {enum => src/enum}/enum.go | 0 {events => src/events}/debug.go | 0 {events => src/events}/events.go | 0 {events => src/events}/log.go | 0 {events => src/events}/types.go | 0 fps.go => src/fps.go | 8 ++++---- guitest_scene.go => src/guitest_scene.go | 8 ++++---- {level => src/level}/actors.go | 2 +- {level => src/level}/base_test.go | 0 {level => src/level}/chunk.go | 4 ++-- {level => src/level}/chunk_map.go | 2 +- {level => src/level}/chunk_test.go | 2 +- {level => src/level}/chunker.go | 2 +- {level => src/level}/chunker_test.go | 2 +- {level => src/level}/filesystem.go | 0 {level => src/level}/json.go | 0 {level => src/level}/log.go | 0 {level => src/level}/page_type.go | 0 {level => src/level}/palette.go | 2 +- {level => src/level}/swatch.go | 2 +- {level => src/level}/types.go | 4 ++-- log.go => src/log.go | 0 main_scene.go => src/main_scene.go | 8 ++++---- play_scene.go => src/play_scene.go | 14 +++++++------- scene.go => src/scene.go | 4 +++- shell.go => src/shell.go | 8 ++++---- {uix => src/uix}/actor.go | 6 +++--- {uix => src/uix}/canvas.go | 12 ++++++------ {uix => src/uix}/canvas_actors.go | 6 +++--- {uix => src/uix}/canvas_editable.go | 8 ++++---- {uix => src/uix}/canvas_present.go | 6 +++--- {uix => src/uix}/canvas_scrolling.go | 10 +++++----- {uix => src/uix}/canvas_wallpaper.go | 4 ++-- {uix => src/uix}/draw_modes.go | 0 {uix => src/uix}/log.go | 0 91 files changed, 149 insertions(+), 137 deletions(-) rename {render => lib/render}/color.go (100%) rename {render => lib/render}/functions.go (100%) rename {render => lib/render}/interface.go (99%) rename {render => lib/render}/log.go (100%) rename {render => lib/render}/point.go (100%) rename {render => lib/render}/point_test.go (95%) rename {render => lib/render}/rect_test.go (96%) rename {render => lib/render}/sdl/canvas.go (97%) rename {render => lib/render}/sdl/events.go (98%) rename {render => lib/render}/sdl/log.go (100%) rename {render => lib/render}/sdl/sdl.go (96%) rename {render => lib/render}/sdl/text.go (97%) rename {render => lib/render}/sdl/texture.go (96%) rename {render => lib/render}/sdl/utils.go (90%) create mode 100644 lib/ui/README.md rename {ui => lib/ui}/button.go (96%) rename {ui => lib/ui}/check_button.go (96%) rename {ui => lib/ui}/checkbox.go (97%) rename {ui => lib/ui}/debug.go (100%) rename {ui => lib/ui}/dragdrop.go (100%) rename {ui => lib/ui}/frame.go (97%) rename {ui => lib/ui}/frame_pack.go (99%) rename {ui => lib/ui}/functions.go (93%) rename {ui => lib/ui}/image.go (97%) rename {ui => lib/ui}/label.go (98%) rename {ui => lib/ui}/log.go (100%) rename {ui => lib/ui}/supervisor.go (98%) rename {ui => lib/ui}/theme/theme.go (82%) rename {ui => lib/ui}/widget.go (99%) rename {ui => lib/ui}/window.go (98%) rename {balance => src/balance}/README.md (100%) rename {balance => src/balance}/debug.go (98%) rename {balance => src/balance}/numbers.go (100%) rename {balance => src/balance}/shell.go (92%) rename {balance => src/balance}/theme.go (91%) rename commands.go => src/commands.go (99%) rename config.go => src/config.go (100%) rename {doodads => src/doodads}/actor.go (96%) rename {doodads => src/doodads}/collision.go (98%) rename {doodads => src/doodads}/doodad.go (91%) rename {doodads => src/doodads}/drawing.go (97%) rename {doodads => src/doodads}/dummy/dummy.go (87%) rename {doodads => src/doodads}/dummy/player.go (82%) rename {doodads => src/doodads}/json.go (100%) rename doodle.go => src/doodle.go (96%) rename {draw => src/draw}/line.go (94%) rename {draw => src/draw}/line_test.go (96%) rename editor_scene.go => src/editor_scene.go (97%) rename editor_scene_debug.go => src/editor_scene_debug.go (85%) rename editor_ui.go => src/editor_ui.go (97%) rename editor_ui_doodad.go => src/editor_ui_doodad.go (94%) rename editor_ui_palette.go => src/editor_ui_palette.go (90%) rename {enum => src/enum}/enum.go (100%) rename {events => src/events}/debug.go (100%) rename {events => src/events}/events.go (100%) rename {events => src/events}/log.go (100%) rename {events => src/events}/types.go (100%) rename fps.go => src/fps.go (95%) rename guitest_scene.go => src/guitest_scene.go (97%) rename {level => src/level}/actors.go (96%) rename {level => src/level}/base_test.go (100%) rename {level => src/level}/chunk.go (98%) rename {level => src/level}/chunk_map.go (98%) rename {level => src/level}/chunk_test.go (99%) rename {level => src/level}/chunker.go (99%) rename {level => src/level}/chunker_test.go (99%) rename {level => src/level}/filesystem.go (100%) rename {level => src/level}/json.go (100%) rename {level => src/level}/log.go (100%) rename {level => src/level}/page_type.go (100%) rename {level => src/level}/palette.go (97%) rename {level => src/level}/swatch.go (96%) rename {level => src/level}/types.go (96%) rename log.go => src/log.go (100%) rename main_scene.go => src/main_scene.go (91%) rename play_scene.go => src/play_scene.go (94%) rename scene.go => src/scene.go (94%) rename shell.go => src/shell.go (97%) rename {uix => src/uix}/actor.go (91%) rename {uix => src/uix}/canvas.go (97%) rename {uix => src/uix}/canvas_actors.go (96%) rename {uix => src/uix}/canvas_editable.go (94%) rename {uix => src/uix}/canvas_present.go (97%) rename {uix => src/uix}/canvas_scrolling.go (95%) rename {uix => src/uix}/canvas_wallpaper.go (97%) rename {uix => src/uix}/draw_modes.go (100%) rename {uix => src/uix}/log.go (100%) diff --git a/cmd/doodad/commands/convert.go b/cmd/doodad/commands/convert.go index 2ebfba3..8062fd6 100644 --- a/cmd/doodad/commands/convert.go +++ b/cmd/doodad/commands/convert.go @@ -14,7 +14,7 @@ import ( "git.kirsle.net/apps/doodle" "git.kirsle.net/apps/doodle/doodads" "git.kirsle.net/apps/doodle/level" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" "github.com/urfave/cli" "golang.org/x/image/bmp" ) diff --git a/cmd/doodle/main.go b/cmd/doodle/main.go index 531f91f..839c30d 100644 --- a/cmd/doodle/main.go +++ b/cmd/doodle/main.go @@ -4,9 +4,9 @@ import ( "flag" "runtime" - "git.kirsle.net/apps/doodle" - "git.kirsle.net/apps/doodle/balance" - "git.kirsle.net/apps/doodle/render/sdl" + "git.kirsle.net/apps/doodle/lib/render/sdl" + "git.kirsle.net/apps/doodle/src" + "git.kirsle.net/apps/doodle/src/balance" _ "image/png" ) diff --git a/render/color.go b/lib/render/color.go similarity index 100% rename from render/color.go rename to lib/render/color.go diff --git a/render/functions.go b/lib/render/functions.go similarity index 100% rename from render/functions.go rename to lib/render/functions.go diff --git a/render/interface.go b/lib/render/interface.go similarity index 99% rename from render/interface.go rename to lib/render/interface.go index a64d498..5d307fc 100644 --- a/render/interface.go +++ b/lib/render/interface.go @@ -4,7 +4,7 @@ import ( "fmt" "math" - "git.kirsle.net/apps/doodle/events" + "git.kirsle.net/apps/doodle/src/events" ) // Engine is the interface for the rendering engine, keeping SDL-specific stuff diff --git a/render/log.go b/lib/render/log.go similarity index 100% rename from render/log.go rename to lib/render/log.go diff --git a/render/point.go b/lib/render/point.go similarity index 100% rename from render/point.go rename to lib/render/point.go diff --git a/render/point_test.go b/lib/render/point_test.go similarity index 95% rename from render/point_test.go rename to lib/render/point_test.go index d56a70a..0cfe102 100644 --- a/render/point_test.go +++ b/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) { diff --git a/render/rect_test.go b/lib/render/rect_test.go similarity index 96% rename from render/rect_test.go rename to lib/render/rect_test.go index 882b6fc..c6d8bb4 100644 --- a/render/rect_test.go +++ b/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) { diff --git a/render/sdl/canvas.go b/lib/render/sdl/canvas.go similarity index 97% rename from render/sdl/canvas.go rename to lib/render/sdl/canvas.go index 2272c49..0095585 100644 --- a/render/sdl/canvas.go +++ b/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" ) diff --git a/render/sdl/events.go b/lib/render/sdl/events.go similarity index 98% rename from render/sdl/events.go rename to lib/render/sdl/events.go index 5a8bad3..277bd4a 100644 --- a/render/sdl/events.go +++ b/lib/render/sdl/events.go @@ -3,7 +3,7 @@ package sdl import ( "errors" - "git.kirsle.net/apps/doodle/events" + "git.kirsle.net/apps/doodle/src/events" // XXX: break it up "github.com/veandco/go-sdl2/sdl" ) diff --git a/render/sdl/log.go b/lib/render/sdl/log.go similarity index 100% rename from render/sdl/log.go rename to lib/render/sdl/log.go diff --git a/render/sdl/sdl.go b/lib/render/sdl/sdl.go similarity index 96% rename from render/sdl/sdl.go rename to lib/render/sdl/sdl.go index 2b6bb8e..5abd80f 100644 --- a/render/sdl/sdl.go +++ b/lib/render/sdl/sdl.go @@ -4,8 +4,8 @@ package sdl import ( "time" - "git.kirsle.net/apps/doodle/events" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/src/events" "github.com/veandco/go-sdl2/sdl" "github.com/veandco/go-sdl2/ttf" ) diff --git a/render/sdl/text.go b/lib/render/sdl/text.go similarity index 97% rename from render/sdl/text.go rename to lib/render/sdl/text.go index dc00129..94b53bd 100644 --- a/render/sdl/text.go +++ b/lib/render/sdl/text.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "git.kirsle.net/apps/doodle/events" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/src/events" "github.com/veandco/go-sdl2/sdl" "github.com/veandco/go-sdl2/ttf" ) diff --git a/render/sdl/texture.go b/lib/render/sdl/texture.go similarity index 96% rename from render/sdl/texture.go rename to lib/render/sdl/texture.go index 192da48..b7843cc 100644 --- a/render/sdl/texture.go +++ b/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" ) diff --git a/render/sdl/utils.go b/lib/render/sdl/utils.go similarity index 90% rename from render/sdl/utils.go rename to lib/render/sdl/utils.go index efcbf9c..3c7f260 100644 --- a/render/sdl/utils.go +++ b/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" ) diff --git a/lib/ui/README.md b/lib/ui/README.md new file mode 100644 index 0000000..2db9b9f --- /dev/null +++ b/lib/ui/README.md @@ -0,0 +1,8 @@ +# Doodle UI + +This is a UI toolkit designed for Doodle but made generally available. + +## Ties to Break + +lib/ui and lib/render both currently import doodle/src/events as their only +dependency on Doodle. This module should be moved to a better common location. diff --git a/ui/button.go b/lib/ui/button.go similarity index 96% rename from ui/button.go rename to lib/ui/button.go index e7240ca..708c88a 100644 --- a/ui/button.go +++ b/lib/ui/button.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "git.kirsle.net/apps/doodle/render" - "git.kirsle.net/apps/doodle/ui/theme" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/lib/ui/theme" ) // Button is a clickable button. diff --git a/ui/check_button.go b/lib/ui/check_button.go similarity index 96% rename from ui/check_button.go rename to lib/ui/check_button.go index dd56f58..838667c 100644 --- a/ui/check_button.go +++ b/lib/ui/check_button.go @@ -4,8 +4,8 @@ import ( "fmt" "strconv" - "git.kirsle.net/apps/doodle/render" - "git.kirsle.net/apps/doodle/ui/theme" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/lib/ui/theme" ) // CheckButton implements a checkbox and radiobox widget. It's based on a diff --git a/ui/checkbox.go b/lib/ui/checkbox.go similarity index 97% rename from ui/checkbox.go rename to lib/ui/checkbox.go index 59b26fd..e98d7d2 100644 --- a/ui/checkbox.go +++ b/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 { diff --git a/ui/debug.go b/lib/ui/debug.go similarity index 100% rename from ui/debug.go rename to lib/ui/debug.go diff --git a/ui/dragdrop.go b/lib/ui/dragdrop.go similarity index 100% rename from ui/dragdrop.go rename to lib/ui/dragdrop.go diff --git a/ui/frame.go b/lib/ui/frame.go similarity index 97% rename from ui/frame.go rename to lib/ui/frame.go index ee15af6..fe3be40 100644 --- a/ui/frame.go +++ b/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. diff --git a/ui/frame_pack.go b/lib/ui/frame_pack.go similarity index 99% rename from ui/frame_pack.go rename to lib/ui/frame_pack.go index 228f8fc..7915567 100644 --- a/ui/frame_pack.go +++ b/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 { diff --git a/ui/functions.go b/lib/ui/functions.go similarity index 93% rename from ui/functions.go rename to lib/ui/functions.go index bceca8b..9780a30 100644 --- a/ui/functions.go +++ b/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. diff --git a/ui/image.go b/lib/ui/image.go similarity index 97% rename from ui/image.go rename to lib/ui/image.go index 94e9993..32d57fd 100644 --- a/ui/image.go +++ b/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. diff --git a/ui/label.go b/lib/ui/label.go similarity index 98% rename from ui/label.go rename to lib/ui/label.go index 8f3cfdf..0aefbc1 100644 --- a/ui/label.go +++ b/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. diff --git a/ui/log.go b/lib/ui/log.go similarity index 100% rename from ui/log.go rename to lib/ui/log.go diff --git a/ui/supervisor.go b/lib/ui/supervisor.go similarity index 98% rename from ui/supervisor.go rename to lib/ui/supervisor.go index 43ae0bd..4c599eb 100644 --- a/ui/supervisor.go +++ b/lib/ui/supervisor.go @@ -4,8 +4,8 @@ import ( "errors" "sync" - "git.kirsle.net/apps/doodle/events" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/src/events" ) // Event is a named event that the supervisor will send. diff --git a/ui/theme/theme.go b/lib/ui/theme/theme.go similarity index 82% rename from ui/theme/theme.go rename to lib/ui/theme/theme.go index 1994128..d8e5d89 100644 --- a/ui/theme/theme.go +++ b/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 ( diff --git a/ui/widget.go b/lib/ui/widget.go similarity index 99% rename from ui/widget.go rename to lib/ui/widget.go index bcc6db8..e7b2328 100644 --- a/ui/widget.go +++ b/lib/ui/widget.go @@ -1,8 +1,8 @@ package ui import ( - "git.kirsle.net/apps/doodle/render" - "git.kirsle.net/apps/doodle/ui/theme" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/lib/ui/theme" ) // BorderStyle options for widget.SetBorderStyle() diff --git a/ui/window.go b/lib/ui/window.go similarity index 98% rename from ui/window.go rename to lib/ui/window.go index 4347c63..a956e7f 100644 --- a/ui/window.go +++ b/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. diff --git a/pkg/wallpaper/texture.go b/pkg/wallpaper/texture.go index 71a81ad..40e7f8c 100644 --- a/pkg/wallpaper/texture.go +++ b/pkg/wallpaper/texture.go @@ -8,7 +8,7 @@ import ( "os" "git.kirsle.net/apps/doodle/pkg/userdir" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" "golang.org/x/image/bmp" ) diff --git a/pkg/wallpaper/wallpaper.go b/pkg/wallpaper/wallpaper.go index 05885d0..98482a8 100644 --- a/pkg/wallpaper/wallpaper.go +++ b/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. diff --git a/balance/README.md b/src/balance/README.md similarity index 100% rename from balance/README.md rename to src/balance/README.md diff --git a/balance/debug.go b/src/balance/debug.go similarity index 98% rename from balance/debug.go rename to src/balance/debug.go index 9e55043..0274b38 100644 --- a/balance/debug.go +++ b/src/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 diff --git a/balance/numbers.go b/src/balance/numbers.go similarity index 100% rename from balance/numbers.go rename to src/balance/numbers.go diff --git a/balance/shell.go b/src/balance/shell.go similarity index 92% rename from balance/shell.go rename to src/balance/shell.go index 12ef517..dbc3711 100644 --- a/balance/shell.go +++ b/src/balance/shell.go @@ -1,7 +1,7 @@ package balance import ( - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" ) // Shell related variables. diff --git a/balance/theme.go b/src/balance/theme.go similarity index 91% rename from balance/theme.go rename to src/balance/theme.go index 192a2ad..7da0987 100644 --- a/balance/theme.go +++ b/src/balance/theme.go @@ -1,8 +1,8 @@ package balance import ( - "git.kirsle.net/apps/doodle/render" - "git.kirsle.net/apps/doodle/ui" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/lib/ui" ) // Theme and appearance variables. diff --git a/commands.go b/src/commands.go similarity index 99% rename from commands.go rename to src/commands.go index 095bd5e..324370a 100644 --- a/commands.go +++ b/src/commands.go @@ -5,7 +5,7 @@ import ( "fmt" "strconv" - "git.kirsle.net/apps/doodle/enum" + "git.kirsle.net/apps/doodle/src/enum" ) // Command is a parsed shell command. diff --git a/config.go b/src/config.go similarity index 100% rename from config.go rename to src/config.go diff --git a/doodads/actor.go b/src/doodads/actor.go similarity index 96% rename from doodads/actor.go rename to src/doodads/actor.go index 2a77289..cb0994c 100644 --- a/doodads/actor.go +++ b/src/doodads/actor.go @@ -1,8 +1,8 @@ package doodads import ( - "git.kirsle.net/apps/doodle/level" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/src/level" ) // Actor is a reusable run-time drawing component used in Doodle. Actors are an diff --git a/doodads/collision.go b/src/doodads/collision.go similarity index 98% rename from doodads/collision.go rename to src/doodads/collision.go index fe8b264..833c1d9 100644 --- a/doodads/collision.go +++ b/src/doodads/collision.go @@ -1,8 +1,8 @@ package doodads import ( - "git.kirsle.net/apps/doodle/level" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/src/level" ) // Collide describes how a collision occurred. diff --git a/doodads/doodad.go b/src/doodads/doodad.go similarity index 91% rename from doodads/doodad.go rename to src/doodads/doodad.go index ea2fa33..71eb690 100644 --- a/doodads/doodad.go +++ b/src/doodads/doodad.go @@ -1,9 +1,9 @@ package doodads import ( - "git.kirsle.net/apps/doodle/balance" - "git.kirsle.net/apps/doodle/level" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/src/balance" + "git.kirsle.net/apps/doodle/src/level" ) // Doodad is a reusable component for Levels that have scripts and graphics. diff --git a/doodads/drawing.go b/src/doodads/drawing.go similarity index 97% rename from doodads/drawing.go rename to src/doodads/drawing.go index 99837c0..fd74a2f 100644 --- a/doodads/drawing.go +++ b/src/doodads/drawing.go @@ -1,7 +1,7 @@ package doodads import ( - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" uuid "github.com/satori/go.uuid" ) diff --git a/doodads/dummy/dummy.go b/src/doodads/dummy/dummy.go similarity index 87% rename from doodads/dummy/dummy.go rename to src/doodads/dummy/dummy.go index 2dc79d7..7160f1b 100644 --- a/doodads/dummy/dummy.go +++ b/src/doodads/dummy/dummy.go @@ -1,7 +1,7 @@ // Package dummy implements a dummy doodads.Drawing. package dummy -import "git.kirsle.net/apps/doodle/doodads" +import "git.kirsle.net/apps/doodle/src/doodads" // Drawing is a dummy doodads.Drawing that has no data. type Drawing struct { diff --git a/doodads/dummy/player.go b/src/doodads/dummy/player.go similarity index 82% rename from doodads/dummy/player.go rename to src/doodads/dummy/player.go index 5f4a018..c0a69db 100644 --- a/doodads/dummy/player.go +++ b/src/doodads/dummy/player.go @@ -1,7 +1,7 @@ // Package dummy implements a dummy doodads.Drawing. package dummy -import "git.kirsle.net/apps/doodle/doodads" +import "git.kirsle.net/apps/doodle/src/doodads" // NewPlayer creates a dummy player object. func NewPlayer() *Drawing { diff --git a/doodads/json.go b/src/doodads/json.go similarity index 100% rename from doodads/json.go rename to src/doodads/json.go diff --git a/doodle.go b/src/doodle.go similarity index 96% rename from doodle.go rename to src/doodle.go index 268c5a6..540708e 100644 --- a/doodle.go +++ b/src/doodle.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "git.kirsle.net/apps/doodle/balance" - "git.kirsle.net/apps/doodle/enum" - "git.kirsle.net/apps/doodle/events" + "git.kirsle.net/apps/doodle/lib/render" "git.kirsle.net/apps/doodle/pkg/userdir" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/src/balance" + "git.kirsle.net/apps/doodle/src/enum" + "git.kirsle.net/apps/doodle/src/events" "github.com/kirsle/golog" ) diff --git a/draw/line.go b/src/draw/line.go similarity index 94% rename from draw/line.go rename to src/draw/line.go index a174164..bc98a87 100644 --- a/draw/line.go +++ b/src/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. diff --git a/draw/line_test.go b/src/draw/line_test.go similarity index 96% rename from draw/line_test.go rename to src/draw/line_test.go index eb1cabb..db03fb9 100644 --- a/draw/line_test.go +++ b/src/draw/line_test.go @@ -5,7 +5,7 @@ import ( "testing" "git.kirsle.net/apps/doodle/draw" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" ) func TestLine(t *testing.T) { diff --git a/editor_scene.go b/src/editor_scene.go similarity index 97% rename from editor_scene.go rename to src/editor_scene.go index f0c646f..f9e3d1d 100644 --- a/editor_scene.go +++ b/src/editor_scene.go @@ -7,12 +7,12 @@ import ( "os" "strings" - "git.kirsle.net/apps/doodle/doodads" - "git.kirsle.net/apps/doodle/enum" - "git.kirsle.net/apps/doodle/events" - "git.kirsle.net/apps/doodle/level" + "git.kirsle.net/apps/doodle/lib/render" "git.kirsle.net/apps/doodle/pkg/userdir" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/src/doodads" + "git.kirsle.net/apps/doodle/src/enum" + "git.kirsle.net/apps/doodle/src/events" + "git.kirsle.net/apps/doodle/src/level" ) // EditorScene manages the "Edit Level" game mode. diff --git a/editor_scene_debug.go b/src/editor_scene_debug.go similarity index 85% rename from editor_scene_debug.go rename to src/editor_scene_debug.go index f2ceea0..c0ce20d 100644 --- a/editor_scene_debug.go +++ b/src/editor_scene_debug.go @@ -1,6 +1,6 @@ package doodle -import "git.kirsle.net/apps/doodle/uix" +import "git.kirsle.net/apps/doodle/src/uix" // TODO: build flags to not include this in production builds. // This adds accessors for private variables from the dev console. diff --git a/editor_ui.go b/src/editor_ui.go similarity index 97% rename from editor_ui.go rename to src/editor_ui.go index 784649f..6d97df2 100644 --- a/editor_ui.go +++ b/src/editor_ui.go @@ -5,15 +5,15 @@ import ( "path/filepath" "strconv" - "git.kirsle.net/apps/doodle/balance" - "git.kirsle.net/apps/doodle/doodads" - "git.kirsle.net/apps/doodle/enum" - "git.kirsle.net/apps/doodle/events" - "git.kirsle.net/apps/doodle/level" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/lib/ui" "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" + "git.kirsle.net/apps/doodle/src/balance" + "git.kirsle.net/apps/doodle/src/doodads" + "git.kirsle.net/apps/doodle/src/enum" + "git.kirsle.net/apps/doodle/src/events" + "git.kirsle.net/apps/doodle/src/level" + "git.kirsle.net/apps/doodle/src/uix" ) // Width of the panel frame. diff --git a/editor_ui_doodad.go b/src/editor_ui_doodad.go similarity index 94% rename from editor_ui_doodad.go rename to src/editor_ui_doodad.go index 433641c..2a53c8b 100644 --- a/editor_ui_doodad.go +++ b/src/editor_ui_doodad.go @@ -7,12 +7,12 @@ package doodle import ( "fmt" - "git.kirsle.net/apps/doodle/balance" - "git.kirsle.net/apps/doodle/doodads" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/lib/ui" "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" + "git.kirsle.net/apps/doodle/src/balance" + "git.kirsle.net/apps/doodle/src/doodads" + "git.kirsle.net/apps/doodle/src/uix" ) // DraggableActor is a Doodad being dragged from the Doodad palette. diff --git a/editor_ui_palette.go b/src/editor_ui_palette.go similarity index 90% rename from editor_ui_palette.go rename to src/editor_ui_palette.go index d48c6fc..e41755f 100644 --- a/editor_ui_palette.go +++ b/src/editor_ui_palette.go @@ -1,9 +1,9 @@ package doodle import ( - "git.kirsle.net/apps/doodle/balance" - "git.kirsle.net/apps/doodle/render" - "git.kirsle.net/apps/doodle/ui" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/lib/ui" + "git.kirsle.net/apps/doodle/src/balance" ) // setupPaletteFrame configures the Color Palette tab for Edit Mode. diff --git a/enum/enum.go b/src/enum/enum.go similarity index 100% rename from enum/enum.go rename to src/enum/enum.go diff --git a/events/debug.go b/src/events/debug.go similarity index 100% rename from events/debug.go rename to src/events/debug.go diff --git a/events/events.go b/src/events/events.go similarity index 100% rename from events/events.go rename to src/events/events.go diff --git a/events/log.go b/src/events/log.go similarity index 100% rename from events/log.go rename to src/events/log.go diff --git a/events/types.go b/src/events/types.go similarity index 100% rename from events/types.go rename to src/events/types.go diff --git a/fps.go b/src/fps.go similarity index 95% rename from fps.go rename to src/fps.go index 4de911a..2ccdfce 100644 --- a/fps.go +++ b/src/fps.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "git.kirsle.net/apps/doodle/balance" - "git.kirsle.net/apps/doodle/doodads" - "git.kirsle.net/apps/doodle/render" - "git.kirsle.net/apps/doodle/ui" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/lib/ui" + "git.kirsle.net/apps/doodle/src/balance" + "git.kirsle.net/apps/doodle/src/doodads" ) // Frames to cache for FPS calculation. diff --git a/guitest_scene.go b/src/guitest_scene.go similarity index 97% rename from guitest_scene.go rename to src/guitest_scene.go index 1b349eb..5a64dac 100644 --- a/guitest_scene.go +++ b/src/guitest_scene.go @@ -3,10 +3,10 @@ package doodle import ( "fmt" - "git.kirsle.net/apps/doodle/balance" - "git.kirsle.net/apps/doodle/events" - "git.kirsle.net/apps/doodle/render" - "git.kirsle.net/apps/doodle/ui" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/src/balance" + "git.kirsle.net/apps/doodle/src/events" + "git.kirsle.net/apps/doodle/lib/ui" ) // GUITestScene implements the main menu of Doodle. diff --git a/level/actors.go b/src/level/actors.go similarity index 96% rename from level/actors.go rename to src/level/actors.go index 332c044..caeb08d 100644 --- a/level/actors.go +++ b/src/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" ) diff --git a/level/base_test.go b/src/level/base_test.go similarity index 100% rename from level/base_test.go rename to src/level/base_test.go diff --git a/level/chunk.go b/src/level/chunk.go similarity index 98% rename from level/chunk.go rename to src/level/chunk.go index a0aa78d..c2c79b5 100644 --- a/level/chunk.go +++ b/src/level/chunk.go @@ -7,9 +7,9 @@ import ( "math" "os" - "git.kirsle.net/apps/doodle/balance" + "git.kirsle.net/apps/doodle/lib/render" "git.kirsle.net/apps/doodle/pkg/userdir" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/src/balance" "github.com/satori/go.uuid" "golang.org/x/image/bmp" ) diff --git a/level/chunk_map.go b/src/level/chunk_map.go similarity index 98% rename from level/chunk_map.go rename to src/level/chunk_map.go index 45a1075..a5b5def 100644 --- a/level/chunk_map.go +++ b/src/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 diff --git a/level/chunk_test.go b/src/level/chunk_test.go similarity index 99% rename from level/chunk_test.go rename to src/level/chunk_test.go index 7ebf3ff..cad45aa 100644 --- a/level/chunk_test.go +++ b/src/level/chunk_test.go @@ -5,7 +5,7 @@ import ( "testing" "git.kirsle.net/apps/doodle/level" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" ) // Test the high level Chunker. diff --git a/level/chunker.go b/src/level/chunker.go similarity index 99% rename from level/chunker.go rename to src/level/chunker.go index 127c5db..0bcb0de 100644 --- a/level/chunker.go +++ b/src/level/chunker.go @@ -5,7 +5,7 @@ import ( "fmt" "math" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" ) // Chunker is the data structure that manages the chunks of a level, and diff --git a/level/chunker_test.go b/src/level/chunker_test.go similarity index 99% rename from level/chunker_test.go rename to src/level/chunker_test.go index d417a3d..c48a31b 100644 --- a/level/chunker_test.go +++ b/src/level/chunker_test.go @@ -5,7 +5,7 @@ import ( "testing" "git.kirsle.net/apps/doodle/level" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" ) func TestWorldSize(t *testing.T) { diff --git a/level/filesystem.go b/src/level/filesystem.go similarity index 100% rename from level/filesystem.go rename to src/level/filesystem.go diff --git a/level/json.go b/src/level/json.go similarity index 100% rename from level/json.go rename to src/level/json.go diff --git a/level/log.go b/src/level/log.go similarity index 100% rename from level/log.go rename to src/level/log.go diff --git a/level/page_type.go b/src/level/page_type.go similarity index 100% rename from level/page_type.go rename to src/level/page_type.go diff --git a/level/palette.go b/src/level/palette.go similarity index 97% rename from level/palette.go rename to src/level/palette.go index 3061760..7c34b61 100644 --- a/level/palette.go +++ b/src/level/palette.go @@ -1,7 +1,7 @@ package level import ( - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" ) // DefaultPalette returns a sensible default palette. diff --git a/level/swatch.go b/src/level/swatch.go similarity index 96% rename from level/swatch.go rename to src/level/swatch.go index 2dc1c46..a6304e0 100644 --- a/level/swatch.go +++ b/src/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. diff --git a/level/types.go b/src/level/types.go similarity index 96% rename from level/types.go rename to src/level/types.go index b603734..f91bd03 100644 --- a/level/types.go +++ b/src/level/types.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" - "git.kirsle.net/apps/doodle/balance" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/src/balance" ) // Useful variables. diff --git a/log.go b/src/log.go similarity index 100% rename from log.go rename to src/log.go diff --git a/main_scene.go b/src/main_scene.go similarity index 91% rename from main_scene.go rename to src/main_scene.go index b559382..e646587 100644 --- a/main_scene.go +++ b/src/main_scene.go @@ -1,10 +1,10 @@ package doodle import ( - "git.kirsle.net/apps/doodle/balance" - "git.kirsle.net/apps/doodle/events" - "git.kirsle.net/apps/doodle/render" - "git.kirsle.net/apps/doodle/ui" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/src/balance" + "git.kirsle.net/apps/doodle/src/events" + "git.kirsle.net/apps/doodle/lib/ui" ) // MainScene implements the main menu of Doodle. diff --git a/play_scene.go b/src/play_scene.go similarity index 94% rename from play_scene.go rename to src/play_scene.go index c1cf8bb..ac19857 100644 --- a/play_scene.go +++ b/src/play_scene.go @@ -4,13 +4,13 @@ import ( "fmt" "math" - "git.kirsle.net/apps/doodle/balance" - "git.kirsle.net/apps/doodle/doodads" - "git.kirsle.net/apps/doodle/doodads/dummy" - "git.kirsle.net/apps/doodle/events" - "git.kirsle.net/apps/doodle/level" - "git.kirsle.net/apps/doodle/render" - "git.kirsle.net/apps/doodle/uix" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/src/balance" + "git.kirsle.net/apps/doodle/src/doodads" + "git.kirsle.net/apps/doodle/src/doodads/dummy" + "git.kirsle.net/apps/doodle/src/events" + "git.kirsle.net/apps/doodle/src/level" + "git.kirsle.net/apps/doodle/src/uix" ) // PlayScene manages the "Edit Level" game mode. diff --git a/scene.go b/src/scene.go similarity index 94% rename from scene.go rename to src/scene.go index 3220661..1cedea1 100644 --- a/scene.go +++ b/src/scene.go @@ -1,6 +1,8 @@ package doodle -import "git.kirsle.net/apps/doodle/events" +import ( + "git.kirsle.net/apps/doodle/src/events" +) // 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 diff --git a/shell.go b/src/shell.go similarity index 97% rename from shell.go rename to src/shell.go index 23c828e..609ab0f 100644 --- a/shell.go +++ b/src/shell.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "git.kirsle.net/apps/doodle/balance" - "git.kirsle.net/apps/doodle/events" - "git.kirsle.net/apps/doodle/render" - "git.kirsle.net/apps/doodle/ui" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/lib/ui" + "git.kirsle.net/apps/doodle/src/balance" + "git.kirsle.net/apps/doodle/src/events" "github.com/robertkrimen/otto" ) diff --git a/uix/actor.go b/src/uix/actor.go similarity index 91% rename from uix/actor.go rename to src/uix/actor.go index 06f710b..2335bac 100644 --- a/uix/actor.go +++ b/src/uix/actor.go @@ -1,9 +1,9 @@ package uix import ( - "git.kirsle.net/apps/doodle/doodads" - "git.kirsle.net/apps/doodle/level" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/src/doodads" + "git.kirsle.net/apps/doodle/src/level" uuid "github.com/satori/go.uuid" ) diff --git a/uix/canvas.go b/src/uix/canvas.go similarity index 97% rename from uix/canvas.go rename to src/uix/canvas.go index 430bb47..1ecf68c 100644 --- a/uix/canvas.go +++ b/src/uix/canvas.go @@ -5,13 +5,13 @@ import ( "os" "strings" - "git.kirsle.net/apps/doodle/balance" - "git.kirsle.net/apps/doodle/doodads" - "git.kirsle.net/apps/doodle/events" - "git.kirsle.net/apps/doodle/level" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/lib/ui" "git.kirsle.net/apps/doodle/pkg/wallpaper" - "git.kirsle.net/apps/doodle/render" - "git.kirsle.net/apps/doodle/ui" + "git.kirsle.net/apps/doodle/src/balance" + "git.kirsle.net/apps/doodle/src/doodads" + "git.kirsle.net/apps/doodle/src/events" + "git.kirsle.net/apps/doodle/src/level" ) // Canvas is a custom ui.Widget that manages a single drawing. diff --git a/uix/canvas_actors.go b/src/uix/canvas_actors.go similarity index 96% rename from uix/canvas_actors.go rename to src/uix/canvas_actors.go index 457d207..2d56c4e 100644 --- a/uix/canvas_actors.go +++ b/src/uix/canvas_actors.go @@ -3,10 +3,10 @@ package uix import ( "fmt" - "git.kirsle.net/apps/doodle/doodads" - "git.kirsle.net/apps/doodle/level" + "git.kirsle.net/apps/doodle/lib/render" "git.kirsle.net/apps/doodle/pkg/userdir" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/src/doodads" + "git.kirsle.net/apps/doodle/src/level" ) // InstallActors adds external Actors to the canvas to be superimposed on top diff --git a/uix/canvas_editable.go b/src/uix/canvas_editable.go similarity index 94% rename from uix/canvas_editable.go rename to src/uix/canvas_editable.go index 184c5e2..15561d7 100644 --- a/uix/canvas_editable.go +++ b/src/uix/canvas_editable.go @@ -1,10 +1,10 @@ package uix import ( - "git.kirsle.net/apps/doodle/events" - "git.kirsle.net/apps/doodle/level" - "git.kirsle.net/apps/doodle/render" - "git.kirsle.net/apps/doodle/ui" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/lib/ui" + "git.kirsle.net/apps/doodle/src/events" + "git.kirsle.net/apps/doodle/src/level" ) // loopEditable handles the Loop() part for editable canvases. diff --git a/uix/canvas_present.go b/src/uix/canvas_present.go similarity index 97% rename from uix/canvas_present.go rename to src/uix/canvas_present.go index 9e7dd38..cb6bb65 100644 --- a/uix/canvas_present.go +++ b/src/uix/canvas_present.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "git.kirsle.net/apps/doodle/balance" - "git.kirsle.net/apps/doodle/render" - "git.kirsle.net/apps/doodle/ui" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/lib/ui" + "git.kirsle.net/apps/doodle/src/balance" ) // Present the canvas. diff --git a/uix/canvas_scrolling.go b/src/uix/canvas_scrolling.go similarity index 95% rename from uix/canvas_scrolling.go rename to src/uix/canvas_scrolling.go index 7c13aff..a51aca3 100644 --- a/uix/canvas_scrolling.go +++ b/src/uix/canvas_scrolling.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "git.kirsle.net/apps/doodle/balance" - "git.kirsle.net/apps/doodle/events" - "git.kirsle.net/apps/doodle/level" - "git.kirsle.net/apps/doodle/render" - "git.kirsle.net/apps/doodle/ui" + "git.kirsle.net/apps/doodle/lib/render" + "git.kirsle.net/apps/doodle/lib/ui" + "git.kirsle.net/apps/doodle/src/balance" + "git.kirsle.net/apps/doodle/src/events" + "git.kirsle.net/apps/doodle/src/level" ) /* diff --git a/uix/canvas_wallpaper.go b/src/uix/canvas_wallpaper.go similarity index 97% rename from uix/canvas_wallpaper.go rename to src/uix/canvas_wallpaper.go index 827dadc..c1a9076 100644 --- a/uix/canvas_wallpaper.go +++ b/src/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/wallpaper" - "git.kirsle.net/apps/doodle/render" + "git.kirsle.net/apps/doodle/src/level" ) // Wallpaper configures the wallpaper in a Canvas. diff --git a/uix/draw_modes.go b/src/uix/draw_modes.go similarity index 100% rename from uix/draw_modes.go rename to src/uix/draw_modes.go diff --git a/uix/log.go b/src/uix/log.go similarity index 100% rename from uix/log.go rename to src/uix/log.go