Noah Petherbridge
279a980106
NOTICE: Chunk size set to 100 for visual testing!
NOTICE: guitest references a bmp file that isn't checked in!
BUGS REMAINING:
- When scrolling the level in Edit Mode, some of the chunks will pop
out of existence randomly.
- When clicking-dragging to draw in Edit Mode, if the scroll position
is not at 0,0 then the pixels drawn will be offset from the cursor.
- These are to do with the Scroll position and chunk coordinate calc
functions probably.
Implements a texture caching interface to stop redrawing everything
pixel by pixel on every frame.
The texture caching workflow is briefly:
- The uix.Canvas widget's Present() function iterates over the list of
Chunk Coordinates that are visible inside of the current viewport
(i.e. viewable on screen)
- For each Chunk:
- Make it render and/or return its cached Texture object.
- Work out how much of the Chunk will be visible and how to crop the
boxes for the Copy()
- Copy the cached Texture instead of drawing all the pixels every
time like we were doing before.
- The Chunk.Texture() function that returns said Texture:
- It calls Chunk.ToBitmap() to save a bitmap on disk.
- It calls Engine.NewBitmap() to get a Texture it can hang onto.
- It hangs onto the Texture and returns it on future calls.
- Any call to Set() or Delete() a pixel will invalidate the cache
(mark the Chunk "dirty") and Texture() will rebuild next call.
The interface `render.Texturer` provides a way for rendering backends
(SDL2, OpenGL) to transport a "texture" of their own kind without
exposing the type details to the user.
The interface `render.Engine` adds two new methods:
* NewBitmap(filename string) (Texturer, error)
* Copy(t Texturer, src, dst Rect)
NewBitmap should open a bitmap image on disk and return it wrapped in a
Texturer (really it's an SDL2 Texture). This is for caching purposes.
Next the Copy() function blits the texture onto the screen renderer
using the source and destination rectangles.
The uix.Canvas widget orchestrates the caching for the drawing it's
responsible for. It queries which chunks are viewable in the Canvas
viewport (scroll and bounding boxes), has each chunk render out their
entire bitmap image to then cache them as SDL textures and then only
_those_ need to be copied out to the renderer each frame.
The frame rate now sits at a decent 60 FPS even when the drawing gets
messy and full of lines. Each unique version of each chunk needs to
render only one time and then it's a fast copy operation for future
ticks.
Other changes:
- Chunker now assigns each Chunk what their coordinate and size are, so
that the chunk can self reference that information. This info is
considered read-only but that isn't really enforced.
- Add Chunker.IterViewportChunks() that returns a channel of Chunk
Coordinates that are visible in your viewport, rather than iterating
over all of the pixels in all of those chunks.
- Add Chunk.ToBitmap(filename) that causes a Chunk to render its pixels
to a bitmap image on disk. SDL2 can natively speak Bitmaps for texture
caching. Currently these go to files in /tmp but will soon go into your
$XDG_CACHE_FOLDER instead.
- Add Chunk.Texture() that causes a Chunk to render and then return a
cached bitmap texture of the pixels it's responsible for. The texture
is cached until the Chunk is next modified with Set() or Delete().
- UI: add an Image widget that currently just shows a bitmap image. It
was the first test for caching bitmap images for efficiency. Can show
any *.bmp file on disk!
- Editor UI: make the StatusBar boxes dynamically build from an array
of string pointers to make it SUPER EASY to add/remove labels.
83 lines
1.4 KiB
Go
83 lines
1.4 KiB
Go
package ui
|
|
|
|
import (
|
|
"fmt"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"git.kirsle.net/apps/doodle/render"
|
|
)
|
|
|
|
// ImageType for supported image formats.
|
|
type ImageType string
|
|
|
|
// Supported image formats.
|
|
const (
|
|
BMP ImageType = "bmp"
|
|
PNG = "png"
|
|
)
|
|
|
|
// Image is a widget that is backed by an image file.
|
|
type Image struct {
|
|
BaseWidget
|
|
|
|
// Configurable fields for the constructor.
|
|
Type ImageType
|
|
texture render.Texturer
|
|
}
|
|
|
|
// NewImage creates a new Image.
|
|
func NewImage(c Image) *Image {
|
|
w := &Image{
|
|
Type: c.Type,
|
|
}
|
|
if w.Type == "" {
|
|
w.Type = BMP
|
|
}
|
|
|
|
w.IDFunc(func() string {
|
|
return fmt.Sprintf(`Image<"%s">`, w.Type)
|
|
})
|
|
return w
|
|
}
|
|
|
|
// OpenImage initializes an Image with a given file name.
|
|
//
|
|
// The file extension is important and should be a supported ImageType.
|
|
func OpenImage(e render.Engine, filename string) (*Image, error) {
|
|
w := &Image{}
|
|
switch strings.ToLower(filepath.Ext(filename)) {
|
|
case ".bmp":
|
|
w.Type = BMP
|
|
case ".png":
|
|
w.Type = PNG
|
|
default:
|
|
return nil, fmt.Errorf("OpenImage: %s: not a supported image type", filename)
|
|
}
|
|
|
|
tex, err := e.NewBitmap(filename)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
w.texture = tex
|
|
return w, nil
|
|
}
|
|
|
|
// Compute the widget.
|
|
func (w *Image) Compute(e render.Engine) {
|
|
w.Resize(w.texture.Size())
|
|
}
|
|
|
|
// Present the widget.
|
|
func (w *Image) Present(e render.Engine, p render.Point) {
|
|
size := w.texture.Size()
|
|
dst := render.Rect{
|
|
X: p.X,
|
|
Y: p.Y,
|
|
W: size.W,
|
|
H: size.H,
|
|
}
|
|
e.Copy(w.texture, size, dst)
|
|
}
|