crunchy-rocks/draw2d
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Made FetchGlyph and Glyph public, made FillGlyph and StrokeGlyph methods of Glyph, made Glyph.Path private

Browse source
This commit is contained in:
redstarcoder 2016-10-25 21:15:42 -04:00
parent c2920005d6
commit 7cc6abeee3
3 changed files with 44 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
draw2dbase/text.go
View file

@ -2,38 +2,16 @@ package draw2dbase
import "github.com/llgcode/draw2d"
var glyphCache map[string]map[rune]*glyph
var glyphCache map[string]map[rune]*Glyph
func init() {
glyphCache = make(map[string]map[rune]*glyph)
glyphCache = make(map[string]map[rune]*Glyph)
}
// FillGlyph copies a glyph from the cache, copies it to the gc, and fills it
func FillGlyph(gc draw2d.GraphicContext, x, y float64, fontName string, chr rune) float64 {
g := fetchGlyph(gc, fontName, chr)
gc.Save()
gc.BeginPath()
gc.Translate(x, y)
gc.Fill(g.Path)
gc.Restore()
return g.Width
}
// StrokeGlyph fetches a glyph from the cache, copies it to the gc, and strokes it
func StrokeGlyph(gc draw2d.GraphicContext, x, y float64, fontName string, chr rune) float64 {
g := fetchGlyph(gc, fontName, chr)
gc.Save()
gc.BeginPath()
gc.Translate(x, y)
gc.Stroke(g.Path)
gc.Restore()
return g.Width
}
// fetchGlyph fetches a glyph from the cache, calling renderGlyph first if it doesn't already exist
func fetchGlyph(gc draw2d.GraphicContext, fontName string, chr rune) *glyph {
// FetchGlyph fetches a glyph from the cache, calling renderGlyph first if it doesn't already exist
func FetchGlyph(gc draw2d.GraphicContext, fontName string, chr rune) *Glyph {
if glyphCache[fontName] == nil {
glyphCache[fontName] = make(map[rune]*glyph, 60)
glyphCache[fontName] = make(map[rune]*Glyph, 60)
}
if glyphCache[fontName][chr] == nil {
glyphCache[fontName][chr] = renderGlyph(gc, fontName, chr)
@ -41,30 +19,50 @@ func fetchGlyph(gc draw2d.GraphicContext, fontName string, chr rune) *glyph {
return glyphCache[fontName][chr].Copy()
}
// renderGlyph renders a Glyph then caches and returns it
func renderGlyph(gc draw2d.GraphicContext, fontName string, chr rune) *glyph {
// renderGlyph renders a glyph then caches and returns it
func renderGlyph(gc draw2d.GraphicContext, fontName string, chr rune) *Glyph {
gc.Save()
defer gc.Restore()
gc.BeginPath()
width := gc.CreateStringPath(string(chr), 0, 0)
path := gc.GetPath()
return &glyph{
Path: &path,
return &Glyph{
path: &path,
Width: width,
}
}
// glyph represents a rune which has been converted to a Path and width
type glyph struct {
// Path represents a glyph, it is always at (0, 0)
Path *draw2d.Path
// Glyph represents a rune which has been converted to a Path and width
type Glyph struct {
// path represents a glyph, it is always at (0, 0)
path *draw2d.Path
// Width of the glyph
Width float64
}
func (g *glyph) Copy() *glyph {
return &glyph{
Path: g.Path.Copy(),
func (g *Glyph) Copy() *Glyph {
return &Glyph{
path: g.path.Copy(),
Width: g.Width,
}
}
// Fill copies a glyph from the cache, and fills it
func (g *Glyph) Fill(gc draw2d.GraphicContext, x, y float64) float64 {
gc.Save()
gc.BeginPath()
gc.Translate(x, y)
gc.Fill(g.path)
gc.Restore()
return g.Width
}
// Stroke fetches a glyph from the cache, and strokes it
func (g *Glyph) Stroke(gc draw2d.GraphicContext, x, y float64) float64 {
gc.Save()
gc.BeginPath()
gc.Translate(x, y)
gc.Stroke(g.path)
gc.Restore()
return g.Width
}

6
draw2dgl/gc.go
View file

@ -207,7 +207,8 @@ func (gc *GraphicContext) FillStringAt(text string, x, y float64) (width float64
xorig := x
fontName := gc.GetFontName()
for _, r := range text {
x += draw2dbase.FillGlyph(gc, x, y, fontName, r)
glyph := draw2dbase.FetchGlyph(gc, fontName, r)
x += glyph.Fill(gc, x, y)
}
return x - xorig
}
@ -261,7 +262,8 @@ func (gc *GraphicContext) StrokeStringAt(text string, x, y float64) (width float
xorig := x
fontName := gc.GetFontName()
for _, r := range text {
x += draw2dbase.StrokeGlyph(gc, x, y, fontName, r)
glyph := draw2dbase.FetchGlyph(gc, fontName, r)
x += glyph.Stroke(gc, x, y)
}
return x - xorig
}

6
draw2dimg/ftgc.go
View file

@ -126,7 +126,8 @@ func (gc *GraphicContext) FillStringAt(text string, x, y float64) (width float64
xorig := x
fontName := gc.GetFontName()
for _, r := range text {
x += draw2dbase.FillGlyph(gc, x, y, fontName, r)
glyph := draw2dbase.FetchGlyph(gc, fontName, r)
x += glyph.Fill(gc, x, y)
}
return x - xorig
}
@ -141,7 +142,8 @@ func (gc *GraphicContext) StrokeStringAt(text string, x, y float64) (width float
xorig := x
fontName := gc.GetFontName()
for _, r := range text {
x += draw2dbase.StrokeGlyph(gc, x, y, fontName, r)
glyph := draw2dbase.FetchGlyph(gc, fontName, r)
x += glyph.Stroke(gc, x, y)
}
return x - xorig
}