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

internal/restorable: refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2023-03-10 22:29:59 +09:00
parent 46173ffec6
commit 84146510ce
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/restorable/export_test.go
View File

@ -18,6 +18,6 @@ import (
"image"
)
func RemoveDuplicatedRegions(regions []image.Rectangle) []image.Rectangle {
func RemoveDuplicatedRegions(regions []image.Rectangle) int {
return removeDuplicatedRegions(regions)
}

23
internal/restorable/image.go
View File

@ -257,7 +257,8 @@ func (i *Image) makeStale(rect image.Rectangle) {
}
// Remove duplicated regions to avoid unnecessary reading pixels from GPU.
i.staleRegions = removeDuplicatedRegions(i.staleRegions)
n := removeDuplicatedRegions(i.staleRegions)
i.staleRegions = i.staleRegions[:n]
// Don't have to call makeStale recursively here.
// Restoring is done after topological sorting is done.
@ -486,8 +487,8 @@ func (i *Image) readPixelsFromGPU(graphicsDriver graphicsdriver.Graphics) error
defer func() {
i.regionsCache = i.regionsCache[:0]
}()
i.regionsCache = removeDuplicatedRegions(i.regionsCache)
rs = i.regionsCache
n := removeDuplicatedRegions(i.regionsCache)
rs = i.regionsCache[:n]
}
for _, r := range rs {
@ -628,9 +629,10 @@ func (i *Image) restore(graphicsDriver graphicsdriver.Graphics) error {
defer func() {
i.regionsCache = i.regionsCache[:0]
}()
i.regionsCache = removeDuplicatedRegions(i.regionsCache)
n := removeDuplicatedRegions(i.regionsCache)
rs := i.regionsCache[:n]
for _, r := range i.regionsCache {
for _, r := range rs {
if r.Empty() {
continue
}
@ -706,9 +708,8 @@ func (i *Image) appendRegionsForDrawTriangles(regions []image.Rectangle) []image
regions = append(regions, r)
}
origRegions := regions[:n]
newRegions := removeDuplicatedRegions(regions[n:])
return append(origRegions, newRegions...)
nn := removeDuplicatedRegions(regions[n:])
return regions[:n+nn]
}
func regionToRectangle(region graphicsdriver.Region) image.Rectangle {
@ -719,9 +720,9 @@ func regionToRectangle(region graphicsdriver.Region) image.Rectangle {
int(math.Ceil(float64(region.Y+region.Height))))
}
// removeDuplicatedRegions removes duplicated regions and returns a shrunk slice.
// removeDuplicatedRegions removes duplicated regions and returns the new size of the slice.
// If a region covers other regions, the covered regions are removed.
func removeDuplicatedRegions(regions []image.Rectangle) []image.Rectangle {
func removeDuplicatedRegions(regions []image.Rectangle) int {
for i, r := range regions {
if r.Empty() {
continue
@ -748,5 +749,5 @@ func removeDuplicatedRegions(regions []image.Rectangle) []image.Rectangle {
n++
}
return regions[:n]
return n
}

3
internal/restorable/rect_test.go
View File

@ -120,7 +120,8 @@ func TestRemoveDuplicatedRegions(t *testing.T) {
}
for _, c := range cases {
got := restorable.RemoveDuplicatedRegions(c.In)
n := restorable.RemoveDuplicatedRegions(c.In)
got := c.In[:n]
want := c.Out
if !areEqualRectangles(got, want) {
t.Errorf("restorable.RemoveDuplicatedRegions(%#v): got: %#v, want: %#v", c.In, got, want)