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

graphics: Refactoring: Remove imports

Browse Source
This commit is contained in:
Hajime Hoshi 2019-09-19 02:13:11 +09:00
parent e0790ee950
commit 95bc445fea
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
image.go
View File

@ -23,7 +23,6 @@ import (
"github.com/hajimehoshi/ebiten/internal/driver" "github.com/hajimehoshi/ebiten/internal/driver"
"github.com/hajimehoshi/ebiten/internal/graphics" "github.com/hajimehoshi/ebiten/internal/graphics"
"github.com/hajimehoshi/ebiten/internal/shareable"
) )
var ( var (
@ -748,9 +747,8 @@ type DrawImageOptions struct {
// //
// Error returned by NewImage is always nil as of 1.5.0-alpha. // Error returned by NewImage is always nil as of 1.5.0-alpha.
func NewImage(width, height int, filter Filter) (*Image, error) { func NewImage(width, height int, filter Filter) (*Image, error) {
s := shareable.NewImage(width, height)
i := &Image{ i := &Image{
mipmap: newMipmap(s), mipmap: newMipmap(width, height),
filter: filter, filter: filter,
} }
i.addr = i i.addr = i
@ -780,7 +778,7 @@ func (i *Image) makeVolatile() {
if i.isDisposed() { if i.isDisposed() {
return return
} }
i.mipmap.orig.MakeVolatile() i.mipmap.makeVolatile()
i.disposeMipmaps() i.disposeMipmaps()
} }
@ -797,9 +795,8 @@ func NewImageFromImage(source image.Image, filter Filter) (*Image, error) {
width, height := size.X, size.Y width, height := size.X, size.Y
s := shareable.NewImage(width, height)
i := &Image{ i := &Image{
mipmap: newMipmap(s), mipmap: newMipmap(width, height),
filter: filter, filter: filter,
} }
i.addr = i i.addr = i
@ -810,7 +807,7 @@ func NewImageFromImage(source image.Image, filter Filter) (*Image, error) {
func newScreenFramebufferImage(width, height int) *Image { func newScreenFramebufferImage(width, height int) *Image {
i := &Image{ i := &Image{
mipmap: newMipmap(shareable.NewScreenFramebufferImage(width, height)), mipmap: newScreenFramebufferMipmap(width, height),
filter: FilterDefault, filter: FilterDefault,
} }
i.addr = i i.addr = i

2
imagedumper_desktop.go
View File

@ -52,7 +52,7 @@ func takeScreenshot(screen *Image) error {
return err return err
} }
if err := screen.mipmap.orig.Dump(newname); err != nil { if err := screen.mipmap.dump(newname); err != nil {
return err return err
} }

19
mipmap.go
View File

@ -31,9 +31,16 @@ type mipmap struct {
imgs map[image.Rectangle]levelToImage imgs map[image.Rectangle]levelToImage
} }
func newMipmap(s *shareable.Image) *mipmap { func newMipmap(width, height int) *mipmap {
return &mipmap{ return &mipmap{
orig: s, orig: shareable.NewImage(width, height),
imgs: map[image.Rectangle]levelToImage{},
}
}
func newScreenFramebufferMipmap(width, height int) *mipmap {
return &mipmap{
orig: shareable.NewScreenFramebufferImage(width, height),
imgs: map[image.Rectangle]levelToImage{}, imgs: map[image.Rectangle]levelToImage{},
} }
} }
@ -42,6 +49,14 @@ func (m *mipmap) original() *shareable.Image {
return m.orig return m.orig
} }
func (m *mipmap) makeVolatile() {
m.orig.MakeVolatile()
}
func (m *mipmap) dump(name string) error {
return m.orig.Dump(name)
}
func (m *mipmap) level(r image.Rectangle, level int) *shareable.Image { func (m *mipmap) level(r image.Rectangle, level int) *shareable.Image {
if level == 0 { if level == 0 {
panic("ebiten: level must be non-zero at level") panic("ebiten: level must be non-zero at level")