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

text: Avoid copying structs for browsers

Browse Source
This commit is contained in:
Hajime Hoshi 2018-02-12 00:42:35 +09:00
parent da51377cc5
commit 8c1a8b64eb
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
text/text.go
View File

@ -73,32 +73,32 @@ type char struct {
rune rune rune rune
} }
func (c *char) bounds() fixed.Rectangle26_6 { func (c *char) bounds() (minX, minY, maxX, maxY fixed.Int26_6) {
if m, ok := charBounds[c.face.f]; ok { if m, ok := charBounds[c.face.f]; ok {
if b, ok := m[c.rune]; ok { if b, ok := m[c.rune]; ok {
return b return b.Min.X, b.Min.Y, b.Max.X, b.Max.Y
} }
} else { } else {
charBounds[c.face.f] = map[rune]fixed.Rectangle26_6{} charBounds[c.face.f] = map[rune]fixed.Rectangle26_6{}
} }
b, _, _ := c.face.f.GlyphBounds(c.rune) b, _, _ := c.face.f.GlyphBounds(c.rune)
charBounds[c.face.f][c.rune] = b charBounds[c.face.f][c.rune] = b
return b return b.Min.X, b.Min.Y, b.Max.X, b.Max.Y
} }
func (c *char) size() fixed.Point26_6 { func (c *char) size() (fixed.Int26_6, fixed.Int26_6) {
b := c.bounds() minX, minY, maxX, maxY := c.bounds()
return b.Max.Sub(b.Min) return maxX - minX, maxY - minY
} }
func (c *char) empty() bool { func (c *char) empty() bool {
s := c.size() x, y := c.size()
return s.X == 0 || s.Y == 0 return x == 0 || y == 0
} }
func (c *char) atlasGroup() int { func (c *char) atlasGroup() int {
s := c.size() x, y := c.size()
w, h := s.X.Ceil(), s.Y.Ceil() w, h := x.Ceil(), y.Ceil()
t := w t := w
if t < h { if t < h {
t = h t = h
@ -128,10 +128,9 @@ func (g *glyph) draw(dst *ebiten.Image, x, y fixed.Int26_6, clr color.Color) {
return return
} }
b := g.char.bounds() minX, minY, _, _ := g.char.bounds()
op := &ebiten.DrawImageOptions{} op := &ebiten.DrawImageOptions{}
op.GeoM.Translate(fixed26_6ToFloat64(x), fixed26_6ToFloat64(y)) op.GeoM.Translate(fixed26_6ToFloat64(x+minX), fixed26_6ToFloat64(y+minY))
op.GeoM.Translate(fixed26_6ToFloat64(b.Min.X), fixed26_6ToFloat64(b.Min.Y))
rf := float64(cr) / float64(ca) rf := float64(cr) / float64(ca)
gf := float64(cg) / float64(ca) gf := float64(cg) / float64(ca)
@ -222,8 +221,8 @@ func (a *atlas) draw(glyph *glyph) {
Src: image.White, Src: image.White,
Face: glyph.char.face.f, Face: glyph.char.face.f,
} }
b := glyph.char.bounds() minX, minY, _, _ := glyph.char.bounds()
d.Dot = fixed.Point26_6{-b.Min.X, -b.Min.Y} d.Dot = fixed.Point26_6{-minX, -minY}
d.DrawString(string(glyph.char.rune)) d.DrawString(string(glyph.char.rune))
a.tmpImage.ReplacePixels(dst.Pix) a.tmpImage.ReplacePixels(dst.Pix)