mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-09-20 05:12:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

text: Bug fix: Draw didn't work correctly with non-integer glyph bounds

Browse Source 
Fixes #1377
This commit is contained in:
Hajime Hoshi 2020-10-03 23:04:46 +09:00
parent 43734dc1a2
commit c08f47f445
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
text/text.go
View File

@ -54,7 +54,7 @@ func drawGlyph(dst *ebiten.Image, face font.Face, r rune, img *ebiten.Image, x,
b := getGlyphBounds(face, r) b := getGlyphBounds(face, r)
op := &ebiten.DrawImageOptions{} op := &ebiten.DrawImageOptions{}
op.GeoM.Translate(fixed26_6ToFloat64((x + b.Min.X)), fixed26_6ToFloat64((y + b.Min.Y))) op.GeoM.Translate(float64((x+b.Min.X)>>6), float64((y+b.Min.Y)>>6))
op.ColorM = clr op.ColorM = clr
_ = dst.DrawImage(img, op) _ = dst.DrawImage(img, op)
} }
@ -136,6 +136,12 @@ func getGlyphImages(face font.Face, runes []rune) []*ebiten.Image {
for i, r := range neededGlyphIndices { for i, r := range neededGlyphIndices {
b := glyphBounds[r] b := glyphBounds[r]
w, h := (b.Max.X - b.Min.X).Ceil(), (b.Max.Y - b.Min.Y).Ceil() w, h := (b.Max.X - b.Min.X).Ceil(), (b.Max.Y - b.Min.Y).Ceil()
if b.Min.X&((1<<6)-1) != 0 {
w++
}
if b.Min.Y&((1<<6)-1) != 0 {
h++
}
rgba := image.NewRGBA(image.Rect(0, 0, w, h)) rgba := image.NewRGBA(image.Rect(0, 0, w, h))
d := font.Drawer{ d := font.Drawer{
@ -143,7 +149,9 @@ func getGlyphImages(face font.Face, runes []rune) []*ebiten.Image {
Src: image.White, Src: image.White,
Face: face, Face: face,
} }
d.Dot = fixed.Point26_6{X: -b.Min.X, Y: -b.Min.Y} x, y := -b.Min.X, -b.Min.Y
x, y = fixed.I(x.Ceil()), fixed.I(y.Ceil())
d.Dot = fixed.Point26_6{X: x, Y: y}
d.DrawString(string(r)) d.DrawString(string(r))
img, _ := ebiten.NewImageFromImage(rgba, ebiten.FilterDefault) img, _ := ebiten.NewImageFromImage(rgba, ebiten.FilterDefault)