ebiten: bug fix: SubImage+At didn't consider the original image's set…

…VerticesCache Close #2428
hajimehoshi · Nov 2, 2022 · aecbf23 · aecbf23
1 parent b983014
commit aecbf23
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/image.go b/image.go
@@ -858,6 +858,9 @@ func (i *Image) at(x, y int) (r, g, b, a byte) {
 		return 0, 0, 0, 0
 	}
 	x, y = i.adjustPosition(x, y)
+	if i.isSubImage() {
+		i = i.original
+	}
 	if c, ok := i.setVerticesCache[[2]int{x, y}]; ok {
 		return c[0], c[1], c[2], c[3]
 	}

diff --git a/image_test.go b/image_test.go
@@ -3433,3 +3433,15 @@ func TestImageTooManyConstantBuffersInDirectX(t *testing.T) {
 		t.Errorf("got: %v, want: %v", got, want)
 	}
 }
+
+// Issue #2428
+func TestImageSetAndSubImage(t *testing.T) {
+	const w, h = 16, 16
+	img := ebiten.NewImage(w, h)
+	img.Set(1, 1, color.RGBA{0xff, 0, 0, 0xff})
+	got := img.SubImage(image.Rect(0, 0, w, h)).At(1, 1).(color.RGBA)
+	want := color.RGBA{0xff, 0, 0, 0xff}
+	if got != want {
+		t.Errorf("got: %v, want: %v", got, want)
+	}
+}