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

text/v2: refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2023-11-13 02:10:57 +09:00
parent 56faf34932
commit a645fbb2b0
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
text/v2/std.go
View File

@ -126,34 +126,33 @@ func (s *StdFace) appendGlyphs(glyphs []Glyph, text string, originX, originY flo
func (s *StdFace) glyphImage(r rune, origin fixed.Point26_6) (*ebiten.Image, float64, float64, fixed.Int26_6) { func (s *StdFace) glyphImage(r rune, origin fixed.Point26_6) (*ebiten.Image, float64, float64, fixed.Int26_6) {
b, a, _ := s.f.GlyphBounds(r) b, a, _ := s.f.GlyphBounds(r)
offset := fixed.Point26_6{ subpixelOffset := fixed.Point26_6{
X: (adjustOffsetGranularity(origin.X) + b.Min.X) & ((1 << 6) - 1), X: (adjustOffsetGranularity(origin.X) + b.Min.X) & ((1 << 6) - 1),
Y: (fixed.I(origin.Y.Floor()) + b.Min.Y) & ((1 << 6) - 1), Y: (fixed.I(origin.Y.Floor()) + b.Min.Y) & ((1 << 6) - 1),
} }
key := glyphImageCacheKey{ key := glyphImageCacheKey{
rune: r, rune: r,
xoffset: offset.X, xoffset: subpixelOffset.X,
// yoffset is always an integer, so this doesn't have to be a key. // yoffset is always an integer, so this doesn't have to be a key.
} }
img := theGlyphImageCache.getOrCreate(s, key, func() *ebiten.Image { img := theGlyphImageCache.getOrCreate(s, key, func() *ebiten.Image {
return s.glyphImageImpl(r, offset) return s.glyphImageImpl(r, subpixelOffset, b)
}) })
imgX := fixed26_6ToFloat64(origin.X + b.Min.X - offset.X) imgX := fixed26_6ToFloat64(origin.X + b.Min.X - subpixelOffset.X)
imgY := fixed26_6ToFloat64(origin.Y + b.Min.Y - offset.Y) imgY := fixed26_6ToFloat64(origin.Y + b.Min.Y - subpixelOffset.Y)
return img, imgX, imgY, a return img, imgX, imgY, a
} }
func (s *StdFace) glyphImageImpl(r rune, offset fixed.Point26_6) *ebiten.Image { func (s *StdFace) glyphImageImpl(r rune, subpixelOffset fixed.Point26_6, glyphBounds fixed.Rectangle26_6) *ebiten.Image {
b, _, _ := s.f.GlyphBounds(r) w, h := (glyphBounds.Max.X - glyphBounds.Min.X).Ceil(), (glyphBounds.Max.Y - glyphBounds.Min.Y).Ceil()
w, h := (b.Max.X - b.Min.X).Ceil(), (b.Max.Y - b.Min.Y).Ceil()
if w == 0 || h == 0 { if w == 0 || h == 0 {
return nil return nil
} }
if b.Min.X&((1<<6)-1) != 0 { if glyphBounds.Min.X&((1<<6)-1) != 0 {
w++ w++
} }
if b.Min.Y&((1<<6)-1) != 0 { if glyphBounds.Min.Y&((1<<6)-1) != 0 {
h++ h++
} }
rgba := image.NewRGBA(image.Rect(0, 0, w, h)) rgba := image.NewRGBA(image.Rect(0, 0, w, h))
@ -162,12 +161,11 @@ func (s *StdFace) glyphImageImpl(r rune, offset fixed.Point26_6) *ebiten.Image {
Dst: rgba, Dst: rgba,
Src: image.White, Src: image.White,
Face: s.f, Face: s.f,
Dot: fixed.Point26_6{
X: -glyphBounds.Min.X + subpixelOffset.X,
Y: -glyphBounds.Min.Y + subpixelOffset.Y,
},
} }
x, y := -b.Min.X, -b.Min.Y
x += offset.X
y += offset.Y
d.Dot = fixed.Point26_6{X: x, Y: y}
d.DrawString(string(r)) d.DrawString(string(r))
return ebiten.NewImageFromImage(rgba) return ebiten.NewImageFromImage(rgba)