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

graphics: ReplacePixels should work on shared textures

Browse Source
This commit is contained in:
Hajime Hoshi 2018-03-03 20:35:44 +09:00
parent 4ae9d5780c
commit caf4e9504f
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
image.go
View File

@ -147,16 +147,6 @@ func (i *Image) isDisposed() bool {
return i.restorable == nil && i.sharedImagePart == nil return i.restorable == nil && i.sharedImagePart == nil
} }
func (i *Image) restorableImage() *restorable.Image {
if i.restorable != nil {
return i.restorable
}
if i.sharedImagePart != nil {
return i.sharedImagePart.image()
}
return nil
}
// DrawImage draws the given image on the image i. // DrawImage draws the given image on the image i.
// //
// DrawImage accepts the options. For details, see the document of DrawImageOptions. // DrawImage accepts the options. For details, see the document of DrawImageOptions.
@ -355,6 +345,27 @@ func (i *Image) Dispose() error {
return nil return nil
} }
func (i *Image) region() (x, y, width, height int) {
if i.restorable != nil {
w, h := i.restorable.Size()
return 0, 0, w, h
}
if i.sharedImagePart != nil {
return i.sharedImagePart.region()
}
panic("not reached")
}
func (i *Image) restorableImage() *restorable.Image {
if i.restorable != nil {
return i.restorable
}
if i.sharedImagePart != nil {
return i.sharedImagePart.image()
}
return nil
}
// ReplacePixels replaces the pixels of the image with p. // ReplacePixels replaces the pixels of the image with p.
// //
// The given p must represent RGBA pre-multiplied alpha values. len(p) must equal to 4 * (image width) * (image height). // The given p must represent RGBA pre-multiplied alpha values. len(p) must equal to 4 * (image width) * (image height).
@ -368,15 +379,14 @@ func (i *Image) Dispose() error {
// ReplacePixels always returns nil as of 1.5.0-alpha. // ReplacePixels always returns nil as of 1.5.0-alpha.
func (i *Image) ReplacePixels(p []byte) error { func (i *Image) ReplacePixels(p []byte) error {
i.copyCheck() i.copyCheck()
i.ensureNotShared()
if i.isDisposed() { if i.isDisposed() {
return nil return nil
} }
w, h := i.Size() x, y, w, h := i.region()
if l := 4 * w * h; len(p) != l { if l := 4 * w * h; len(p) != l {
panic(fmt.Sprintf("ebiten: len(p) was %d but must be %d", len(p), l)) panic(fmt.Sprintf("ebiten: len(p) was %d but must be %d", len(p), l))
} }
i.restorable.ReplacePixels(p, 0, 0, w, h) i.restorableImage().ReplacePixels(p, x, y, w, h)
return nil return nil
} }
@ -515,14 +525,7 @@ func NewImageFromImage(source image.Image, filter Filter) (*Image, error) {
for j := 0; j < height; j++ { for j := 0; j < height; j++ {
copy(p[j*width*4:(j+1)*width*4], rgbaImg.Pix[j*rgbaImg.Stride:]) copy(p[j*width*4:(j+1)*width*4], rgbaImg.Pix[j*rgbaImg.Stride:])
} }
_ = i.ReplacePixels(p)
if s == nil {
_ = i.ReplacePixels(p)
} else {
x, y, width, height := s.region()
s.image().ReplacePixels(p, x, y, width, height)
}
return i, nil return i, nil
} }

5
image_test.go
View File

@ -318,6 +318,10 @@ func TestImageDotByDotInversion(t *testing.T) {
} }
func TestReplacePixels(t *testing.T) { func TestReplacePixels(t *testing.T) {
// Create a dummy image so that the shared texture is use and origImg's position is shfited.
dummyImg, _ := NewImageFromImage(image.NewRGBA(image.Rect(0, 0, 16, 16)), FilterDefault)
defer dummyImg.Dispose()
origImg, err := openImage("testdata/ebiten.png") origImg, err := openImage("testdata/ebiten.png")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -369,7 +373,6 @@ func TestReplacePixels(t *testing.T) {
} }
} }
} }
} }
func TestImageDispose(t *testing.T) { func TestImageDispose(t *testing.T) {