From d7bac40f11fc18121ca3d26175fb85f187a6f24c Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Sat, 28 Dec 2024 11:34:53 +0100 Subject: migrate to ebiten/v2/text/v2 --- go/font/font.go | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) (limited to 'go/font') diff --git a/go/font/font.go b/go/font/font.go index ae75cf8d..e594c39f 100644 --- a/go/font/font.go +++ b/go/font/font.go @@ -1,38 +1,35 @@ package font import ( + "bytes" "log" - "golang.org/x/image/font" "golang.org/x/image/font/gofont/goregular" - "golang.org/x/image/font/opentype" + + "github.com/hajimehoshi/ebiten/v2/text/v2" ) -var Font24 font.Face -var Font18 font.Face -var Font12 font.Face +var fontSource *text.GoTextFaceSource +var Font24 *text.GoTextFace +var Font18 *text.GoTextFace +var Font12 *text.GoTextFace func InitFont() { - tt, err := opentype.Parse(goregular.TTF) + fontSource, err := text.NewGoTextFaceSource(bytes.NewReader(goregular.TTF)) if err != nil { log.Fatal(err) } - opts := &opentype.FaceOptions{Size: 24, DPI: 72} - Font24, err = opentype.NewFace(tt, opts) - if err != nil { - log.Fatal(err) + Font24 = &text.GoTextFace{ + Source: fontSource, + Size: 24, } - - opts = &opentype.FaceOptions{Size: 18, DPI: 72} - Font18, err = opentype.NewFace(tt, opts) - if err != nil { - log.Fatal(err) + Font18 = &text.GoTextFace{ + Source: fontSource, + Size: 18, } - - opts = &opentype.FaceOptions{Size: 12, DPI: 72} - Font12, err = opentype.NewFace(tt, opts) - if err != nil { - log.Fatal(err) + Font12 = &text.GoTextFace{ + Source: fontSource, + Size: 12, } } -- cgit v1.2.3