mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-24 10:48:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

graphics: Bug fix: ReplacePixels must reset pixels out of range (#316)

Browse Source
This commit is contained in:
Hajime Hoshi 2017-02-05 04:16:09 +09:00
parent d7f1165aa3
commit 91681bdc25
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
imageimpl.go
View File

@ -257,7 +257,12 @@ func (i *imageImpl) ReplacePixels(p []uint8) error {
if i.restorable == nil {
return errors.New("ebiten: image is already disposed")
}
if err := i.restorable.ReplacePixels(p); err != nil {
w2, h2 := graphics.NextPowerOf2Int(w), graphics.NextPowerOf2Int(h)
pix := make([]uint8, 4*w2*h2)
for j := 0; j < h; j++ {
copy(pix[j*w2*4:], p[j*w*4:(j+1)*w*4])
}
if err := i.restorable.ReplacePixels(pix); err != nil {
return err
}
return nil

2
internal/graphics/command.go
View File

@ -272,7 +272,7 @@ func (c *replacePixelsCommand) Exec(context *opengl.Context, indexOffsetInBytes
if err := context.BindTexture(c.dst.texture.native); err != nil {
return err
}
context.TexSubImage2D(c.pixels, c.dst.width, c.dst.height)
context.TexSubImage2D(c.pixels, NextPowerOf2Int(c.dst.width), NextPowerOf2Int(c.dst.height))
return nil
}

2
internal/graphics/image.go
View File

@ -165,7 +165,7 @@ func (i *Image) Pixels(context *opengl.Context) ([]uint8, error) {
if err != nil {
return nil, err
}
return context.FramebufferPixels(f.native, i.width, i.height)
return context.FramebufferPixels(f.native, NextPowerOf2Int(i.width), NextPowerOf2Int(i.height))
}
func (i *Image) ReplacePixels(p []uint8) error {

17
internal/restorable/image.go
View File

@ -64,9 +64,10 @@ func NewImageFromImage(source *image.RGBA, width, height int, filter opengl.Filt
// TODO: texture should be removed here?
return nil, err
}
p := make([]uint8, 4*width*height)
w2, h2 := graphics.NextPowerOf2Int(width), graphics.NextPowerOf2Int(height)
p := make([]uint8, 4*w2*h2)
for j := 0; j < height; j++ {
copy(p[j*width*4:(j+1)*width*4], source.Pix[j*source.Stride:])
copy(p[j*w2*4:(j+1)*w2*4], source.Pix[j*source.Stride:])
}
return &Image{
image: img,
@ -130,10 +131,7 @@ func (p *Image) ReplacePixels(pixels []uint8) error {
if err := p.image.ReplacePixels(pixels); err != nil {
return err
}
if p.basePixels == nil {
p.basePixels = make([]uint8, len(pixels))
}
copy(p.basePixels, pixels)
p.basePixels = pixels
p.baseColor = color.RGBA{}
p.drawImageHistory = nil
p.stale = false
@ -173,12 +171,12 @@ func (p *Image) appendDrawImageHistory(image *Image, vertices []float32, colorm
// This means Pixels members must match with acutal state in VRAM.
func (p *Image) At(x, y int, context *opengl.Context) (color.RGBA, error) {
w, _ := p.image.Size()
idx := 4*x + 4*y*w
if p.basePixels == nil || p.drawImageHistory != nil || p.stale {
if err := p.readPixelsFromVRAM(p.image, context); err != nil {
return color.RGBA{}, err
}
}
idx := 4*x + 4*y*graphics.NextPowerOf2Int(w)
r, g, b, a := p.basePixels[idx], p.basePixels[idx+1], p.basePixels[idx+2], p.basePixels[idx+3]
return color.RGBA{r, g, b, a}, nil
}
@ -258,10 +256,11 @@ func (p *Image) Restore(context *opengl.Context) error {
if p.stale {
return errors.New("restorable: pixels must not be stale when restoring")
}
img := image.NewRGBA(image.Rect(0, 0, graphics.NextPowerOf2Int(w), graphics.NextPowerOf2Int(h)))
w2, h2 := graphics.NextPowerOf2Int(w), graphics.NextPowerOf2Int(h)
img := image.NewRGBA(image.Rect(0, 0, w2, h2))
if p.basePixels != nil {
for j := 0; j < h; j++ {
copy(img.Pix[j*img.Stride:], p.basePixels[j*w*4:(j+1)*w*4])
copy(img.Pix[j*img.Stride:], p.basePixels[j*w2*4:(j+1)*w2*4])
}
}
gimg, err := graphics.NewImageFromImage(img, w, h, p.filter)