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

text: Reuse font.Face instances if they are DeepEqual-ly same (#498)

Browse Source
This commit is contained in:
Hajime Hoshi 2018-02-11 16:05:27 +09:00
parent fb7dc53031
commit 05671e784b
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
text/text.go
View File

@ -21,6 +21,7 @@ import (
"image" "image"
"image/color" "image/color"
"math" "math"
"reflect"
"golang.org/x/image/font" "golang.org/x/image/font"
"golang.org/x/image/math/fixed" "golang.org/x/image/math/fixed"
@ -39,12 +40,36 @@ func now() int64 {
return monotonicClock return monotonicClock
} }
type face struct {
f font.Face
}
var (
faces = map[font.Face]face{}
)
func fontFaceToFace(f font.Face) face {
if fa, ok := faces[f]; ok {
return fa
}
// If the (DeepEqual-ly) same font exists,
// reuse this to avoid to consume a lot of cache (#498).
for key, value := range faces {
if reflect.DeepEqual(key, f) {
return value
}
}
fe := face{f}
faces[f] = fe
return fe
}
var ( var (
charBounds = map[char]fixed.Rectangle26_6{} charBounds = map[char]fixed.Rectangle26_6{}
) )
type char struct { type char struct {
face font.Face face face
rune rune rune rune
} }
@ -52,7 +77,7 @@ func (c *char) bounds() fixed.Rectangle26_6 {
if b, ok := charBounds[*c]; ok { if b, ok := charBounds[*c]; ok {
return b return b
} }
b, _, _ := c.face.GlyphBounds(c.rune) b, _, _ := c.face.f.GlyphBounds(c.rune)
charBounds[*c] = b charBounds[*c] = b
return b return b
} }
@ -153,7 +178,7 @@ func (a *atlas) maxGlyphNum() int {
return xnum * ynum return xnum * ynum
} }
func (a *atlas) appendGlyph(face font.Face, rune rune, now int64) *glyph { func (a *atlas) appendGlyph(face face, rune rune, now int64) *glyph {
g := &glyph{ g := &glyph{
char: char{face, rune}, char: char{face, rune},
atime: now, atime: now,
@ -191,7 +216,7 @@ func (a *atlas) draw(glyph *glyph) {
d := font.Drawer{ d := font.Drawer{
Dst: dst, Dst: dst,
Src: image.White, Src: image.White,
Face: glyph.char.face, Face: glyph.char.face.f,
} }
b := glyph.char.bounds() b := glyph.char.bounds()
d.Dot = fixed.Point26_6{-b.Min.X, -b.Min.Y} d.Dot = fixed.Point26_6{-b.Min.X, -b.Min.Y}
@ -208,7 +233,7 @@ func (a *atlas) draw(glyph *glyph) {
} }
func getGlyphFromCache(face font.Face, r rune, now int64) *glyph { func getGlyphFromCache(face font.Face, r rune, now int64) *glyph {
ch := char{face, r} ch := char{fontFaceToFace(face), r}
a, ok := atlases[ch.atlasGroup()] a, ok := atlases[ch.atlasGroup()]
if ok { if ok {
g, ok := a.charToGlyph[ch] g, ok := a.charToGlyph[ch]