mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-26 10:42:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

restorable: Remove Pixels.Slice()

Browse Source
This commit is contained in:
Hajime Hoshi 2019-07-16 02:03:15 +09:00
parent f3fa535afb
commit 2b632d0707
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
internal/restorable/image.go
View File

@ -74,11 +74,6 @@ func (p *Pixels) At(i int) byte {
return p.pixels[i] return p.pixels[i]
} }
func (p *Pixels) Slice() []byte {
p.ensurePixels()
return p.pixels
}
// drawTrianglesHistoryItem is an item for history of draw-image commands. // drawTrianglesHistoryItem is an item for history of draw-image commands.
type drawTrianglesHistoryItem struct { type drawTrianglesHistoryItem struct {
image *Image image *Image
@ -537,7 +532,20 @@ func (i *Image) restore() error {
gimg := graphicscommand.NewImage(w, h) gimg := graphicscommand.NewImage(w, h)
if i.basePixels != nil { if i.basePixels != nil {
gimg.ReplacePixels(i.basePixels.Slice(), 0, 0, w, h) if i.basePixels.pixels != nil {
// If ReplacePixels is the first command, the image doesn't have be cleared.
gimg.ReplacePixels(i.basePixels.pixels, 0, 0, w, h)
} else {
// Clear the image explicitly.
fillImage(gimg, 0, 0, 0, 0)
r := i.basePixels.color.R
g := i.basePixels.color.G
b := i.basePixels.color.B
a := i.basePixels.color.A
if a > 0 {
fillImage(gimg, r, g, b, a)
}
}
} else { } else {
// Clear the image explicitly. // Clear the image explicitly.
fillImage(gimg, 0, 0, 0, 0) fillImage(gimg, 0, 0, 0, 0)
@ -550,6 +558,7 @@ func (i *Image) restore() error {
} }
i.image = gimg i.image = gimg
// TODO: Can we avoid getting pixels here? (#897)
pix := gimg.Pixels() pix := gimg.Pixels()
i.basePixels = &Pixels{ i.basePixels = &Pixels{
pixels: pix, pixels: pix,