From 013a42ddb88dbacdb1398c8d81e1bcb560f7781d Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Mon, 28 Sep 2020 02:25:01 +0900 Subject: [PATCH] examples/text: Use golang.org/x/image/font/opentype Updates #484 --- examples/text/main.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/examples/text/main.go b/examples/text/main.go index f5c5d470d..2b772c683 100644 --- a/examples/text/main.go +++ b/examples/text/main.go @@ -22,8 +22,8 @@ import ( "math/rand" "time" - "github.com/golang/freetype/truetype" "golang.org/x/image/font" + "golang.org/x/image/font/opentype" "github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten/ebitenutil" @@ -45,22 +45,28 @@ var ( ) func init() { - tt, err := truetype.Parse(fonts.MPlus1pRegular_ttf) + tt, err := opentype.Parse(fonts.MPlus1pRegular_ttf) if err != nil { log.Fatal(err) } const dpi = 72 - mplusNormalFont = truetype.NewFace(tt, &truetype.Options{ + mplusNormalFont, err = opentype.NewFace(tt, &opentype.FaceOptions{ Size: 24, DPI: dpi, Hinting: font.HintingFull, }) - mplusBigFont = truetype.NewFace(tt, &truetype.Options{ + if err != nil { + log.Fatal(err) + } + mplusBigFont, err = opentype.NewFace(tt, &opentype.FaceOptions{ Size: 32, DPI: dpi, Hinting: font.HintingFull, }) + if err != nil { + log.Fatal(err) + } } func init() {