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: Add (*Image).isDisposed

Browse Source
This commit is contained in:
Hajime Hoshi 2018-02-26 11:35:55 +09:00
parent f953afc518
commit 9031a989ec
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
image.go
View File

@ -115,6 +115,10 @@ func (i *Image) fill(r, g, b, a uint8) {
_ = i.DrawImage(emptyImage, op) _ = i.DrawImage(emptyImage, op)
} }
func (i *Image) isDisposed() bool {
return i.restorable == 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.
@ -125,7 +129,8 @@ func (i *Image) fill(r, g, b, a uint8) {
// Even if the argument image is mutated after this call, // Even if the argument image is mutated after this call,
// the drawing result is never affected. // the drawing result is never affected.
// //
// When the i is disposed, DrawImage does nothing. // When the image i is disposed, DrawImage does nothing.
// When the given image img is disposed, DrawImage panics.
// //
// When the given image is as same as i, DrawImage panics. // When the given image is as same as i, DrawImage panics.
// //
@ -146,7 +151,10 @@ func (i *Image) DrawImage(img *Image, options *DrawImageOptions) error {
if i == img { if i == img {
panic("ebiten: Image.DrawImage: img must be different from the receiver") panic("ebiten: Image.DrawImage: img must be different from the receiver")
} }
if i.restorable == nil { if img.isDisposed() {
panic("ebiten: the given image to DrawImage must not be disposed")
}
if i.isDisposed() {
return nil return nil
} }
// Calculate vertices before locking because the user can do anything in // Calculate vertices before locking because the user can do anything in
@ -231,7 +239,7 @@ func (i *Image) ColorModel() color.Model {
// //
// At can't be called before the main loop (ebiten.Run) starts (as of version 1.4.0-alpha). // At can't be called before the main loop (ebiten.Run) starts (as of version 1.4.0-alpha).
func (i *Image) At(x, y int) color.Color { func (i *Image) At(x, y int) color.Color {
if i.restorable == nil { if i.isDisposed() {
return color.Transparent return color.Transparent
} }
// TODO: Error should be delayed until flushing. Do not panic here. // TODO: Error should be delayed until flushing. Do not panic here.
@ -251,7 +259,7 @@ func (i *Image) At(x, y int) color.Color {
// Dipose always return nil as of 1.5.0-alpha. // Dipose always return nil as of 1.5.0-alpha.
func (i *Image) Dispose() error { func (i *Image) Dispose() error {
i.copyCheck() i.copyCheck()
if i.restorable == nil { if i.isDisposed() {
return nil return nil
} }
i.restorable.Dispose() i.restorable.Dispose()
@ -273,7 +281,7 @@ 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()
if i.restorable == nil { if i.isDisposed() {
return nil return nil
} }
w, h := i.Size() w, h := i.Size()