gravestench
/
OpenDiablo2
mirror of https://github.com/OpenDiablo2/OpenDiablo2
1
1
Fork 0
Code Issues Releases Wiki Activity

Removing Clone of Font() since all material is sharable, Fixes #515 (#561) 

* Removing Clone of Font() since all material is sharable, Fixes #515

* Removed Clone() from the Font interface, as deep copies are not needed.
This commit is contained in:
Maxime Lavigne (malavv) 2020-07-08 11:25:40 -04:00 committed by GitHub
parent d1f499fb79
commit f18ede6e66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
d2common/d2interface/font.go
View File

@ -4,10 +4,9 @@ import (
"image/color"
)
// Font is a font
// Font is a graphical representation associated with a set of glyphs.
type Font interface {
SetColor(c color.Color)
GetTextMetrics(text string) (width, height int)
Clone() Font
RenderText(text string, target Surface) error
}

10
d2core/d2asset/font.go
View File

@ -42,6 +42,7 @@ func loadFont(tablePath, spritePath, palettePath string) (d2interface.Font, erro
_, maxCharHeight := sheet.GetFrameBounds()
glyphs := make(map[rune]fontGlyph)
for i := 12; i < len(data); i += 14 {
code := rune(binary.LittleEndian.Uint16(data[i : i+2]))
@ -94,15 +95,6 @@ func (f *Font) GetTextMetrics(text string) (width, height int) {
return totalWidth, totalHeight
}
// Clone creates a shallow copy of the Font
func (f *Font) Clone() d2interface.Font {
return &Font{
sheet: f.sheet,
glyphs: f.glyphs,
color: f.color,
}
}
// RenderText prints a text using its configured style on a Surface (multi-lines are left-aligned, use label otherwise)
func (f *Font) RenderText(text string, target d2interface.Surface) error {
f.sheet.SetColorMod(f.color)

4
d2core/d2asset/font_manager.go
View File

@ -24,7 +24,7 @@ func (fm *fontManager) LoadFont(tablePath, spritePath, palettePath string) (d2in
error) {
cachePath := fmt.Sprintf("%s;%s;%s", tablePath, spritePath, palettePath)
if font, found := fm.cache.Retrieve(cachePath); found {
return font.(d2interface.Font).Clone(), nil
return font.(d2interface.Font), nil
}
font, err := loadFont(tablePath, spritePath, palettePath)
@ -32,7 +32,7 @@ func (fm *fontManager) LoadFont(tablePath, spritePath, palettePath string) (d2in
return nil, err
}
if err := fm.cache.Insert(cachePath, font.Clone(), 1); err != nil {
if err := fm.cache.Insert(cachePath, font, 1); err != nil {
return nil, err
}