interesting
/
go-opengl-pixel
mirror of https://github.com/faiface/pixel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

change text.New to take an Atlas

This commit is contained in:
faiface 2017-05-10 17:56:09 +02:00
parent a510048648
commit e86120db20
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
text/atlas.go
View File

@ -28,11 +28,24 @@ type Atlas struct {
lineHeight float64
}
// NewAtlas creates a new Atlas containing glyphs of the given set of runes from the given font
// face.
// NewAtlas creates a new Atlas containing glyphs of the union of the given sets of runes (plus
// unicode.ReplacementChar) from the given font face.
//
// Do not destroy or close the font.Face after creating the Atlas.
func NewAtlas(face font.Face, runes []rune) *Atlas {
// Creating an Atlas is rather expensive, do not create a new Atlas each frame.
//
// Do not destroy or close the font.Face after creating the Atlas. Atlas still uses it.
func NewAtlas(face font.Face, runeSets ...[]rune) *Atlas {
seen := make(map[rune]bool)
runes := []rune{unicode.ReplacementChar}
for _, set := range runeSets {
for _, r := range set {
if !seen[r] {
runes = append(runes, r)
seen[r] = true
}
}
}
fixedMapping, fixedBounds := makeSquareMapping(face, runes, fixed.I(2))
atlasImg := image.NewRGBA(image.Rect(

26
text/text.go
View File

@ -7,7 +7,6 @@ import (
"unicode/utf8"
"github.com/faiface/pixel"
"golang.org/x/image/font"
)
// ASCII is a set of all ASCII runes. These runes are codepoints from 32 to 127 inclusive.
@ -40,14 +39,14 @@ func RangeTable(table *unicode.RangeTable) []rune {
// Text allows for effiecient and convenient text drawing.
//
// To create a Text object, use the New constructor:
// txt := text.New(face, text.ASCII)
// txt := text.New(pixel.V(0, 0), text.NewAtlas(face, text.ASCII))
//
// As suggested by the constructor, a Text object is always associated with one font face and a
// fixed set of runes. For example, the Text we created above can draw text using the font face
// contained in the face variable and is capable of drawing ASCII characters.
//
// Here we create a Text object which can draw ASCII and Katakana characters:
// txt := text.New(face, text.ASCII, text.RangeTable(unicode.Katakana))
// txt := text.New(0, text.NewAtlas(face, text.ASCII, text.RangeTable(unicode.Katakana)))
//
// Similarly to IMDraw, Text functions as a buffer. It implements io.Writer interface, so writing
// text to it is really simple:
@ -92,12 +91,8 @@ type Text struct {
dirty bool
}
// New creates a new Text capable of drawing runes contained in the provided rune sets, plus
// unicode.ReplacementChar using the provided font.Face. New automatically generates an Atlas for
// the Text.
//
// Do not destroy or close the font.Face after creating a Text. Although Text caches most of the
// stuff (pre-drawn glyphs, etc.), it still uses the face for a few things.
// New creates a new Text capable of drawing runes contained in the provided Atlas. Orig and Dot
// will be initially set to orig.
//
// Here we create a Text capable of drawing ASCII characters using the Go Regular font.
// ttf, err := truetype.Parse(goregular.TTF)
@ -107,16 +102,11 @@ type Text struct {
// face := truetype.NewFace(ttf, &truetype.Options{
// Size: 14,
// })
// txt := text.New(face, text.ASCII)
func New(face font.Face, runeSets ...[]rune) *Text {
runes := []rune{unicode.ReplacementChar}
for _, set := range runeSets {
runes = append(runes, set...)
}
atlas := NewAtlas(face, runes)
// txt := text.New(orig, text.NewAtlas(face, text.ASCII))
func New(orig pixel.Vec, atlas *Atlas) *Text {
txt := &Text{
Orig: orig,
Dot: orig,
atlas: atlas,
lineHeight: atlas.LineHeight(),
tabWidth: atlas.Glyph(' ').Advance * 4,