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

graphics: Refactoring: Remove (*sharedImagePart).image()

Browse Source
This commit is contained in:
Hajime Hoshi 2018-03-10 23:27:16 +09:00
parent afda41a5ed
commit 26f4999ddd
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
image.go
View File

@ -246,7 +246,7 @@ func (i *Image) DrawImage(img *Image, options *DrawImageOptions) error {
filter = graphics.Filter(img.filter) filter = graphics.Filter(img.filter)
} }
i.sharedImagePart.image().DrawImage(img.sharedImagePart.image(), sx0, sy0, sx1, sy1, geom, options.ColorM.impl, mode, filter) i.sharedImagePart.DrawImage(img.sharedImagePart, sx0, sy0, sx1, sy1, geom, options.ColorM.impl, mode, filter)
return nil return nil
} }
@ -276,7 +276,7 @@ func (i *Image) At(x, y int) color.Color {
if x < 0 || y < 0 || x >= w || y >= h { if x < 0 || y < 0 || x >= w || y >= h {
return color.RGBA{} return color.RGBA{}
} }
clr, err := i.sharedImagePart.image().At(x+ox, y+oy) clr, err := i.sharedImagePart.At(x+ox, y+oy)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -321,7 +321,7 @@ func (i *Image) ReplacePixels(p []byte) error {
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.sharedImagePart.image().ReplacePixels(p, x, y, w, h) i.sharedImagePart.ReplacePixels(p, x, y, w, h)
return nil return nil
} }

19
shared.go
View File

@ -15,6 +15,9 @@
package ebiten package ebiten
import ( import (
"image/color"
"github.com/hajimehoshi/ebiten/internal/affine"
"github.com/hajimehoshi/ebiten/internal/graphics" "github.com/hajimehoshi/ebiten/internal/graphics"
"github.com/hajimehoshi/ebiten/internal/opengl" "github.com/hajimehoshi/ebiten/internal/opengl"
"github.com/hajimehoshi/ebiten/internal/packing" "github.com/hajimehoshi/ebiten/internal/packing"
@ -53,10 +56,6 @@ func (s *sharedImagePart) ensureNotShared() {
} }
} }
func (s *sharedImagePart) image() *restorable.Image {
return s.sharedImage.restorable
}
func (s *sharedImagePart) region() (x, y, width, height int) { func (s *sharedImagePart) region() (x, y, width, height int) {
if s.node == nil { if s.node == nil {
w, h := s.sharedImage.restorable.Size() w, h := s.sharedImage.restorable.Size()
@ -65,6 +64,18 @@ func (s *sharedImagePart) region() (x, y, width, height int) {
return s.node.Region() return s.node.Region()
} }
func (s *sharedImagePart) DrawImage(img *sharedImagePart, sx0, sy0, sx1, sy1 int, geom *affine.GeoM, colorm *affine.ColorM, mode opengl.CompositeMode, filter graphics.Filter) {
s.sharedImage.restorable.DrawImage(img.sharedImage.restorable, sx0, sy0, sx1, sy1, geom, colorm, mode, filter)
}
func (s *sharedImagePart) ReplacePixels(pixels []byte, x, y, width, height int) {
s.sharedImage.restorable.ReplacePixels(pixels, x, y, width, height)
}
func (s *sharedImagePart) At(x, y int) (color.Color, error) {
return s.sharedImage.restorable.At(x, y)
}
func (s *sharedImagePart) isDisposed() bool { func (s *sharedImagePart) isDisposed() bool {
return s.sharedImage == nil return s.sharedImage == nil
} }