mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-26 03:38:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

buffered: Add 'Pixels' and remove 'At'

Browse Source 
This is a preparation to make shareable.Image and ebiten.Image 1:1
Now sub-images doesn't have its own shareable.Image.

Updates #896
Updates #1194
This commit is contained in:
Hajime Hoshi 2020-06-13 20:57:29 +09:00
parent 5db4a55a07
commit 40906676e6
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
image.go
View File

@ -492,11 +492,12 @@ func (i *Image) At(x, y int) color.Color {
if i.isSubImage() && !image.Pt(x, y).In(i.bounds) { if i.isSubImage() && !image.Pt(x, y).In(i.bounds) {
return color.RGBA{} return color.RGBA{}
} }
r, g, b, a, err := i.buffered.At(x, y) pix, err := i.buffered.Pixels(x, y, 1, 1)
if err != nil { if err != nil {
theUIContext.setError(err) theUIContext.setError(err)
return color.RGBA{}
} }
return color.RGBA{r, g, b, a} return color.RGBA{pix[0], pix[1], pix[2], pix[3]}
} }
// Set sets the color at (x, y). // Set sets the color at (x, y).

38
internal/buffered/image.go
View File

@ -136,33 +136,43 @@ func (i *Image) MarkDisposed() {
i.img.MarkDisposed() i.img.MarkDisposed()
} }
func (i *Image) At(x, y int) (r, g, b, a byte, err error) { func (img *Image) Pixels(x, y, width, height int) (pix []byte, err error) {
delayedCommandsM.Lock() delayedCommandsM.Lock()
defer delayedCommandsM.Unlock() defer delayedCommandsM.Unlock()
if needsToDelayCommands { if needsToDelayCommands {
panic("buffered: the command queue is not available yet at At") panic("buffered: the command queue is not available yet at At")
} }
if x < 0 || y < 0 || x >= i.width || y >= i.height { if !image.Rect(x, y, x+width, y+height).In(image.Rect(0, 0, img.width, img.height)) {
return 0, 0, 0, 0, nil return nil, fmt.Errorf("buffered: out of range")
} }
pix = make([]byte, 4*width*height)
// If there are pixels or pending fillling that needs to be resolved, use this rather than resolving. // If there are pixels or pending fillling that needs to be resolved, use this rather than resolving.
// Resolving them needs to access GPU and is expensive (#1137). // Resolving them needs to access GPU and is expensive (#1137).
if i.hasFill { if img.hasFill {
return i.fillColor.R, i.fillColor.G, i.fillColor.B, i.fillColor.A, nil for i := 0; i < len(pix)/4; i++ {
} pix[4*i] = img.fillColor.R
pix[4*i+1] = img.fillColor.G
if i.pixels == nil { pix[4*i+2] = img.fillColor.B
pix, err := i.img.Pixels(0, 0, i.width, i.height) pix[4*i+3] = img.fillColor.A
if err != nil {
return 0, 0, 0, 0, err
} }
i.pixels = pix return pix, nil
} }
idx := i.width*y + x if img.pixels == nil {
return i.pixels[4*idx], i.pixels[4*idx+1], i.pixels[4*idx+2], i.pixels[4*idx+3], nil pix, err := img.img.Pixels(0, 0, img.width, img.height)
if err != nil {
return nil, err
}
img.pixels = pix
}
for j := 0; j < height; j++ {
copy(pix[4*j*width:4*(j+1)*width], img.pixels[4*((j+y)*img.width+x):])
}
return pix, nil
} }
func (i *Image) Dump(name string, blackbg bool) error { func (i *Image) Dump(name string, blackbg bool) error {