SketchyMaze/doodle
SketchyMaze/doodle
1
0
Fork 0
Code Issues 41 Pull Requests 1 Releases Wiki Activity

Colliding Doodads #1

Closed
kirsle wants to merge 6 commits from dev into master
pull from: dev
merge into: SketchyMaze:master
Conversation 0 Commits 6 Files Changed 99 +149 -137
91 changed files with 149 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a316bafb12 - Show all commits

2
cmd/doodad/commands/convert.go
View File

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

6
cmd/doodle/main.go
View File

@ -4,9 +4,9 @@ import (
"flag" "flag"
"runtime" "runtime"
"git.kirsle.net/apps/doodle" "git.kirsle.net/apps/doodle/lib/render/sdl"
"git.kirsle.net/apps/doodle/balance" "git.kirsle.net/apps/doodle/src"
"git.kirsle.net/apps/doodle/render/sdl" "git.kirsle.net/apps/doodle/src/balance"
_ "image/png" _ "image/png"
) )

0
render/color.go → lib/render/color.go
View File

0
render/functions.go → lib/render/functions.go
View File

2
render/interface.go → lib/render/interface.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"math" "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 // Engine is the interface for the rendering engine, keeping SDL-specific stuff

0
render/log.go → lib/render/log.go
View File

0
render/point.go → lib/render/point.go
View File

2
render/point_test.go → lib/render/point_test.go
View File

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

2
render/rect_test.go → lib/render/rect_test.go
View File

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

2
render/sdl/canvas.go → lib/render/sdl/canvas.go
View File

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

2
render/sdl/events.go → lib/render/sdl/events.go
View File

@ -3,7 +3,7 @@ package sdl
import ( import (
"errors" "errors"
"git.kirsle.net/apps/doodle/events" "git.kirsle.net/apps/doodle/src/events" // XXX: break it up
"github.com/veandco/go-sdl2/sdl" "github.com/veandco/go-sdl2/sdl"
) )

0
render/sdl/log.go → lib/render/sdl/log.go
View File

4
render/sdl/sdl.go → lib/render/sdl/sdl.go
View File

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

4
render/sdl/text.go → lib/render/sdl/text.go
View File

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

2
render/sdl/texture.go → lib/render/sdl/texture.go
View File

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

2
render/sdl/utils.go → lib/render/sdl/utils.go
View File

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

8
lib/ui/README.md Normal file
View File

@ -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.

4
ui/button.go → lib/ui/button.go
View File

@ -4,8 +4,8 @@ import (
"errors" "errors"
"fmt" "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. // Button is a clickable button.

4
ui/check_button.go → lib/ui/check_button.go
View File

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"strconv" "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 // CheckButton implements a checkbox and radiobox widget. It's based on a

2
ui/checkbox.go → lib/ui/checkbox.go
View File

@ -1,6 +1,6 @@
package ui 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. // Checkbox combines a CheckButton with a widget like a Label.
type Checkbox struct { type Checkbox struct {

0
ui/debug.go → lib/ui/debug.go
View File

0
ui/dragdrop.go → lib/ui/dragdrop.go
View File

2
ui/frame.go → lib/ui/frame.go
View File

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

4
ui/frame_pack.go → lib/ui/frame_pack.go
View File

@ -1,6 +1,8 @@
package ui package ui
import "git.kirsle.net/apps/doodle/render" import (
"git.kirsle.net/apps/doodle/lib/render"
)
// Pack provides configuration fields for Frame.Pack(). // Pack provides configuration fields for Frame.Pack().
type Pack struct { type Pack struct {

2
ui/functions.go → lib/ui/functions.go
View File

@ -1,6 +1,6 @@
package ui 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 // AbsolutePosition computes a widget's absolute X,Y position on the
// window on screen by crawling its parent widget tree. // window on screen by crawling its parent widget tree.

2
ui/image.go → lib/ui/image.go
View File

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

2
ui/label.go → lib/ui/label.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"git.kirsle.net/apps/doodle/render" "git.kirsle.net/apps/doodle/lib/render"
) )
// DefaultFont is the default font settings used for a Label. // DefaultFont is the default font settings used for a Label.

0
ui/log.go → lib/ui/log.go
View File

4
ui/supervisor.go → lib/ui/supervisor.go
View File

@ -4,8 +4,8 @@ import (
"errors" "errors"
"sync" "sync"
"git.kirsle.net/apps/doodle/events" "git.kirsle.net/apps/doodle/lib/render"
"git.kirsle.net/apps/doodle/render" "git.kirsle.net/apps/doodle/src/events"
) )
// Event is a named event that the supervisor will send. // Event is a named event that the supervisor will send.

2
ui/theme/theme.go → lib/ui/theme/theme.go
View File

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

4
ui/widget.go → lib/ui/widget.go
View File

@ -1,8 +1,8 @@
package ui package ui
import ( 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() // BorderStyle options for widget.SetBorderStyle()

2
ui/window.go → lib/ui/window.go
View File

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

2
pkg/wallpaper/texture.go
View File

@ -8,7 +8,7 @@ import (
"os" "os"
"git.kirsle.net/apps/doodle/pkg/userdir" "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" "golang.org/x/image/bmp"
) )

2
pkg/wallpaper/wallpaper.go
View File

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

0
balance/README.md → src/balance/README.md
View File

2
balance/debug.go → src/balance/debug.go
View File

@ -5,7 +5,7 @@ import (
"strconv" "strconv"
"strings" "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 // Debug related variables that can toggle on or off certain features and

0
balance/numbers.go → src/balance/numbers.go
View File

2
balance/shell.go → src/balance/shell.go
View File

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

4
balance/theme.go → src/balance/theme.go
View File

@ -1,8 +1,8 @@
package balance package balance
import ( 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. // Theme and appearance variables.

2
commands.go → src/commands.go
View File

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

0
config.go → src/config.go
View File

4
doodads/actor.go → src/doodads/actor.go
View File

@ -1,8 +1,8 @@
package doodads package doodads
import ( 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/src/level"
) )
// Actor is a reusable run-time drawing component used in Doodle. Actors are an // Actor is a reusable run-time drawing component used in Doodle. Actors are an

4
doodads/collision.go → src/doodads/collision.go
View File

@ -1,8 +1,8 @@
package doodads package doodads
import ( 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/src/level"
) )
// Collide describes how a collision occurred. // Collide describes how a collision occurred.

6
doodads/doodad.go → src/doodads/doodad.go
View File

@ -1,9 +1,9 @@
package doodads package doodads
import ( 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/src/balance"
"git.kirsle.net/apps/doodle/render" "git.kirsle.net/apps/doodle/src/level"
) )
// Doodad is a reusable component for Levels that have scripts and graphics. // Doodad is a reusable component for Levels that have scripts and graphics.

2
doodads/drawing.go → src/doodads/drawing.go
View File

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

2
doodads/dummy/dummy.go → src/doodads/dummy/dummy.go
View File

@ -1,7 +1,7 @@
// Package dummy implements a dummy doodads.Drawing. // Package dummy implements a dummy doodads.Drawing.
package dummy 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. // Drawing is a dummy doodads.Drawing that has no data.
type Drawing struct { type Drawing struct {

2
doodads/dummy/player.go → src/doodads/dummy/player.go
View File

@ -1,7 +1,7 @@
// Package dummy implements a dummy doodads.Drawing. // Package dummy implements a dummy doodads.Drawing.
package dummy package dummy
import "git.kirsle.net/apps/doodle/doodads" import "git.kirsle.net/apps/doodle/src/doodads"
// NewPlayer creates a dummy player object. // NewPlayer creates a dummy player object.
func NewPlayer() *Drawing { func NewPlayer() *Drawing {

0
doodads/json.go → src/doodads/json.go
View File

8
doodle.go → src/doodle.go
View File

@ -5,11 +5,11 @@ import (
"strings" "strings"
"time" "time"
"git.kirsle.net/apps/doodle/balance" "git.kirsle.net/apps/doodle/lib/render"
"git.kirsle.net/apps/doodle/enum"
"git.kirsle.net/apps/doodle/events"
"git.kirsle.net/apps/doodle/pkg/userdir" "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" "github.com/kirsle/golog"
) )

2
draw/line.go → src/draw/line.go
View File

@ -3,7 +3,7 @@ package draw
import ( import (
"math" "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. // Line is a generator that returns the X,Y coordinates to draw a line.

2
draw/line_test.go → src/draw/line_test.go
View File

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

10
editor_scene.go → src/editor_scene.go
View File

@ -7,12 +7,12 @@ import (
"os" "os"
"strings" "strings"
"git.kirsle.net/apps/doodle/doodads" "git.kirsle.net/apps/doodle/lib/render"
"git.kirsle.net/apps/doodle/enum"
"git.kirsle.net/apps/doodle/events"
"git.kirsle.net/apps/doodle/level"
"git.kirsle.net/apps/doodle/pkg/userdir" "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. // EditorScene manages the "Edit Level" game mode.

2
editor_scene_debug.go → src/editor_scene_debug.go
View File

@ -1,6 +1,6 @@
package doodle 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. // TODO: build flags to not include this in production builds.
// This adds accessors for private variables from the dev console. // This adds accessors for private variables from the dev console.

16
editor_ui.go → src/editor_ui.go
View File

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

10
editor_ui_doodad.go → src/editor_ui_doodad.go
View File

@ -7,12 +7,12 @@ package doodle
import ( import (
"fmt" "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/userdir" "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/ui" "git.kirsle.net/apps/doodle/src/doodads"
"git.kirsle.net/apps/doodle/uix" "git.kirsle.net/apps/doodle/src/uix"
) )
// DraggableActor is a Doodad being dragged from the Doodad palette. // DraggableActor is a Doodad being dragged from the Doodad palette.

6
editor_ui_palette.go → src/editor_ui_palette.go
View File

@ -1,9 +1,9 @@
package doodle package doodle
import ( 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/src/balance"
) )
// setupPaletteFrame configures the Color Palette tab for Edit Mode. // setupPaletteFrame configures the Color Palette tab for Edit Mode.

0
enum/enum.go → src/enum/enum.go
View File

0
events/debug.go → src/events/debug.go
View File

0
events/events.go → src/events/events.go
View File

0
events/log.go → src/events/log.go
View File

0
events/types.go → src/events/types.go
View File

8
fps.go → src/fps.go
View File

@ -4,10 +4,10 @@ import (
"fmt" "fmt"
"strings" "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/src/balance"
"git.kirsle.net/apps/doodle/ui" "git.kirsle.net/apps/doodle/src/doodads"
) )
// Frames to cache for FPS calculation. // Frames to cache for FPS calculation.

8
guitest_scene.go → src/guitest_scene.go
View File

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

2
level/actors.go → src/level/actors.go
View File

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

0
level/base_test.go → src/level/base_test.go
View File

4
level/chunk.go → src/level/chunk.go
View File

@ -7,9 +7,9 @@ import (
"math" "math"
"os" "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/pkg/userdir"
"git.kirsle.net/apps/doodle/render" "git.kirsle.net/apps/doodle/src/balance"
"github.com/satori/go.uuid" "github.com/satori/go.uuid"
"golang.org/x/image/bmp" "golang.org/x/image/bmp"
) )

2
level/chunk_map.go → src/level/chunk_map.go
View File

@ -5,7 +5,7 @@ import (
"errors" "errors"
"fmt" "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 // MapAccessor implements a chunk accessor by using a map of points to their

2
level/chunk_test.go → src/level/chunk_test.go
View File

@ -5,7 +5,7 @@ import (
"testing" "testing"
"git.kirsle.net/apps/doodle/level" "git.kirsle.net/apps/doodle/level"
"git.kirsle.net/apps/doodle/render" "git.kirsle.net/apps/doodle/lib/render"
) )
// Test the high level Chunker. // Test the high level Chunker.

2
level/chunker.go → src/level/chunker.go
View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"math" "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 // Chunker is the data structure that manages the chunks of a level, and

2
level/chunker_test.go → src/level/chunker_test.go
View File

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

0
level/filesystem.go → src/level/filesystem.go
View File

0
level/json.go → src/level/json.go
View File

0
level/log.go → src/level/log.go
View File

0
level/page_type.go → src/level/page_type.go
View File

2
level/palette.go → src/level/palette.go
View File

@ -1,7 +1,7 @@
package level package level
import ( import (
"git.kirsle.net/apps/doodle/render" "git.kirsle.net/apps/doodle/lib/render"
) )
// DefaultPalette returns a sensible default palette. // DefaultPalette returns a sensible default palette.

2
level/swatch.go → src/level/swatch.go
View File

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

4
level/types.go → src/level/types.go
View File

@ -4,8 +4,8 @@ import (
"encoding/json" "encoding/json"
"fmt" "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/src/balance"
) )
// Useful variables. // Useful variables.

0
log.go → src/log.go
View File

8
main_scene.go → src/main_scene.go
View File

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

14
play_scene.go → src/play_scene.go
View File

@ -4,13 +4,13 @@ import (
"fmt" "fmt"
"math" "math"
"git.kirsle.net/apps/doodle/balance" "git.kirsle.net/apps/doodle/lib/render"
"git.kirsle.net/apps/doodle/doodads" "git.kirsle.net/apps/doodle/src/balance"
"git.kirsle.net/apps/doodle/doodads/dummy" "git.kirsle.net/apps/doodle/src/doodads"
"git.kirsle.net/apps/doodle/events" "git.kirsle.net/apps/doodle/src/doodads/dummy"
"git.kirsle.net/apps/doodle/level" "git.kirsle.net/apps/doodle/src/events"
"git.kirsle.net/apps/doodle/render" "git.kirsle.net/apps/doodle/src/level"
"git.kirsle.net/apps/doodle/uix" "git.kirsle.net/apps/doodle/src/uix"
) )
// PlayScene manages the "Edit Level" game mode. // PlayScene manages the "Edit Level" game mode.

4
scene.go → src/scene.go
View File

@ -1,6 +1,8 @@
package doodle 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 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 // scene at a time and that scene has control over the main loop, and its own

8
shell.go → src/shell.go
View File

@ -5,10 +5,10 @@ import (
"fmt" "fmt"
"strings" "strings"
"git.kirsle.net/apps/doodle/balance" "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/render" "git.kirsle.net/apps/doodle/src/balance"
"git.kirsle.net/apps/doodle/ui" "git.kirsle.net/apps/doodle/src/events"
"github.com/robertkrimen/otto" "github.com/robertkrimen/otto"
) )

6
uix/actor.go → src/uix/actor.go
View File

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

12
uix/canvas.go → src/uix/canvas.go
View File

@ -5,13 +5,13 @@ import (
"os" "os"
"strings" "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/events"
"git.kirsle.net/apps/doodle/level"
"git.kirsle.net/apps/doodle/pkg/wallpaper" "git.kirsle.net/apps/doodle/pkg/wallpaper"
"git.kirsle.net/apps/doodle/render" "git.kirsle.net/apps/doodle/src/balance"
"git.kirsle.net/apps/doodle/ui" "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. // Canvas is a custom ui.Widget that manages a single drawing.

6
uix/canvas_actors.go → src/uix/canvas_actors.go
View File

@ -3,10 +3,10 @@ package uix
import ( import (
"fmt" "fmt"
"git.kirsle.net/apps/doodle/doodads" "git.kirsle.net/apps/doodle/lib/render"
"git.kirsle.net/apps/doodle/level"
"git.kirsle.net/apps/doodle/pkg/userdir" "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 // InstallActors adds external Actors to the canvas to be superimposed on top

8
uix/canvas_editable.go → src/uix/canvas_editable.go
View File

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

6
uix/canvas_present.go → src/uix/canvas_present.go
View File

@ -4,9 +4,9 @@ import (
"fmt" "fmt"
"strings" "strings"
"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/src/balance"
) )
// Present the canvas. // Present the canvas.

10
uix/canvas_scrolling.go → src/uix/canvas_scrolling.go
View File

@ -4,11 +4,11 @@ import (
"errors" "errors"
"fmt" "fmt"
"git.kirsle.net/apps/doodle/balance" "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/src/balance"
"git.kirsle.net/apps/doodle/render" "git.kirsle.net/apps/doodle/src/events"
"git.kirsle.net/apps/doodle/ui" "git.kirsle.net/apps/doodle/src/level"
) )
/* /*

4
uix/canvas_wallpaper.go → src/uix/canvas_wallpaper.go
View File

@ -1,9 +1,9 @@
package uix package uix
import ( 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/pkg/wallpaper"
"git.kirsle.net/apps/doodle/render" "git.kirsle.net/apps/doodle/src/level"
) )
// Wallpaper configures the wallpaper in a Canvas. // Wallpaper configures the wallpaper in a Canvas.

0
uix/draw_modes.go → src/uix/draw_modes.go
View File

0
uix/log.go → src/uix/log.go
View File