Revert "Revert "ebitenutil: Use ColorM""

This reverts commit 7f46b46f66.
This commit is contained in:
Hajime Hoshi 2018-08-11 01:49:33 +09:00
parent 690c3cf981
commit cc17fbc166

View File

@ -23,28 +23,11 @@ import (
var ( var (
debugPrintTextImage *ebiten.Image debugPrintTextImage *ebiten.Image
debugPrintTextShadowImage *ebiten.Image
) )
func init() { func init() {
img := assets.CreateTextImage() img := assets.CreateTextImage()
debugPrintTextImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault) debugPrintTextImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
// Using color matrices for shadow color is not efficient.
// Instead, use a different image, that shares the same texture in highly possibility.
s := img.Bounds().Size()
for j := 0; j < s.Y; j++ {
for i := 0; i < s.X; i++ {
idx := (img.Stride)*j + 4*i
if img.Pix[idx+3] != 0 {
img.Pix[idx] = 0
img.Pix[idx+1] = 0
img.Pix[idx+2] = 0
img.Pix[idx+3] = 0x80
}
}
}
debugPrintTextShadowImage, _ = ebiten.NewImageFromImage(img, ebiten.FilterDefault)
} }
// DebugPrint draws the string str on the image. // DebugPrint draws the string str on the image.
@ -53,13 +36,16 @@ func init() {
// //
// DebugPrint always returns nil as of 1.5.0-alpha. // DebugPrint always returns nil as of 1.5.0-alpha.
func DebugPrint(image *ebiten.Image, str string) error { func DebugPrint(image *ebiten.Image, str string) error {
drawDebugText(image, str, 1, 1, debugPrintTextShadowImage) drawDebugText(image, str, 1, 1, true)
drawDebugText(image, str, 0, 0, debugPrintTextImage) drawDebugText(image, str, 0, 0, false)
return nil return nil
} }
func drawDebugText(rt *ebiten.Image, str string, ox, oy int, src *ebiten.Image) { func drawDebugText(rt *ebiten.Image, str string, ox, oy int, shadow bool) {
op := &ebiten.DrawImageOptions{} op := &ebiten.DrawImageOptions{}
if shadow {
op.ColorM.Scale(0, 0, 0, 0.5)
}
x := 0 x := 0
y := 0 y := 0
w, _ := debugPrintTextImage.Size() w, _ := debugPrintTextImage.Size()
@ -85,7 +71,7 @@ func drawDebugText(rt *ebiten.Image, str string, ox, oy int, src *ebiten.Image)
op.GeoM.Reset() op.GeoM.Reset()
op.GeoM.Translate(float64(x), float64(y)) op.GeoM.Translate(float64(x), float64(y))
op.GeoM.Translate(float64(ox+1), float64(oy)) op.GeoM.Translate(float64(ox+1), float64(oy))
_ = rt.DrawImage(src, op) _ = rt.DrawImage(debugPrintTextImage, op)
x += cw x += cw
} }
} }