Noah Petherbridge
3c185528f9
Starts the implementation of the chunk-based pixel storage system for
levels and drawings.
Previously the levels had a Pixels structure which was just an array of
X,Y and palette index triplets. The new chunk system divides the map up
into square chunks, and lets each chunk manage its own memory layout.
The "MapAccessor" layout is implemented first which is a map of X,Y
coordinates to their Swatches (pointer to an index of the palette). When
serialized the MapAccessor maps the "X,Y": "index" similarly to the old
Pixels array.
The object hierarchy for the chunk system is like:
* Chunker: the manager of the chunks who keeps track of the ChunkSize
and a map of "chunk coordinates" to the chunk in charge of it.
* Chunk: a part of the drawing ChunkSize length square. A chunk has a
Type (of how it stores its data, 0 being a map[Point]Swatch and 1
being a [][]Swatch 2D array), and the chunk has an Accessor which
implements the underlying type.
* Accessor: an interface for a Chunk to provide access to its
pixels.
* MapAccessor: a "sparse map" of coordinates to their Swatches.
* GridAccessor: TBD, will be a "dense" 2D grid of Swatches.
The JSON files are loaded in two passes:
1. The chunks only load their swatch indexes from disk.
2. With the palette also loaded, the chunks are "inflated" and linked
to their swatch pointers.
Misc changes:
* The `level.Canvas` UI widget switches from the old Grid data type to
being able to directly use a `level.Chunker`
* The Chunker is a shared data type between the on-disk level format and
the actual renderer (level.Canvas), so saving the level is easy
because you can just pull the Chunker out from the canvas.
* ChunkSize is stored inside the level file and the default value is at
balance/numbers.go: 1000
83 lines
1.8 KiB
Go
83 lines
1.8 KiB
Go
package level
|
|
|
|
import (
|
|
"git.kirsle.net/apps/doodle/render"
|
|
)
|
|
|
|
// DefaultPalette returns a sensible default palette.
|
|
func DefaultPalette() *Palette {
|
|
return &Palette{
|
|
Swatches: []*Swatch{
|
|
&Swatch{
|
|
Name: "solid",
|
|
Color: render.Black,
|
|
Solid: true,
|
|
},
|
|
&Swatch{
|
|
Name: "decoration",
|
|
Color: render.Grey,
|
|
},
|
|
&Swatch{
|
|
Name: "fire",
|
|
Color: render.Red,
|
|
Fire: true,
|
|
},
|
|
&Swatch{
|
|
Name: "water",
|
|
Color: render.Blue,
|
|
Water: true,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
// NewPalette initializes a blank palette.
|
|
func NewPalette() *Palette {
|
|
return &Palette{
|
|
Swatches: []*Swatch{},
|
|
byName: map[string]int{},
|
|
}
|
|
}
|
|
|
|
// Palette holds an index of colors used in a drawing.
|
|
type Palette struct {
|
|
Swatches []*Swatch `json:"swatches"`
|
|
|
|
// Private runtime values
|
|
ActiveSwatch *Swatch `json:"-"` // name of the actively selected color
|
|
byName map[string]int // Cache map of swatches by name
|
|
}
|
|
|
|
// Inflate the palette swatch caches. Always call this method after you have
|
|
// initialized the palette (i.e. loaded it from JSON); this will update the
|
|
// "color by name" cache and assign the index numbers to each swatch.
|
|
func (p *Palette) Inflate() {
|
|
p.update()
|
|
}
|
|
|
|
// Get a swatch by name.
|
|
func (p *Palette) Get(name string) (result *Swatch, exists bool) {
|
|
p.update()
|
|
|
|
if index, ok := p.byName[name]; ok && index < len(p.Swatches) {
|
|
result = p.Swatches[index]
|
|
exists = true
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
// update the internal caches and such.
|
|
func (p *Palette) update() {
|
|
// Initialize the name cache if nil or if the size disagrees with the
|
|
// length of the swatches available.
|
|
if p.byName == nil || len(p.byName) != len(p.Swatches) {
|
|
// Initialize the name cache.
|
|
p.byName = map[string]int{}
|
|
for i, swatch := range p.Swatches {
|
|
swatch.index = i
|
|
p.byName[swatch.Name] = i
|
|
}
|
|
}
|
|
}
|