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

internal/atlas: refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2023-04-29 13:35:56 +09:00
parent e98acd3dc7
commit b32258ab8c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/atlas/image.go
View File

@ -542,7 +542,7 @@ func (i *Image) writePixels(pix []byte, region image.Rectangle) {
r := i.regionWithPadding() r := i.regionWithPadding()
if region.Min.X != 0 || region.Min.Y != 0 || region.Dx() != i.width || region.Dy() != i.height || i.paddingSize() == 0 { if !region.Eq(image.Rect(0, 0, i.width, i.height)) || i.paddingSize() == 0 {
region = region.Add(r.Min) region = region.Add(r.Min)
if pix == nil { if pix == nil {
@ -705,8 +705,11 @@ func (i *Image) allocate(forbiddenBackends []*backend, asSource bool) {
return return
} }
wp := i.width + i.paddingSize()
hp := i.height + i.paddingSize()
if !i.canBePutOnAtlas() { if !i.canBePutOnAtlas() {
if i.width+i.paddingSize() > maxSize || i.height+i.paddingSize() > maxSize { if wp > maxSize || hp > maxSize {
panic(fmt.Sprintf("atlas: the image being put on an atlas is too big: width: %d, height: %d", i.width, i.height)) panic(fmt.Sprintf("atlas: the image being put on an atlas is too big: width: %d, height: %d", i.width, i.height))
} }
@ -715,7 +718,7 @@ func (i *Image) allocate(forbiddenBackends []*backend, asSource bool) {
typ = restorable.ImageTypeVolatile typ = restorable.ImageTypeVolatile
} }
i.backend = &backend{ i.backend = &backend{
restorable: restorable.NewImage(i.width+i.paddingSize(), i.height+i.paddingSize(), typ), restorable: restorable.NewImage(wp, hp, typ),
source: asSource && typ == restorable.ImageTypeRegular, source: asSource && typ == restorable.ImageTypeRegular,
} }
return return
@ -733,7 +736,7 @@ loop:
} }
} }
if n, ok := b.tryAlloc(i.width+i.paddingSize(), i.height+i.paddingSize()); ok { if n, ok := b.tryAlloc(wp, hp); ok {
i.backend = b i.backend = b
i.node = n i.node = n
return return
@ -746,13 +749,13 @@ loop:
} else { } else {
width, height = minDestinationSize, minDestinationSize width, height = minDestinationSize, minDestinationSize
} }
for i.width+i.paddingSize() > width { for wp > width {
if width == maxSize { if width == maxSize {
panic(fmt.Sprintf("atlas: the image being put on an atlas is too big: width: %d, height: %d", i.width, i.height)) panic(fmt.Sprintf("atlas: the image being put on an atlas is too big: width: %d, height: %d", i.width, i.height))
} }
width *= 2 width *= 2
} }
for i.height+i.paddingSize() > height { for hp > height {
if height == maxSize { if height == maxSize {
panic(fmt.Sprintf("atlas: the image being put on an atlas is too big: width: %d, height: %d", i.width, i.height)) panic(fmt.Sprintf("atlas: the image being put on an atlas is too big: width: %d, height: %d", i.width, i.height))
} }
@ -770,7 +773,7 @@ loop:
} }
theBackends = append(theBackends, b) theBackends = append(theBackends, b)
n := b.page.Alloc(i.width+i.paddingSize(), i.height+i.paddingSize()) n := b.page.Alloc(wp, hp)
if n == nil { if n == nil {
panic("atlas: Alloc result must not be nil at allocate") panic("atlas: Alloc result must not be nil at allocate")
} }